(_getopt_internal): Update from glibc.

diff --git a/lib/getopt.c b/lib/getopt.c
index 8aa1353684e2cb54a50cdaf60db814885a5a0aa6..c7ddad0fe81111dd7ed3f0ec0947a83f35204902 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -27,13 +27,13 @@
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-#else
-# if !defined __STDC__ || !__STDC__
+#endif
+
+#if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
-#  ifndef const
-#   define const
-#  endif
+# ifndef const
+#  define const
 # endif
 #endif
 
@@ -671,7 +671,9 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
                pfound = p;
                indfound = option_index;
              }
-           else
+           else if (pfound->has_arg != p->has_arg
+                    || pfound->flag != p->flag
+                    || pfound->val != p->val)
              /* Second or later nonexact match found.  */
              ambig = 1;
          }