should treat "-ab" as "-a -b" for shortopts="-a[0123]b".

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@886 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/ChangeLog b/ChangeLog
index 1dbbc16..d8ad83b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-03-02  Koji Arai  <arai@users.sourceforge.jp>
 
+       * src/getopt_long.c (has_argument_short): should treat "-ab" as "-a -b"
+       for shortopts="-a[0123]b".
+
+2008-03-02  Koji Arai  <arai@users.sourceforge.jp>
+
        * man/lha.1: refined.
 
 2008-02-21  Koji Arai  <arai@users.sourceforge.jp>

diff --git a/src/getopt_long.c b/src/getopt_long.c
index 69f0f53..eb32f1e 100644 (file)
--- a/src/getopt_long.c
+++ b/src/getopt_long.c
@@ -185,7 +185,10 @@ has_argument_short(char *arg, const char *shortopts)
                 fprintf(stderr, "getopt_long() -- unbalanced bracket in short options");
                 return -1;
             }
-            break;
+
+            /* shortopts = "a[0123]b", arg = "ab"
+               -> "-a -b" */
+            return 0;   /* no argument */
         default:
             return 0;   /* no argument */
         }