diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-12-04 12:40:25 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-12-04 12:40:25 +0000 |
commit | cf92efd859a395f572e8fdb1fada65ac7be45fb0 (patch) | |
tree | 08a74365025a332a86b7473aea3acde719ad5998 /usr/src/lib/libshell/common/sh | |
parent | 1e3614d0308cc53fe5630084af9ef8719a9c44a8 (diff) | |
parent | 99d3b4e271d47a93935645d0c2d348d161f90c80 (diff) | |
download | illumos-joyent-release-20191205.tar.gz |
[illumos-gate merge]release-20191205
commit 99d3b4e271d47a93935645d0c2d348d161f90c80
11950 diff_cb() does not handle large dnodes
commit c4fc965c904c30ee88c7ec42768b39cdbb328de9
11979 libshell: bitwise comparison always evaluates to false
commit e63ea1f970505bef26ee06b3cef54076ad25b94e
12043 Streams ioctl for _I_CMD within kernel causes EFAULT
Diffstat (limited to 'usr/src/lib/libshell/common/sh')
-rw-r--r-- | usr/src/lib/libshell/common/sh/nvtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libshell/common/sh/nvtree.c b/usr/src/lib/libshell/common/sh/nvtree.c index eaa0dc99d2..8ff1605138 100644 --- a/usr/src/lib/libshell/common/sh/nvtree.c +++ b/usr/src/lib/libshell/common/sh/nvtree.c @@ -428,7 +428,7 @@ void nv_attribute(register Namval_t *np,Sfio_t *out,char *prefix,int noname) if ((attr=nv_isattr(np,~NV_NOFREE)) || fp) { - if((attr&NV_NOPRINT|NV_INTEGER)==NV_NOPRINT) + if((attr&(NV_NOPRINT|NV_INTEGER))==NV_NOPRINT) attr &= ~NV_NOPRINT; if(!attr && !fp) return; |