Fix PR 6267: recheck POSIXLY_CORRECT each time getopt_long() starts a new

argv and don't suppress the handling of leading '-' in optstring when
POSIXLY_CORRECT is set.

Based on patch from Eric Blake.
ok and manpage update from millert@, manpage ok jmc@

1 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libc/stdlib/getopt_long.c b/src/lib/libc/stdlib/getopt_long.c
index eb1e3ef4be..e149fe0ace 100644
--- a/src/lib/libc/stdlib/getopt_long.c
+++ b/src/lib/libc/stdlib/getopt_long.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getopt_long.c,v 1.24 2010/07/22 19:31:53 blambert Exp $       */
+/*      $OpenBSD: getopt_long.c,v 1.25 2011/03/05 22:10:11 guenther Exp $       */
 /*      $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */
 
 /*
@@ -285,25 +285,25 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
                 return (-1);
 
         /*
+         * XXX Some GNU programs (like cvs) set optind to 0 instead of
+         * XXX using optreset.  Work around this braindamage.
+         */
+        if (optind == 0)
+                optind = optreset = 1;
+
+        /*
          * Disable GNU extensions if POSIXLY_CORRECT is set or options
          * string begins with a '+'.
          */
-        if (posixly_correct == -1)
+        if (posixly_correct == -1 || optreset)
                 posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
-        if (posixly_correct || *options == '+')
-                flags &= ~FLAG_PERMUTE;
-        else if (*options == '-')
+        if (*options == '-')
                 flags |= FLAG_ALLARGS;
+        else if (posixly_correct || *options == '+')
+                flags &= ~FLAG_PERMUTE;
         if (*options == '+' || *options == '-')
                 options++;
 
-        /*
-         * XXX Some GNU programs (like cvs) set optind to 0 instead of
-         * XXX using optreset.  Work around this braindamage.
-         */
-        if (optind == 0)
-                optind = optreset = 1;
-
         optarg = NULL;
         if (optreset)
                 nonopt_start = nonopt_end = -1;