>From f7522adbd78d86c3b81afb56cd9025a5645de0d6 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Mon, 26 Nov 2018 09:05:37 +0100 Subject: [PATCH] all: detect --help and --version more consistently [FIXME] FIXME: NEWS, syntax-check, tests. --- src/cksum.c | 11 ++--------- src/dd.c | 12 ++---------- src/hostid.c | 11 ++--------- src/hostname.c | 11 ++--------- src/link.c | 11 ++--------- src/logname.c | 11 ++--------- src/nohup.c | 11 ++--------- src/sleep.c | 11 ++--------- src/tsort.c | 11 ++--------- src/unlink.c | 11 ++--------- src/uptime.c | 11 ++--------- src/users.c | 11 ++--------- src/whoami.c | 11 ++--------- src/yes.c | 11 ++--------- 14 files changed, 28 insertions(+), 127 deletions(-) diff --git a/src/cksum.c b/src/cksum.c index 372d6b601..8da1ec608 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -107,11 +107,6 @@ main (void) # include "die.h" # include "error.h" -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - /* Number of bytes to read at once. */ # define BUFLEN (1 << 16) @@ -294,10 +289,8 @@ main (int argc, char **argv) so that processes running in parallel do not intersperse their output. */ setvbuf (stdout, NULL, _IOLBF, 0); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE, Version, + true, usage, AUTHORS, (char const *) NULL); have_read_stdin = false; diff --git a/src/dd.c b/src/dd.c index 6aeef520a..2b4f23145 100644 --- a/src/dd.c +++ b/src/dd.c @@ -46,11 +46,6 @@ proper_name ("David MacKenzie"), \ proper_name ("Stuart Kemp") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - /* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is present. */ #ifndef SA_NOCLDSTOP @@ -2396,13 +2391,10 @@ main (int argc, char **argv) page_size = getpagesize (); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, Version, - usage, AUTHORS, (char const *) NULL); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE, Version, + true, usage, AUTHORS, (char const *) NULL); close_stdout_required = false; - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); - /* Initialize translation table to identity translation. */ for (i = 0; i < 256; i++) trans_table[i] = i; diff --git a/src/hostid.c b/src/hostid.c index c45328aea..4d99b9466 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -32,11 +32,6 @@ #define AUTHORS proper_name ("Jim Meyering") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -69,10 +64,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (optind < argc) { diff --git a/src/hostname.c b/src/hostname.c index 292c148ec..6e68959da 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -33,11 +33,6 @@ #define AUTHORS proper_name ("Jim Meyering") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - #if !defined HAVE_SETHOSTNAME && defined HAVE_SYSINFO && \ defined HAVE_SYS_SYSTEMINFO_H # include @@ -86,10 +81,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (argc == optind + 1) { diff --git a/src/link.c b/src/link.c index 203a11788..823aa912d 100644 --- a/src/link.c +++ b/src/link.c @@ -36,11 +36,6 @@ #define AUTHORS proper_name ("Michael Stone") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -72,10 +67,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (argc < optind + 2) { diff --git a/src/logname.c b/src/logname.c index 171fe483f..0706b4dd2 100644 --- a/src/logname.c +++ b/src/logname.c @@ -30,11 +30,6 @@ #define AUTHORS proper_name ("FIXME: unknown") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -67,10 +62,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (optind < argc) { diff --git a/src/nohup.c b/src/nohup.c index 4bc7a4a48..8ea0bae32 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -34,11 +34,6 @@ #define AUTHORS proper_name ("Jim Meyering") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - /* Exit statuses. */ enum { @@ -104,10 +99,8 @@ main (int argc, char **argv) initialize_exit_failure (exit_internal_failure); atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "+", long_options, NULL) != -1) - usage (exit_internal_failure); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + false, usage, AUTHORS, (char const *) NULL); if (argc <= optind) { diff --git a/src/sleep.c b/src/sleep.c index 162053d7c..f4323744d 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -35,11 +35,6 @@ proper_name ("Jim Meyering"), \ proper_name ("Paul Eggert") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -114,10 +109,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (argc == 1) { diff --git a/src/tsort.c b/src/tsort.c index 0125c5c50..50d9100e6 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -40,11 +40,6 @@ #define AUTHORS proper_name ("Mark Kettenis") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - /* Token delimiters when reading from a file. */ #define DELIM " \t\n" @@ -556,10 +551,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (1 < argc - optind) { diff --git a/src/unlink.c b/src/unlink.c index a6ae623f9..16478f780 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -36,11 +36,6 @@ #define AUTHORS proper_name ("Michael Stone") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -71,10 +66,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (argc < optind + 1) { diff --git a/src/uptime.c b/src/uptime.c index 5f0775069..45e9e4817 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -47,11 +47,6 @@ proper_name ("David MacKenzie"), \ proper_name ("Kaveh Ghazi") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - static void print_uptime (size_t n, const STRUCT_UTMP *this) { @@ -239,10 +234,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); switch (argc - optind) { diff --git a/src/users.c b/src/users.c index 3287b7a6d..897cec3d8 100644 --- a/src/users.c +++ b/src/users.c @@ -36,11 +36,6 @@ proper_name ("Joseph Arceneaux"), \ proper_name ("David MacKenzie") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - static int userid_compare (const void *v_a, const void *v_b) { @@ -133,10 +128,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); switch (argc - optind) { diff --git a/src/whoami.c b/src/whoami.c index ac2ac0207..86253ac80 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -35,11 +35,6 @@ #define AUTHORS proper_name ("Richard Mlynarik") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -75,10 +70,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); if (optind != argc) { diff --git a/src/yes.c b/src/yes.c index 3dd5d2f9d..23659d502 100644 --- a/src/yes.c +++ b/src/yes.c @@ -32,11 +32,6 @@ #define AUTHORS proper_name ("David MacKenzie") -static struct option const long_options[] = -{ - {NULL, 0, NULL, 0} -}; - void usage (int status) { @@ -72,10 +67,8 @@ main (int argc, char **argv) atexit (close_stdout); - parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, - usage, AUTHORS, (char const *) NULL); - if (getopt_long (argc, argv, "+", long_options, NULL) != -1) - usage (EXIT_FAILURE); + parse_gnu_standard_options_only (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version, + true, usage, AUTHORS, (char const *) NULL); char **operands = argv + optind; char **operand_lim = argv + argc; -- 2.19.1