- (bal) getopt now can be staticly compiled on those platforms missing

   optreset.  Patch by binder@arago.de

3 files changed, 40 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 30b8ef2cc..6d1409aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20020622
  - (djm) Update README.privsep; spotted by fries@
  - (djm) Release 3.3p1
+ - (bal) getopt now can be staticly compiled on those platforms missing
+   optreset.  Patch by binder@arago.de
 
 20020621
  - (djm) Sync:
@@ -1004,4 +1006,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2240 2002/06/21 15:44:45 djm Exp $
+$Id: ChangeLog,v 1.2241 2002/06/22 00:26:59 mouring Exp $
diff --git a/defines.h b/defines.h
index 1f52c545c..90825f6b9 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.90 2002/06/07 03:19:36 mouring Exp $ */
+/* $Id: defines.h,v 1.91 2002/06/22 00:27:00 mouring Exp $ */
 
 
 /* Constants */
@@ -417,7 +417,18 @@ struct winsize {
 #endif
 
 #ifndef HAVE_GETOPT_OPTRESET
-#define getopt(ac, av, o)  BSDgetopt(ac, av, o)
+# undef getopt
+# undef opterr
+# undef optind
+# undef optopt
+# undef optreset
+# undef optarg
+# define getopt(ac, av, o)  BSDgetopt(ac, av, o)
+# define opterr             BSDopterr
+# define optind             BSDoptind
+# define optopt             BSDoptopt
+# define optreset           BSDoptreset
+# define optarg             BSDoptarg
 #endif
 
 /* In older versions of libpam, pam_strerror takes a single argument */
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c
index 9e13504a0..f4fbc9bac 100644
--- a/openbsd-compat/getopt.c
+++ b/openbsd-compat/getopt.c
@@ -42,11 +42,11 @@ static char *rcsid = "$OpenBSD: getopt.c,v 1.2 1996/08/19 08:33:32 tholo Exp $";
 #include <stdlib.h>
 #include <string.h>
 
-int     opterr = 1,             /* if error message should be printed */
-        optind = 1,             /* index into parent argv vector */
-        optopt,                 /* character checked for validity */
-        optreset;               /* reset getopt */
-char    *optarg;                /* argument associated with option */
+int     BSDopterr = 1,          /* if error message should be printed */
+        BSDoptind = 1,          /* index into parent argv vector */
+        BSDoptopt,              /* character checked for validity */
+        BSDoptreset;            /* reset getopt */
+char    *BSDoptarg;             /* argument associated with option */
 
 #define BADCH   (int)'?'
 #define BADARG  (int)':'
@@ -66,57 +66,57 @@ BSDgetopt(nargc, nargv, ostr)
         static char *place = EMSG;              /* option letter processing */
         char *oli;                              /* option letter list index */
 
-        if (optreset || !*place) {              /* update scanning pointer */
-                optreset = 0;
-                if (optind >= nargc || *(place = nargv[optind]) != '-') {
+        if (BSDoptreset || !*place) {           /* update scanning pointer */
+                BSDoptreset = 0;
+                if (BSDoptind >= nargc || *(place = nargv[BSDoptind]) != '-') {
                         place = EMSG;
                         return (-1);
                 }
                 if (place[1] && *++place == '-') {      /* found "--" */
-                        ++optind;
+                        ++BSDoptind;
                         place = EMSG;
                         return (-1);
                 }
         }                                       /* option letter okay? */
-        if ((optopt = (int)*place++) == (int)':' ||
-            !(oli = strchr(ostr, optopt))) {
+        if ((BSDoptopt = (int)*place++) == (int)':' ||
+            !(oli = strchr(ostr, BSDoptopt))) {
                 /*
                  * if the user didn't specify '-' as an option,
                  * assume it means -1.
                  */
-                if (optopt == (int)'-')
+                if (BSDoptopt == (int)'-')
                         return (-1);
                 if (!*place)
-                        ++optind;
-                if (opterr && *ostr != ':')
+                        ++BSDoptind;
+                if (BSDopterr && *ostr != ':')
                         (void)fprintf(stderr,
-                            "%s: illegal option -- %c\n", __progname, optopt);
+                            "%s: illegal option -- %c\n", __progname, BSDoptopt);
                 return (BADCH);
         }
         if (*++oli != ':') {                    /* don't need argument */
-                optarg = NULL;
+                BSDoptarg = NULL;
                 if (!*place)
-                        ++optind;
+                        ++BSDoptind;
         }
         else {                                  /* need an argument */
                 if (*place)                     /* no white space */
-                        optarg = place;
-                else if (nargc <= ++optind) {   /* no arg */
+                        BSDoptarg = place;
+                else if (nargc <= ++BSDoptind) {        /* no arg */
                         place = EMSG;
                         if (*ostr == ':')
                                 return (BADARG);
-                        if (opterr)
+                        if (BSDopterr)
                                 (void)fprintf(stderr,
                                     "%s: option requires an argument -- %c\n",
-                                    __progname, optopt);
+                                    __progname, BSDoptopt);
                         return (BADCH);
                 }
                 else                            /* white space */
-                        optarg = nargv[optind];
+                        BSDoptarg = nargv[BSDoptind];
                 place = EMSG;
-                ++optind;
+                ++BSDoptind;
         }
-        return (optopt);                        /* dump back option letter */
+        return (BSDoptopt);                     /* dump back option letter */
 }
 
 #endif /* !defined(HAVE_GETOPT) || !defined(HAVE_OPTRESET) */