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 /term-utils/write.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 'term-utils/write.c')
| -rw-r--r-- | term-utils/write.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/term-utils/write.c b/term-utils/write.c index 13d4745f9..a7b51809f 100644 --- a/term-utils/write.c +++ b/term-utils/write.c @@ -79,8 +79,9 @@ struct write_control { const char *dst_tty_name; }; -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] <user> [<ttyname>]\n"), @@ -92,9 +93,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(USAGE_OPTIONS, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); - fprintf(out, USAGE_MAN_TAIL("write(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* @@ -317,9 +317,9 @@ int main(int argc, char **argv) printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': - usage(stdout); + usage(); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } if (get_terminal_name(&ctl.src_tty_path, &ctl.src_tty_name, NULL) == 0) { |