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/agetty.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/agetty.c')
| -rw-r--r-- | term-utils/agetty.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/term-utils/agetty.c b/term-utils/agetty.c index 5b910011c..869513b22 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -308,7 +308,7 @@ static void termio_final(struct options *op, struct termios *tp, struct chardata *cp); static int caps_lock(char *s); static speed_t bcode(char *s); -static void usage(FILE * out) __attribute__((__noreturn__)); +static void usage(void) __attribute__((__noreturn__)); static void log_err(const char *, ...) __attribute__((__noreturn__)) __attribute__((__format__(printf, 1, 2))); static void log_warn (const char *, ...) @@ -785,9 +785,9 @@ static void parse_args(int argc, char **argv, struct options *op) printf(UTIL_LINUX_VERSION); exit(EXIT_SUCCESS); case HELP_OPTION: - usage(stdout); + usage(); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } } @@ -795,7 +795,7 @@ static void parse_args(int argc, char **argv, struct options *op) if (argc < optind + 1) { log_warn(_("not enough arguments")); - usage(stderr); + warn(_("not enough arguments")); } /* Accept "tty", "baudrate tty", and "tty baudrate". */ @@ -803,8 +803,8 @@ static void parse_args(int argc, char **argv, struct options *op) /* Assume BSD style speed. */ parse_speeds(op, argv[optind++]); if (argc < optind + 1) { + log_warn(_("not enough arguments")); warn(_("not enough arguments")); - usage(stderr); } op->tty = argv[optind++]; } else { @@ -2066,8 +2066,10 @@ static speed_t bcode(char *s) return 0; } -static void __attribute__ ((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; + fputs(USAGE_HEADER, out); fprintf(out, _(" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n" " %1$s [options] <baud_rate>,... <line> [<termtype>]\n"), program_invocation_short_name); @@ -2112,7 +2114,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out) fputs(_(" --version output version information and exit\n"), out); fprintf(out, USAGE_MAN_TAIL("agetty(8)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* |