| Message ID | 87zij6lddt.fsf@notabene.neil.brown.name (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/04/2017 04:32 PM, NeilBrown wrote: > "nfsstat -m" always exits with "1" (unless there is an error opening > /proc/mounts). It should exist "0". > > Also, a few usage errors cause an exit of "255" when it should probably > be "1". > > Signed-off-by: NeilBrown <neilb@suse.com> Committed.... steved. > --- > utils/nfsstat/nfsstat.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c > index 8376347d5af4..eddbe9a14f25 100644 > --- a/utils/nfsstat/nfsstat.c > +++ b/utils/nfsstat/nfsstat.c > @@ -389,7 +389,7 @@ main(int argc, char **argv) > switch (c) { > case 'a': > fprintf(stderr, "nfsstat: nfs acls are not yet supported.\n"); > - return -1; > + return 1; > case 'c': > opt_clt = 1; > break; > @@ -455,7 +455,7 @@ main(int argc, char **argv) > "not yet supported\n"); > return 2; > case 'm': > - return mounts(MOUNTSFILE); > + return ! mounts(MOUNTSFILE); > case '\1': > usage(progname); > return 0; > @@ -464,7 +464,7 @@ main(int argc, char **argv) > return 0; > default: > printf("Try `%s --help' for more information.\n", progname); > - return -1; > + return 1; > } > } > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index 8376347d5af4..eddbe9a14f25 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -389,7 +389,7 @@ main(int argc, char **argv) switch (c) { case 'a': fprintf(stderr, "nfsstat: nfs acls are not yet supported.\n"); - return -1; + return 1; case 'c': opt_clt = 1; break; @@ -455,7 +455,7 @@ main(int argc, char **argv) "not yet supported\n"); return 2; case 'm': - return mounts(MOUNTSFILE); + return ! mounts(MOUNTSFILE); case '\1': usage(progname); return 0; @@ -464,7 +464,7 @@ main(int argc, char **argv) return 0; default: printf("Try `%s --help' for more information.\n", progname); - return -1; + return 1; } }
"nfsstat -m" always exits with "1" (unless there is an error opening /proc/mounts). It should exist "0". Also, a few usage errors cause an exit of "255" when it should probably be "1". Signed-off-by: NeilBrown <neilb@suse.com> --- utils/nfsstat/nfsstat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)