(main): Use getopt_long rather than getopt.

diff --git a/src/basename.c b/src/basename.c
index 79fdd09..13cdfa3 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 2579008..f68751b 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 6cf4761..8f0d86b 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 e4f6f1e..0d74ae9 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 40a9b29..5c9ab9e 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 79adc28..9a30ce7 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 8bb76ab..cfd63cf 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 929449e..6d7f418 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 cbe9586..0326672 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 d22f48e..033cbd5 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 79a8c50..e1a3d80 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 b91e297..b006b5d 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 4bac5bb..06bbbb2 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 7b98046..4403e8e 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 babf9cd..0c64e91 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 04e99d8..ad22351 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 4439b86..f496d08 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 5806ec8..b2702c8 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 01c0041..9552a9b 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 2858019..83e33d9 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 8614c5b..8e01df1 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 6d00686..6003cab 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)