ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fsck: add --help and --version 

Also cleanup usage() function, never write usage to stderr.

FIXME:
 - currently strtou32_or_err() exits with wrong exit code.
 - option -C does not use a safe strto*_err function

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2017-06-21 15:33:57 +02:00
parent 7a87a774af
commit 58745f3599
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
disk-utils/fsck.8
View File

@ -309,6 +309,12 @@ Don't show the title on startup.
.B \-V
Produce verbose output, including all filesystem-specific commands
that are executed.
.TP
\fB\-?\fR, \fB\-\-help\fR
Display help text and exit.
.TP
\fB\-\-version\fR
Display version information and exit.
.SH FILESYSTEM SPECIFIC OPTIONS
.B Options which are not understood by fsck are passed to the filesystem-specific checker!
.PP

27
disk-utils/fsck.c
View File

@ -1369,8 +1369,9 @@ static int check_all(void)
return status;
}
static void __attribute__((__noreturn__)) usage(FILE *out)
static void __attribute__((__noreturn__)) usage(void)
{
FILE *out = stdout;
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options] -- [fs-options] [<filesystem> ...]\n"),
program_invocation_short_name);
@ -1393,13 +1394,14 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(_(" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"), out);
fputs(_(" -V explain what is being done\n"), out);
fputs(_(" -? display this help and exit\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(_(" -?, --help display this help and exit\n"), out);
fputs(_(" --version output version information and exit\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(_("See the specific fsck.* commands for available fs-options."), out);
fprintf(out, USAGE_MAN_TAIL("fsck(8)"));
exit(out == stderr ? FSCK_EX_USAGE : FSCK_EX_OK);
exit(FSCK_EX_OK);
}
static void signal_cancel(int sig __attribute__((__unused__)))
@ -1433,6 +1435,15 @@ static void parse_argv(int argc, char *argv[])
arg = argv[i];
if (!arg)
continue;
/* the only two longopts to satisfy UL standards */
if (!opts_for_fsck && !strcmp(arg, "--help"))
usage();
if (!opts_for_fsck && !strcmp(arg, "--version")) {
printf(UTIL_LINUX_VERSION);
exit(FSCK_EX_OK);
}
if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) {
if (num_devices >= MAX_DEVICES)
errx(FSCK_EX_ERROR, _("too many devices"));
@ -1536,13 +1547,15 @@ static void parse_argv(int argc, char *argv[])
case 't':
tmp = NULL;
if (fstype)
usage(stderr);
errx(FSCK_EX_USAGE,
_("option '%s' may be specified only once"), "-t");
if (arg[j+1])
tmp = arg+j+1;
else if ((i+1) < argc)
tmp = argv[++i];
else
usage(stderr);
errx(FSCK_EX_USAGE,
_("option '%s' requires an argument"), "-t");
fstype = xstrdup(tmp);
compile_fs_type(fstype, &fs_type_compiled);
goto next_arg;
@ -1550,7 +1563,7 @@ static void parse_argv(int argc, char *argv[])
opts_for_fsck++;
break;
case '?':
usage(stdout);
usage();
break;
default:
options[++opt] = arg[j];