diff options
| author | Ruediger Meier | 2017-06-19 20:52:50 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
| commit | 6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e (patch) | |
| tree | 5e74a0cd99493e934780db2b434c75e995a6bd17 /sys-utils/switch_root.c | |
| parent | misc: never use usage(ERROR) (diff) | |
| download | kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.tar.gz kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.tar.xz kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.zip | |
misc: never use usage(stderr)
Here we fix all cases where we have usage(FILE*)
functions.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'sys-utils/switch_root.c')
| -rw-r--r-- | sys-utils/switch_root.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c index 7bd07783e..dff334253 100644 --- a/sys-utils/switch_root.c +++ b/sys-utils/switch_root.c @@ -198,8 +198,9 @@ static int switchroot(const char *newroot) return 0; } -static void __attribute__((__noreturn__)) usage(FILE *output) +static void __attribute__((__noreturn__)) usage(void) { + FILE *output = stdout; fputs(USAGE_HEADER, output); fprintf(output, _(" %s [options] <newrootdir> <init> <args to init>\n"), program_invocation_short_name); @@ -212,7 +213,7 @@ static void __attribute__((__noreturn__)) usage(FILE *output) fputs(USAGE_VERSION, output); fprintf(output, USAGE_MAN_TAIL("switch_root(8)")); - exit(output == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } int main(int argc, char *argv[]) @@ -233,19 +234,23 @@ int main(int argc, char *argv[]) printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': - usage(stdout); + usage(); default: errtryhelp(EXIT_FAILURE); } - if (argc < 3) - usage(stderr); + if (argc < 3) { + warnx(_("not enough arguments")); + errtryhelp(EXIT_FAILURE); + } newroot = argv[1]; init = argv[2]; initargs = &argv[2]; - if (!*newroot || !*init) - usage(stderr); + if (!*newroot || !*init) { + warnx(_("bad usage")); + errtryhelp(EXIT_FAILURE); + } if (switchroot(newroot)) errx(EXIT_FAILURE, _("failed. Sorry.")); |