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 /sys-utils/renice.c | |
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 'sys-utils/renice.c')
-rw-r--r-- | sys-utils/renice.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sys-utils/renice.c b/sys-utils/renice.c index bc6e3c849..a88f590fb 100644 --- a/sys-utils/renice.c +++ b/sys-utils/renice.c @@ -54,8 +54,9 @@ static const char *idtype[] = { [PRIO_USER] = N_("user ID"), }; -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %1$s [-n] <priority> [-p|--pid] <pid>...\n" @@ -75,7 +76,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("renice(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static int getprio(const int which, const int who, int *prio) @@ -127,7 +128,7 @@ int main(int argc, char **argv) if (argc == 1) { if (strcmp(*argv, "-h") == 0 || strcmp(*argv, "--help") == 0) - usage(stdout); + usage(); if (strcmp(*argv, "-v") == 0 || strcmp(*argv, "-V") == 0 || @@ -142,13 +143,16 @@ int main(int argc, char **argv) argv++; } - if (argc < 2) - usage(stderr); + if (argc < 2) { + warnx(_("not enough arguments")); + errtryhelp(EXIT_FAILURE); + } prio = strtol(*argv, &endptr, 10); - if (*endptr) - usage(stderr); - + if (*endptr) { + warnx(_("invalid priorty '%s'"), *argv); + errtryhelp(EXIT_FAILURE); + } argc--; argv++; |