Re: optind and friends are already declared

[Jan Stary]

> On Nov 03 18:34:11, h...@stare.cz wrote:
> > Including <unistd.h> when using getopt(3) also makes
> > extern int opterr, optind, optopt, optreset;
> > and friends declared, but many utils redeclare them again.

Here is a diff for regress/

        Jan

Index: lib/libc/db/dbtest.c
===================================================================
RCS file: /cvs/src/regress/lib/libc/db/dbtest.c,v
retrieving revision 1.16
diff -u -p -r1.16 dbtest.c
--- lib/libc/db/dbtest.c        27 Jul 2017 15:08:37 -0000      1.16
+++ lib/libc/db/dbtest.c        3 Nov 2017 18:14:15 -0000
@@ -76,8 +76,6 @@ int XXlineno;                         /* Fast breakpoint for 
 int
 main(int argc, char *argv[])
 {
-       extern int optind;
-       extern char *optarg;
        enum S command, state;
        DB *dbp;
        DBT data, key, keydata;
Index: lib/libc/getaddrinfo/gaitest.c
===================================================================
RCS file: /cvs/src/regress/lib/libc/getaddrinfo/gaitest.c,v
retrieving revision 1.6
diff -u -p -r1.6 gaitest.c
--- lib/libc/getaddrinfo/gaitest.c      9 Jun 2009 18:15:08 -0000       1.6
+++ lib/libc/getaddrinfo/gaitest.c      3 Nov 2017 18:14:15 -0000
@@ -119,8 +119,6 @@ main(argc, argv)
        struct addrinfo *res;
        int error, i;
        char *p, *q;
-       extern int optind;
-       extern char *optarg;
        int c;
        char nbuf[10];
 
Index: lib/libc/regex/main.c
===================================================================
RCS file: /cvs/src/regress/lib/libc/regex/main.c,v
retrieving revision 1.10
diff -u -p -r1.10 main.c
--- lib/libc/regex/main.c       13 Jul 2016 06:17:11 -0000      1.10
+++ lib/libc/regex/main.c       3 Nov 2017 18:14:15 -0000
@@ -41,8 +41,6 @@ main(int argc, char *argv[])
        int c;
        int errflg = 0;
        register int i;
-       extern int optind;
-       extern char *optarg;
 
        progname = argv[0];
 
Index: lib/libpthread/switch/switch.c
===================================================================
RCS file: /cvs/src/regress/lib/libpthread/switch/switch.c,v
retrieving revision 1.5
diff -u -p -r1.5 switch.c
--- lib/libpthread/switch/switch.c      23 Dec 2003 20:09:42 -0000      1.5
+++ lib/libpthread/switch/switch.c      3 Nov 2017 18:14:15 -0000
@@ -89,10 +89,6 @@ main(int argc, char *argv[])
        int ch, count = 4;
        long i;
 
-       /* Getopt variables. */
-       extern int optind, opterr;
-       extern char *optarg;
-
        while ((ch = getopt(argc, argv, "c:?")) != -1)
          switch (ch)
            {
Index: lib/libutil/fmt_scaled/fmt_test.c
===================================================================
RCS file: /cvs/src/regress/lib/libutil/fmt_scaled/fmt_test.c,v
retrieving revision 1.15
diff -u -p -r1.15 fmt_test.c
--- lib/libutil/fmt_scaled/fmt_test.c   16 Mar 2017 02:42:31 -0000      1.15
+++ lib/libutil/fmt_scaled/fmt_test.c   3 Nov 2017 18:14:15 -0000
@@ -36,8 +36,6 @@ __dead static void usage(int stat)
 int
 main(int argc, char **argv)
 {
-       extern char *optarg;
-       extern int optind;
        int i, ch;
  
        while ((ch = getopt(argc, argv, "hv")) != -1) {