diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-06 18:28:39 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-06 18:28:39 +0100 |
| commit | eb9da376d76b48585b3b63b4f91903b54f7abd36 (patch) | |
| tree | f58957844d6248d2df547727a4bfbd1b81c2ef97 /src/modules-load | |
| parent | 4087cb9e8fb90957d90d577e62e8ba056c2258cf (diff) | |
| download | systemd-eb9da376d76b48585b3b63b4f91903b54f7abd36.tar.gz | |
clients: unify how we invoke getopt_long()
Among other things this makes sure we always expose a --version command
and show it in the help texts.
Diffstat (limited to 'src/modules-load')
| -rw-r--r-- | src/modules-load/modules-load.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 7772e3dc2a..d37eec3f99 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -34,6 +34,7 @@ #include "strv.h" #include "conf-files.h" #include "fileio.h" +#include "build.h" static char **arg_proc_cmdline_modules = NULL; @@ -217,7 +218,8 @@ static int help(void) { printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" "Loads statically configured kernel modules.\n\n" - " -h --help Show this help\n", + " -h --help Show this help\n" + " --version Show package version\n", program_invocation_short_name); return 0; @@ -225,9 +227,14 @@ static int help(void) { static int parse_argv(int argc, char *argv[]) { + enum { + ARG_VERSION = 0x100, + }; + static const struct option options[] = { { "help", no_argument, NULL, 'h' }, - { NULL, 0, NULL, 0 } + { "version", no_argument, NULL, ARG_VERSION }, + {} }; int c; @@ -240,15 +247,18 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); + return help(); + + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); return 0; case '?': return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } |