getopt mistakenly allows '-;' as short option

(cherry picked from commit cf0b68196c837ad591f0e7fc0f8e8a0f690b847c)

diff --git a/ChangeLog b/ChangeLog
index 9e247e87df059de1f1e2c645f9d094a24cc1b2da..1497e859b57b601f6d4e459cb8a17fc086ae6b0a 100644 (file)
--- 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 01c1071ecb47d196c4035e47b3afa91e47c6ebf3..b778047cd91256e0723967cff9183eb8247d805f 100644 (file)
--- 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)
          {