bug-coreutils
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

getopt changes for coreutils

From: Paul Eggert
Subject: getopt changes for coreutils
Date: Tue, 16 Nov 2004 16:59:54 -0800
User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) 
I installed the following patch to prepare for changes to the gnulib
getopt module along the lines of yesterday's discussion.  By itself
this patch is a no-op.

2004-11-16  Paul Eggert  <address@hidden>

        * src/basename.c, src/chroot.c, src/cksum.c, src/dd.c, src/dirname.c,
        src/factor.c, src/hostid.c, src/hostname.c, src/link.c, src/logname.c,
        src/nohup.c, src/printenv.c, src/pwd.c, src/setuidgid.c, src/sleep.c,
        src/sync.c, src/tsort.c, src/unlink.c, src/uptime.c, src/users.c,
        src/whoami.c, src/yes.c (main): Use getopt_long rather than getopt.
        * src/readlink.c (main): argv is not const.

Index: src/basename.c
===================================================================
RCS file: /fetish/cu/src/basename.c,v
retrieving revision 1.58
diff -p -u -r1.58 basename.c
--- src/basename.c      21 Sep 2004 22:01:28 -0000      1.58
+++ src/basename.c      17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/chroot.c
===================================================================
RCS file: /fetish/cu/src/chroot.c,v
retrieving revision 1.47
diff -p -u -r1.47 chroot.c
--- src/chroot.c        21 Sep 2004 22:04:31 -0000      1.47
+++ src/chroot.c        17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/cksum.c
===================================================================
RCS file: /fetish/cu/src/cksum.c,v
retrieving revision 1.72
diff -p -u -r1.72 cksum.c
--- src/cksum.c 21 Sep 2004 22:07:51 -0000      1.72
+++ src/cksum.c 17 Nov 2004 00:54:16 -0000
@@ -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;
Index: src/dd.c
===================================================================
RCS file: /fetish/cu/src/dd.c,v
retrieving revision 1.169
diff -p -u -r1.169 dd.c
--- src/dd.c    16 Nov 2004 07:46:08 -0000      1.169
+++ src/dd.c    17 Nov 2004 00:54:16 -0000
@@ -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.  */
Index: src/dirname.c
===================================================================
RCS file: /fetish/cu/src/dirname.c,v
retrieving revision 1.64
diff -p -u -r1.64 dirname.c
--- src/dirname.c       21 Sep 2004 22:01:50 -0000      1.64
+++ src/dirname.c       17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/factor.c
===================================================================
RCS file: /fetish/cu/src/factor.c,v
retrieving revision 1.68
diff -p -u -r1.68 factor.c
--- src/factor.c        21 Sep 2004 22:02:09 -0000      1.68
+++ src/factor.c        17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/hostid.c
===================================================================
RCS file: /fetish/cu/src/hostid.c,v
retrieving revision 1.28
diff -p -u -r1.28 hostid.c
--- src/hostid.c        21 Sep 2004 22:02:25 -0000      1.28
+++ src/hostid.c        17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/hostname.c
===================================================================
RCS file: /fetish/cu/src/hostname.c,v
retrieving revision 1.54
diff -p -u -r1.54 hostname.c
--- src/hostname.c      21 Sep 2004 22:02:40 -0000      1.54
+++ src/hostname.c      17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/link.c
===================================================================
RCS file: /fetish/cu/src/link.c,v
retrieving revision 1.13
diff -p -u -r1.13 link.c
--- src/link.c  21 Sep 2004 22:05:27 -0000      1.13
+++ src/link.c  17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/logname.c
===================================================================
RCS file: /fetish/cu/src/logname.c,v
retrieving revision 1.56
diff -p -u -r1.56 logname.c
--- src/logname.c       18 Oct 2004 07:52:49 -0000      1.56
+++ src/logname.c       17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/nohup.c
===================================================================
RCS file: /fetish/cu/src/nohup.c,v
retrieving revision 1.18
diff -p -u -r1.18 nohup.c
--- src/nohup.c 21 Sep 2004 22:02:55 -0000      1.18
+++ src/nohup.c 17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/printenv.c
===================================================================
RCS file: /fetish/cu/src/printenv.c,v
retrieving revision 1.53
diff -p -u -r1.53 printenv.c
--- src/printenv.c      18 Oct 2004 07:52:31 -0000      1.53
+++ src/printenv.c      17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/pwd.c
===================================================================
RCS file: /fetish/cu/src/pwd.c,v
retrieving revision 1.48
diff -p -u -r1.48 pwd.c
--- src/pwd.c   21 Sep 2004 22:03:08 -0000      1.48
+++ src/pwd.c   17 Nov 2004 00:54:16 -0000
@@ -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)
Index: src/readlink.c
===================================================================
RCS file: /fetish/cu/src/readlink.c,v
retrieving revision 1.15
diff -p -u -r1.15 readlink.c
--- src/readlink.c      21 Sep 2004 22:12:55 -0000      1.15
+++ src/readlink.c      17 Nov 2004 00:54:17 -0000
@@ -90,7 +90,7 @@ usage (int status)
 }
 
 int
-main (int argc, char *const argv[])
+main (int argc, char **argv)
 {
   /* If not -1, use this method to canonicalize.  */
   int can_mode = -1;
Index: src/setuidgid.c
===================================================================
RCS file: /fetish/cu/src/setuidgid.c,v
retrieving revision 1.12
diff -p -u -r1.12 setuidgid.c
--- src/setuidgid.c     21 Sep 2004 22:03:21 -0000      1.12
+++ src/setuidgid.c     17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/sleep.c
===================================================================
RCS file: /fetish/cu/src/sleep.c,v
retrieving revision 1.88
diff -p -u -r1.88 sleep.c
--- src/sleep.c 18 Oct 2004 07:52:19 -0000      1.88
+++ src/sleep.c 17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/sync.c
===================================================================
RCS file: /fetish/cu/src/sync.c,v
retrieving revision 1.48
diff -p -u -r1.48 sync.c
--- src/sync.c  21 Sep 2004 22:03:33 -0000      1.48
+++ src/sync.c  17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/tsort.c
===================================================================
RCS file: /fetish/cu/src/tsort.c,v
retrieving revision 1.44
diff -p -u -r1.44 tsort.c
--- src/tsort.c 18 Oct 2004 07:53:45 -0000      1.44
+++ src/tsort.c 17 Nov 2004 00:54:17 -0000
@@ -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;
Index: src/unlink.c
===================================================================
RCS file: /fetish/cu/src/unlink.c,v
retrieving revision 1.14
diff -p -u -r1.14 unlink.c
--- src/unlink.c        21 Sep 2004 22:05:52 -0000      1.14
+++ src/unlink.c        17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/uptime.c
===================================================================
RCS file: /fetish/cu/src/uptime.c,v
retrieving revision 1.46
diff -p -u -r1.46 uptime.c
--- src/uptime.c        18 Oct 2004 07:54:01 -0000      1.46
+++ src/uptime.c        17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/users.c
===================================================================
RCS file: /fetish/cu/src/users.c,v
retrieving revision 1.37
diff -p -u -r1.37 users.c
--- src/users.c 21 Sep 2004 22:09:09 -0000      1.37
+++ src/users.c 17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/whoami.c
===================================================================
RCS file: /fetish/cu/src/whoami.c,v
retrieving revision 1.44
diff -p -u -r1.44 whoami.c
--- src/whoami.c        21 Sep 2004 22:09:09 -0000      1.44
+++ src/whoami.c        17 Nov 2004 00:54:17 -0000
@@ -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)
Index: src/yes.c
===================================================================
RCS file: /fetish/cu/src/yes.c,v
retrieving revision 1.55
diff -p -u -r1.55 yes.c
--- src/yes.c   21 Sep 2004 22:06:03 -0000      1.55
+++ src/yes.c   17 Nov 2004 00:54:17 -0000
@@ -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)
reply via email to
[Prev in Thread] Current Thread [Next in Thread]