diff options
| author | Ruediger Meier | 2017-06-19 09:24:10 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
| commit | 9325dbfd2018b2a3b510617f4aa13777fbbe23c3 (patch) | |
| tree | 07b7b9f9e99a77d9575284ae5b1b5ee9eb34101a /text-utils | |
| parent | flock, getopt: write --help to stdout and return 0 (diff) | |
| download | kernel-qcow2-util-linux-9325dbfd2018b2a3b510617f4aa13777fbbe23c3.tar.gz kernel-qcow2-util-linux-9325dbfd2018b2a3b510617f4aa13777fbbe23c3.tar.xz kernel-qcow2-util-linux-9325dbfd2018b2a3b510617f4aa13777fbbe23c3.zip | |
misc: cleanup and fix --unknownopt issues
Fixed checkusage.sh warnings:
rtcwake: --unknownopt, non-empty stdout
rtcwake: --unknownopt, stderr too long: 21
blockdev: --unknownopt, stderr too long: 28
lsipc: --unknownopt, stderr too long: 77
pg: --unknownopt, stderr too long: 23
renice: --unknownopt, stderr too long: 18
sulogin: --unknownopt, stderr too long: 17
write: --unknownopt, stderr too long: 12
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/pg.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/text-utils/pg.c b/text-utils/pg.c index 50fd3c379..ce5898dc3 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -223,8 +223,9 @@ static void __attribute__((__noreturn__)) quit(int status) } /* Usage message and similar routines. */ -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] [+line] [+/pattern/] [files]\n"), @@ -250,19 +251,19 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("pg(1)")); - quit(out == stderr ? 2 : 0); + exit(0); } static void __attribute__((__noreturn__)) needarg(const char *s) { warnx(_("option requires an argument -- %s"), s); - usage(stderr); + errtryhelp(2); } static void __attribute__((__noreturn__)) invopt(const char *s) { warnx(_("illegal option -- %s"), s); - usage(stderr); + errtryhelp(2); } #ifdef HAVE_WIDECHAR @@ -1567,7 +1568,7 @@ int main(int argc, char **argv) argc--; if (!strcmp(argv[arg], "--help")) { - usage(stdout); + usage(); } if (!strcmp(argv[arg], "--version")) { @@ -1623,7 +1624,7 @@ int main(int argc, char **argv) sflag = 1; break; case 'h': - usage(stdout); + usage(); case 'V': printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; |