From: Eric Blake <ebb9@byu.net>
Date: Thu, 8 Apr 2010 00:56:20 +0000 (-0700)
Subject: getopt mishandles optstring of "+:"
X-Git-Tag: glibc-2.12~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66b93be793af309fb78d54199aed2306650079d0;p=platform%2Fupstream%2Fglibc.git

getopt mishandles optstring of "+:"
---

diff --git a/ChangeLog b/ChangeLog
index b9e162f..bb85ba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-01  Eric Blake  <ebb9@byu.net>
 
+	[BZ #11039]
+	* posix/getopt.c (_getopt_internal_r): Skip optional - or + before
+	checking lead byte of optstring for :.
+
 	[BZ #11040]
 	* posix/getopt.c (_getopt_internal_r): Reject '-;' as short
 	option, since it conflicts with "W;" optstring extension.
diff --git a/posix/getopt.c b/posix/getopt.c
index b778047..2746364 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -395,8 +395,6 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		    int long_only, struct _getopt_data *d, int posixly_correct)
 {
   int print_errors = d->opterr;
-  if (optstring[0] == ':')
-    print_errors = 0;
 
   if (argc < 1)
     return -1;
@@ -411,6 +409,10 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 				      posixly_correct);
       d->__initialized = 1;
     }
+  else if (optstring[0] == '-' || optstring[0] == '+')
+    optstring++;
+  if (optstring[0] == ':')
+    print_errors = 0;
 
   /* Test whether ARGV[optind] points to a non-option argument.
      Either it does not have option syntax, or there is an environment flag