diff options
Diffstat (limited to 'disk-utils/fsck.minix.c')
| -rw-r--r-- | disk-utils/fsck.minix.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index bff810ec3..13b12926c 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -177,7 +177,8 @@ leave(int status) { } static void __attribute__((__noreturn__)) -usage(FILE *out) { +usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] <device>\n"), program_invocation_short_name); fputs(USAGE_SEPARATOR, out); @@ -194,7 +195,7 @@ usage(FILE *out) { fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("fsck.minix(8)")); - leave(out == stderr ? FSCK_EX_USAGE : FSCK_EX_OK); + exit(FSCK_EX_OK); } static void die(const char *fmt, ...) @@ -1329,7 +1330,7 @@ main(int argc, char **argv) { printf(UTIL_LINUX_VERSION); return FSCK_EX_OK; case 'h': - usage(stdout); + usage(); default: errtryhelp(FSCK_EX_USAGE); } @@ -1337,9 +1338,10 @@ main(int argc, char **argv) { argv += optind; if (0 < argc) { device_name = argv[0]; - } else - usage(stderr); - + } else { + warnx(_("no device specified")); + errtryhelp(FSCK_EX_USAGE); + } check_mount(); /* trying to check a mounted filesystem? */ if (repair && !automatic && (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO))) die(_("need terminal for interactive repairs")); |