(main): Use getopt_long rather than getopt.

diff --git a/src/basename.c b/src/basename.c
index 79fdd091eca8372ea2203fd828c56023c872722b..13cdfa3fd8b16383a65530203dbcb9b6430a3f3b 100644 (file)
--- 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 25790081b7e8a00c32aa34c59c84a81a43feeda2..f68751b20d135f22c983e0688e6fd9637bd27bbb 100644 (file)
--- 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 6cf47619d49327c1093fd01d8daae2a24aaae1ab..8f0d86ba99fac893104da034361115d5a955c73c 100644 (file)
--- 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 e4f6f1e592d95e5f078293ced92a10588aa7085f..0d74ae900cfc37836b0ab25e5f4e134576d0405b 100644 (file)
--- 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 40a9b29ce16e98160be7b89c7c38858a4a91bae2..5c9ab9ef7b44207a0d648d588aaa678494778c00 100644 (file)
--- 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 79adc2882e70daaf034887617cb9899bbc06431b..9a30ce7718f2e074c4f06a00a8896e31da90e0cb 100644 (file)
--- 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 8bb76abf1892a77e1d0c0cdee1bf0b262cd53eb2..cfd63cf1b5e9679e927d71d6fbf2b3419030e93a 100644 (file)
--- 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 929449ef6e7040687599e0729879e7e2518ff6ff..6d7f418132ebacabb527563edcbc7ac8935293e8 100644 (file)
--- 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 cbe95867e674c7f1c2d2a0f6c840bc7c2fc3465a..03266723869649bd042ca584081ab546bc257c5a 100644 (file)
--- 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 d22f48e422038f586d37fe1e959d6d843ad444dd..033cbd507ed431aef79ed65c977e2664a3dc6898 100644 (file)
--- 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 79a8c5043220021629a4cbdbee6de8308c5f429c..e1a3d80b81adb7a25e04087c57fe9e8f12886505 100644 (file)
--- 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 b91e2979cc59dc199484dc10ea3a0ba6b24e44f3..b006b5d32885510a6c04ec44494127eb4fe566d3 100644 (file)
--- 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 4bac5bb10b95cebffef9e4e723fde3ef01bec51b..06bbbb2701f6d89ad05b63a0fec8f55c15ec7488 100644 (file)
--- 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 7b98046092145856610e22c4dc370657b15a77c9..4403e8e90c40d5c4aaacee19554a81d3acb41737 100644 (file)
--- 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 babf9cd773c2027ab1451ff534c002471142c20c..0c64e91e0e445ba0bd267e57add6d62eb4238435 100644 (file)
--- 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 04e99d800adb5d754c0581b0f62be29c365b83d6..ad22351f7f67cdd96a424358cd8e1af1d9861144 100644 (file)
--- 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 4439b86c9df2d47b669c82cab7c6f2633d275b29..f496d08ecac932c8ce8b692a56f4fd4f1a9270b5 100644 (file)
--- 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 5806ec8b0303873aa8dbf33081ba84b42e16cd5b..b2702c8c2aadf147ef9fff6fb193e42eedb1b6e4 100644 (file)
--- 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 01c004194b181a6da6550bd1da8b6447bc984685..9552a9be6b144ec60a2f5af0355582a1edf08543 100644 (file)
--- 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 2858019cc1de5b3c40eca5626b419f69be0ddcf5..83e33d9e126dacb2f54eadb45705963ff9528baa 100644 (file)
--- 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 8614c5b82a516d2cc48de504320a04278fd79902..8e01df1e506103dca3287afda9493c3679674ed2 100644 (file)
--- 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 6d0068662641946a5fa7206ec0abee257c1fef5f..6003cabb08807f0154204f07941c29a243980e3f 100644 (file)
--- 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)