diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2016-07-19 15:06:58 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2016-11-17 11:36:55 +0100 |
| commit | 7dd42c510dc8ab10f52dcc2d20dc8af412be0744 (patch) | |
| tree | fa45022d4754db6a72285d7e9f9284e877ce06c5 /misc-utils/mtdpart.c | |
| parent | 8a00021b2ab5529640e5acaca30a27cdaca04178 (diff) | |
Unify version string printing
When a program does sophisticated enough command line processing
(i.e. getopt), make sure it responds to -V and --version.
When a program prints a version string, make sure it uses the
common_print_version macro to print out its name, that it is part
of mtd-utils and the mtd-utils version from the build system in a
fashion similar to common program packages like the GNU coreutils.
When a program responds to -V/--version or -h/--help, make sure it
reports success exit status.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'misc-utils/mtdpart.c')
| -rw-r--r-- | misc-utils/mtdpart.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/misc-utils/mtdpart.c b/misc-utils/mtdpart.c index 0016e34..e480e1b 100644 --- a/misc-utils/mtdpart.c +++ b/misc-utils/mtdpart.c @@ -34,7 +34,7 @@ static void display_help(int status) "Adds a partition to an MTD device, or remove an existing partition from it.\n" "\n" " -h, --help Display this help and exit\n" -" --version Output version information and exit\n" +" -V, --version Output version information and exit\n" "\n" "START location and SIZE of the partition are in bytes. They should align on\n" "eraseblock size.\n", @@ -45,9 +45,8 @@ static void display_help(int status) static void display_version(void) { - printf("%1$s " VERSION "\n" - "\n" - "%1$s comes with NO WARRANTY\n" + common_print_version(); + printf("%1$s comes with NO WARRANTY\n" "to the extent permitted by law.\n" "\n" "You may redistribute copies of %1$s\n" @@ -77,9 +76,9 @@ static void process_options(int argc, char * const argv[]) for (;;) { int option_index = 0; - static const char short_options[] = "h"; + static const char short_options[] = "hV"; static const struct option long_options[] = { - {"version", no_argument, 0, 0}, + {"version", no_argument, 0, 'V'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0}, }; @@ -91,7 +90,7 @@ static void process_options(int argc, char * const argv[]) } switch (c) { - case 0: + case 'V': display_version(); break; case 'h': |