From: Jim Meyering <jim@meyering.net>
Date: Sun, 10 Sep 2000 07:31:44 +0000 (+0000)
Subject: (_getopt_internal): Update from glibc.
X-Git-Tag: cvs-readonly~6315
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=ba39214f0653f1edaace7e6f804e9d11046cd413;p=gnulib.git

(_getopt_internal): Update from glibc.
---

diff --git a/lib/getopt.c b/lib/getopt.c
index c7ddad0fe..a5bc2c95e 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -671,7 +671,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		pfound = p;
 		indfound = option_index;
 	      }
-	    else if (pfound->has_arg != p->has_arg
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
 		     || pfound->flag != p->flag
 		     || pfound->val != p->val)
 	      /* Second or later nonexact match found.  */