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

Timestamp:

Feb 24, 2009 6:28:29 PM (16 years ago)

Author:

vboxsync

Message:

RTGetOpt: cleanup, restored @todo and returning 0 on first non-option.

File:

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

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

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
+#include <limits.h>
 
 
@@ -56 +57 @@
     {
         Assert(!(paOptions[i].fFlags & ~RTGETOPT_VALID_MASK));
-
-        bool fShort = (    *pszArgThis == '-'
-                        && (uint32_t)pszArgThis[1] == paOptions[i].uShort
-                      );
+        Assert(paOptions[i].uShort > 0 && paOptions[i].uShort <= (unsigned)INT_MAX);
+
+        bool fShort = *pszArgThis == '-'
+                    && (uint32_t)pszArgThis[1] == paOptions[i].uShort
+                    && paOptions[i].uShort;
 
         if ((paOptions[i].fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
         {
             /*
-                * A value is required with the argument. We're trying to very
-                * understanding here and will permit any of the following:
-                *      -svalue, -s:value, -s=value,
-                *      -s value, -s: value, -s= value
-                * (Ditto for long options.)
-                */
+             * A value is required with the argument. We're trying to be very
+             * understanding here and will permit any of the following:
+             *      -svalue, -s:value, -s=value,
+             *      -s value, -s: value, -s= value
+             * (Ditto for long options.)
+             */
             size_t cchLong = 2;
-            if (    (    paOptions[i].pszLong
-                        && !strncmp(pszArgThis, paOptions[i].pszLong, (cchLong = strlen(paOptions[i].pszLong)))
-                        && (   pszArgThis[cchLong] == '\0'
-                            || pszArgThis[cchLong] == ':'
-                            || pszArgThis[cchLong] == '=')
+            if (    (   paOptions[i].pszLong
+                     && !strncmp(pszArgThis, paOptions[i].pszLong, (cchLong = strlen(paOptions[i].pszLong)))
+                     && (   pszArgThis[cchLong] == '\0'
+                         || pszArgThis[cchLong] == ':'
+                         || pszArgThis[cchLong] == '=')
                     )
-                 || fShort
+                ||  fShort
                 )
             {
@@ -83 +85 @@
 
                 /*
-                    * Find the argument value
-                    */
+                 * Find the argument value
+                 */
                 const char *pszValue;
                 if (    fShort
-                     ?     pszArgThis[2] == '\0'
-                        || ((pszArgThis[2] == ':' || pszArgThis[2] == '=') && pszArgThis[3] == '\0')
-                     :  pszArgThis[cchLong] == '\0' || pszArgThis[cchLong + 1] == '\0')
+                    ?       pszArgThis[2] == '\0'
+                        ||  ((pszArgThis[2] == ':' || pszArgThis[2] == '=') && pszArgThis[3] == '\0')
+                    :   pszArgThis[cchLong] == '\0' || pszArgThis[cchLong + 1] == '\0')
                 {
                     if (iThis + 1 >= argc)
@@ -98 +100 @@
                 else /* same argument. */
                     pszValue = fShort
-                                ? &pszArgThis[2  + (pszArgThis[2] == ':' || pszArgThis[2] == '=')]
-                                : &pszArgThis[cchLong + 1];
+                             ? &pszArgThis[2  + (pszArgThis[2] == ':' || pszArgThis[2] == '=')]
+                             : &pszArgThis[cchLong + 1];
 
                 /*
-                    * Transform into a option value as requested.
-                    * If decimal conversion fails, we'll check for "0x<xdigit>" and
-                    * try a 16 based conversion. We will not interpret any of the
-                    * generic ints as octals.
-                    */
+                 * Transform into a option value as requested.
+                 * If decimal conversion fails, we'll check for "0x<xdigit>" and
+                 * try a 16 based conversion. We will not interpret any of the
+                 * generic ints as octals.
+                 */
                 switch (paOptions[i].fFlags & (RTGETOPT_REQ_MASK | RTGETOPT_FLAG_HEX | RTGETOPT_FLAG_OCT | RTGETOPT_FLAG_DEC))
                 {
@@ -182 +184 @@
         }
         else if (   (   paOptions[i].pszLong
-                        && !strcmp(pszArgThis, paOptions[i].pszLong))
-                    || (   fShort
-                        && pszArgThis[2] == '\0') /** @todo implement support for ls -lsR like stuff?  */
+                     && !strcmp(pszArgThis, paOptions[i].pszLong))
+                 || (   fShort
+                     && pszArgThis[2] == '\0') /** @todo implement support for ls -lsR like stuff?  */
                 )
         {
@@ -192 +194 @@
     }
 
-    return VERR_GETOPT_UNKNOWN_OPTION;
+    /* Option or not? */
+    if (*pszArgThis == '-')
+        return VERR_GETOPT_UNKNOWN_OPTION;
+
+    /*
+     * Not an option.
+     */
+    (*piThis)--;
+    /** @todo Sort options and arguments (i.e. stuff that doesn't start with '-'), stop when
+     * encountering the first argument. */
+
+    return 0;
 }