From d1bc398fa0cb7d53d42060149007d0255c5ae9cf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 17 Nov 2004 00:56:25 +0000 Subject: [PATCH] (main): Use getopt_long rather than getopt. --- src/basename.c | 2 +- src/chroot.c | 2 +- src/cksum.c | 2 +- src/dd.c | 2 +- src/dirname.c | 2 +- src/factor.c | 2 +- src/hostid.c | 2 +- src/hostname.c | 2 +- src/link.c | 2 +- src/logname.c | 2 +- src/nohup.c | 2 +- src/printenv.c | 2 +- src/pwd.c | 2 +- src/setuidgid.c | 2 +- src/sleep.c | 2 +- src/sync.c | 2 +- src/tsort.c | 2 +- src/unlink.c | 2 +- src/uptime.c | 2 +- src/users.c | 2 +- src/whoami.c | 2 +- src/yes.c | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/basename.c b/src/basename.c index 79fdd091ec..13cdfa3fd8 100644 --- a/src/basename.c +++ b/src/basename.c @@ -103,7 +103,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc < optind + 1) diff --git a/src/chroot.c b/src/chroot.c index 25790081b7..f68751b20d 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -76,7 +76,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (EXIT_FAIL); if (argc <= optind) diff --git a/src/cksum.c b/src/cksum.c index 6cf47619d4..8f0d86ba99 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -298,7 +298,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); have_read_stdin = false; diff --git a/src/dd.c b/src/dd.c index e4f6f1e592..0d74ae900c 100644 --- a/src/dd.c +++ b/src/dd.c @@ -1447,7 +1447,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); /* Don't close stdout on exit from here on. */ diff --git a/src/dirname.c b/src/dirname.c index 40a9b29ce1..5c9ab9ef7b 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -78,7 +78,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc < optind + 1) diff --git a/src/factor.c b/src/factor.c index 79adc2882e..9a30ce7718 100644 --- a/src/factor.c +++ b/src/factor.c @@ -202,7 +202,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc <= optind) diff --git a/src/hostid.c b/src/hostid.c index 8bb76abf18..cfd63cf1b5 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -74,7 +74,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (optind < argc) diff --git a/src/hostname.c b/src/hostname.c index 929449ef6e..6d7f418132 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -91,7 +91,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc == optind + 1) diff --git a/src/link.c b/src/link.c index cbe95867e6..0326672386 100644 --- a/src/link.c +++ b/src/link.c @@ -74,7 +74,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc < optind + 2) diff --git a/src/logname.c b/src/logname.c index d22f48e422..033cbd507e 100644 --- a/src/logname.c +++ b/src/logname.c @@ -68,7 +68,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (optind < argc) diff --git a/src/nohup.c b/src/nohup.c index 79a8c50432..e1a3d80b81 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -87,7 +87,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc <= optind) diff --git a/src/printenv.c b/src/printenv.c index b91e2979cc..b006b5d328 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -91,7 +91,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (PRINTENV_FAILURE); if (optind >= argc) diff --git a/src/pwd.c b/src/pwd.c index 4bac5bb10b..06bbbb2701 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -306,7 +306,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (optind < argc) diff --git a/src/setuidgid.c b/src/setuidgid.c index 7b98046092..4403e8e90c 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -86,7 +86,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (SETUIDGID_FAILURE); if (argc <= optind + 1) diff --git a/src/sleep.c b/src/sleep.c index babf9cd773..0c64e91e0e 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -113,7 +113,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc == 1) diff --git a/src/sync.c b/src/sync.c index 04e99d800a..ad22351f7f 100644 --- a/src/sync.c +++ b/src/sync.c @@ -67,7 +67,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (optind < argc) diff --git a/src/tsort.c b/src/tsort.c index 4439b86c9d..f496d08eca 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -552,7 +552,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); have_read_stdin = false; diff --git a/src/unlink.c b/src/unlink.c index 5806ec8b03..b2702c8c2a 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -73,7 +73,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc < optind + 1) diff --git a/src/uptime.c b/src/uptime.c index 01c004194b..9552a9be6b 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -219,7 +219,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); switch (argc - optind) diff --git a/src/users.c b/src/users.c index 2858019cc1..83e33d9e12 100644 --- a/src/users.c +++ b/src/users.c @@ -135,7 +135,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); switch (argc - optind) diff --git a/src/whoami.c b/src/whoami.c index 8614c5b82a..8e01df1e50 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -76,7 +76,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "") != -1) + if (getopt_long (argc, argv, "", NULL, NULL) != -1) usage (EXIT_FAILURE); if (optind != argc) diff --git a/src/yes.c b/src/yes.c index 6d00686626..6003cabb08 100644 --- a/src/yes.c +++ b/src/yes.c @@ -73,7 +73,7 @@ main (int argc, char **argv) parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION, usage, AUTHORS, (char const *) NULL); - if (getopt (argc, argv, "+") != -1) + if (getopt_long (argc, argv, "+", NULL, NULL) != -1) usage (EXIT_FAILURE); if (argc <= optind) -- 2.47.2