about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2010-04-07 17:28:36 -0700
committerUlrich Drepper <drepper@redhat.com>2010-04-07 17:28:36 -0700
commitcf0b68196c837ad591f0e7fc0f8e8a0f690b847c (patch)
tree7e3de9e1dffc3474bceeab763b0867d2c8c89191
parentaa7f642769abcfbce658aeaaffdc9fb4790cd905 (diff)
downloadglibc-cf0b68196c837ad591f0e7fc0f8e8a0f690b847c.tar.gz
glibc-cf0b68196c837ad591f0e7fc0f8e8a0f690b847c.tar.xz
glibc-cf0b68196c837ad591f0e7fc0f8e8a0f690b847c.zip
getopt mistakenly allows '-;' as short option
-rw-r--r--ChangeLog8
-rw-r--r--posix/getopt.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e1de2dffbc..b9e162f726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2009-12-02  Eric Blake	<ebb9@byu.net>
+2009-12-01  Eric Blake  <ebb9@byu.net>
+
+	[BZ #11040]
+	* posix/getopt.c (_getopt_internal_r): Reject '-;' as short
+	option, since it conflicts with "W;" optstring extension.
+
+2009-12-02  Eric Blake  <ebb9@byu.net>
 
 	[BZ #11041]
 	* posix/getopt.c (_getopt_internal_r): Handle '-Wfoo' identically
diff --git a/posix/getopt.c b/posix/getopt.c
index 01c1071ecb..b778047cd9 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -789,7 +789,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
     if (*d->__nextchar == '\0')
       ++d->optind;
 
-    if (temp == NULL || c == ':')
+    if (temp == NULL || c == ':' || c == ';')
       {
 	if (print_errors)
 	  {