Changeset 17141 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 25, 2009 5:09:22 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: Added support for short option lists (ls -latrT4). This fixes a bug in the short option without values, where we didn't check that the following char was the string terminator.

File:

• trunk/src/VBox/Runtime/common/misc/getopt.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/misc/getopt.cpp

@@ -46 +46 @@
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
-    pState->argv        = argv;
-    pState->argc        = argc;
-    pState->paOptions   = paOptions;
-    pState->cOptions    = cOptions;
-    pState->iNext       = iFirst;
+    pState->argv         = argv;
+    pState->argc         = argc;
+    pState->paOptions    = paOptions;
+    pState->cOptions     = cOptions;
+    pState->iNext        = iFirst;
+    pState->pszNextShort = NULL;
 
     /* validate the options. */
@@ -127 +128 @@
 RTDECL(int) RTGetOpt(PRTGETOPTSTATE pState, PRTGETOPTUNION pValueUnion)
 {
+    /*
+     * Make sure the union is completely cleared out, whatever happens below.
+     */
     pValueUnion->u64 = 0;
     pValueUnion->pDef = NULL;
 
-    if (pState->iNext >= pState->argc)
-        return 0;
+    /*
+     * The next option.
+     */
+    bool            fShort;
+    int             iThis;
+    const char     *pszArgThis;
+    PCRTGETOPTDEF   pOpt;
+
+    if (pState->pszNextShort)
+    {
+        /*
+         * We've got short options left over from the previous call.
+         */
+        pOpt = rtGetOptSearchShort(*pState->pszNextShort, pState->paOptions, pState->cOptions);
+        if (!pOpt)
+        {
+            pValueUnion->psz = pState->pszNextShort;
+            return VERR_GETOPT_UNKNOWN_OPTION;
+        }
+        pState->pszNextShort++;
+        pszArgThis = pState->pszNextShort - 2;
+        iThis = pState->iNext;
+        fShort = true;
+    }
+    else
+    {
+        /*
+         * Pop off the next argument.
+         */
+        if (pState->iNext >= pState->argc)
+            return 0;
+        iThis = pState->iNext++;
+        pszArgThis = pState->argv[iThis];
+
+        /*
+         * Do a long option search first and the a short option one.
+         * This way we can make sure single dash long options doesn't
+         * get mixed up with short ones.
+         */
+        pOpt = rtGetOptSearchLong(pszArgThis, pState->paOptions, pState->cOptions);
+        if (    !pOpt
+            &&  pszArgThis[0] == '-'
+            &&  pszArgThis[1] != '-'
+            &&  pszArgThis[1] != '\0')
+        {
+            pOpt = rtGetOptSearchShort(pszArgThis[1], pState->paOptions, pState->cOptions);
+            fShort = pOpt != NULL;
+        }
+        else
+            fShort = false;
+    }
+
 
     /** @todo Handle '--' and possibly implement an RTGetOptInit that lets us
@@ -140 +194 @@
      */
 
-    /*
-     * Pop off the next argument.
-     */
-    int             iThis = pState->iNext++;
-    const char     *pszArgThis = pState->argv[iThis];
-
-    /*
-     * Do a long option search first and the a short option one.
-     * This way we can make sure single dash long options doesn't
-     * get mixed up with short ones.
-     */
-    bool            fShort = false;
-    PCRTGETOPTDEF   pOpt   = rtGetOptSearchLong(pszArgThis, pState->paOptions, pState->cOptions);
-    if (    !pOpt
-        &&  pszArgThis[0] == '-'
-        &&  pszArgThis[1] != '-'
-        &&  pszArgThis[1] != '\0')
-    {
-        pOpt = rtGetOptSearchShort(pszArgThis[1], pState->paOptions, pState->cOptions);
-        fShort = pOpt != NULL;
-    }
     if (pOpt)
     {
@@ -191 +224 @@
                 else /* same argument. */
                     pszValue = &pszArgThis[2  + (pszArgThis[2] == ':' || pszArgThis[2] == '=')];
+                if (pState->pszNextShort)
+                {
+                    pState->pszNextShort = NULL;
+                    pState->iNext++;
+                }
             }
             else
@@ -285 +323 @@
             }
         }
+        else if (fShort)
+        {
+            /*
+             * Deal with "compressed" short option lists, correcting the next
+             * state variables for the start and end cases.
+             */
+            if (pszArgThis[2])
+            {
+                if (!pState->pszNextShort)
+                {
+                    /* start */
+                    pState->pszNextShort = &pszArgThis[2];
+                    pState->iNext--;
+                }
+            }
+            else if (pState->pszNextShort)
+            {
+                /* end */
+                pState->pszNextShort = NULL;
+                pState->iNext++;
+            }
+        }
+
         return pOpt->iShort;
     }
@@ -294 +355 @@
 
     if (*pszArgThis == '-')
+    {
+        pValueUnion->psz = pszArgThis;
         return VERR_GETOPT_UNKNOWN_OPTION;
+    }
 
     pValueUnion->psz = pszArgThis;