Changeset 68936 in vbox

Timestamp:

Sep 29, 2017 4:11:06 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/RTGetOpt: Added 32-bit and 64-bit pair types.

Location:

trunk

Files:

• include/iprt/getopt.h (modified) (2 diffs)
• src/VBox/Runtime/common/misc/getopt.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTGetOpt.cpp (modified) (3 diffs)

trunk/include/iprt/getopt.h

@@ -94 +94 @@
  * expression true and false. */
 #define RTGETOPT_REQ_BOOL                       17
+/** The value must two unsigned 32-bit integer values separated by a colon,
+ * slash, pipe or space(s).  */
+#define RTGETOPT_REQ_UINT32_PAIR                18
+/** The value must two unsigned 64-bit integer values separated by a colon,
+ * slash, pipe or space(s). */
+#define RTGETOPT_REQ_UINT64_PAIR                19
+/** The value must at least unsigned 32-bit integer value, optionally
+ * followed by a second separated by a colon, slash, pipe or space(s). */
+#define RTGETOPT_REQ_UINT32_OPTIONAL_PAIR       20
+/** The value must at least unsigned 64-bit integer value, optionally
+ * followed by a second separated by a colon, slash, pipe or space(s). */
+#define RTGETOPT_REQ_UINT64_OPTIONAL_PAIR       21
 /** The mask of the valid required types. */
 #define RTGETOPT_REQ_MASK                       31
@@ -185 +197 @@
     /** A boolean flag. */
     bool            f;
+    /** A RTGETOPT_REQ_UINT32_PAIR or RTGETOPT_REQ_UINT32_OPTIONAL_PAIR option
+     *  argument. */
+    struct
+    {
+        uint32_t    uFirst;
+        uint32_t    uSecond; /**< Set to UINT32_MAX if optional and not present. */
+    } PairU32;
+    /** A RTGETOPT_REQ_UINT64_COLON_PAIR option argument. */
+    struct
+    {
+        uint64_t    uFirst;
+        uint64_t    uSecond; /**< Set to UINT64_MAX if optional and not present. */
+    } PairU64;
 } RTGETOPTUNION;
 /** Pointer to an option argument union. */

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

@@ -254 +254 @@
      * generic ints as octals.
      */
-    switch (fFlags & (  RTGETOPT_REQ_MASK
-                      | RTGETOPT_FLAG_HEX
-                      | RTGETOPT_FLAG_DEC
-                      | RTGETOPT_FLAG_OCT))
+    uint32_t const fSwitchValue =  fFlags & (  RTGETOPT_REQ_MASK
+                                             | RTGETOPT_FLAG_HEX
+                                             | RTGETOPT_FLAG_DEC
+                                             | RTGETOPT_FLAG_OCT);
+    switch (fSwitchValue)
     {
         case RTGETOPT_REQ_STRING:
@@ -407 +408 @@
         }
 
+#define MY_INT_PAIR_CASE(a_fReqValue, a_fReqValueOptional, a_Type, a_MemberPrefix, a_fnConv, a_ConvBase, a_DefaultValue) \
+            case a_fReqValue: \
+            case a_fReqValueOptional: \
+            { \
+                /* First value: */ \
+                a_Type Value1; \
+                char *pszNext = NULL; \
+                unsigned uBase =   pszValue[0] == '0' \
+                                && (pszValue[1] == 'x' || pszValue[1] == 'X') \
+                                && RT_C_IS_XDIGIT(pszValue[2]) \
+                              ? 16 : a_ConvBase; \
+                int rc = a_fnConv(pszValue, &pszNext, uBase, &Value1); \
+                if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS || rc == VWRN_TRAILING_SPACES) \
+                { \
+                    /* The second value, could be optional: */ \
+                    a_Type Value2 = a_DefaultValue; \
+                    pszValue = pszNext;\
+                    if (pszValue) \
+                    { \
+                        while (RT_C_IS_BLANK(*pszValue)) \
+                            pszValue++; \
+                        if (*pszValue == ':' || *pszValue == '/' || *pszValue == '|') \
+                            do pszValue++; \
+                            while (RT_C_IS_BLANK(*pszValue)); \
+                        if (pszValue != pszNext) \
+                        { \
+                            unsigned uBase =    pszValue[0] == '0' \
+                                             && (pszValue[1] == 'x' || pszValue[1] == 'X') \
+                                             && RT_C_IS_XDIGIT(pszValue[2]) \
+                                           ? 16 : a_ConvBase; \
+                            rc = a_fnConv(pszValue, &pszNext, uBase, &Value2); \
+                            if (rc == VINF_SUCCESS) \
+                            { /* likely */ } \
+                            else \
+                               { RTAssertMsg2("z rc=%Rrc: '%s' '%s' uBase=%d\n", rc, pszValue, pszNext, uBase); return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; } \
+                        } \
+                        else if (fSwitchValue != (a_fReqValueOptional)) \
+                        { RTAssertMsg2("x\n"); return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; } \
+                    } \
+                    else if (fSwitchValue != (a_fReqValueOptional)) \
+                        { RTAssertMsg2("y\n"); return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; } \
+                    pValueUnion->a_MemberPrefix##Second = Value2; \
+                    pValueUnion->a_MemberPrefix##First  = Value1; \
+                    break; \
+                } \
+                return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; \
+            }
+
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT32_PAIR,                      RTGETOPT_REQ_UINT32_OPTIONAL_PAIR,
+                         uint32_t, PairU32.u, RTStrToUInt32Ex, 10, UINT32_MAX)
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT32_PAIR | RTGETOPT_FLAG_DEC,  RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_DEC,
+                         uint32_t, PairU32.u, RTStrToUInt32Ex, 10, UINT32_MAX)
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT32_PAIR | RTGETOPT_FLAG_HEX,  RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX,
+                         uint32_t, PairU32.u, RTStrToUInt32Ex, 16, UINT32_MAX)
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT32_PAIR | RTGETOPT_FLAG_OCT,  RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_OCT,
+                         uint32_t, PairU32.u, RTStrToUInt32Ex,  8, UINT32_MAX)
+
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT64_PAIR,                      RTGETOPT_REQ_UINT64_OPTIONAL_PAIR,
+                         uint64_t, PairU64.u, RTStrToUInt64Ex, 10, UINT64_MAX)
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT64_PAIR | RTGETOPT_FLAG_DEC,  RTGETOPT_REQ_UINT64_OPTIONAL_PAIR | RTGETOPT_FLAG_DEC,
+                         uint64_t, PairU64.u, RTStrToUInt64Ex, 10, UINT64_MAX)
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT64_PAIR | RTGETOPT_FLAG_HEX,  RTGETOPT_REQ_UINT64_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX,
+                         uint64_t, PairU64.u, RTStrToUInt64Ex, 16, UINT64_MAX)
+        MY_INT_PAIR_CASE(RTGETOPT_REQ_UINT64_PAIR | RTGETOPT_FLAG_OCT,  RTGETOPT_REQ_UINT64_OPTIONAL_PAIR | RTGETOPT_FLAG_OCT,
+                         uint64_t, PairU64.u, RTStrToUInt64Ex,  8, UINT64_MAX)
+
         default:
             AssertMsgFailed(("f=%#x\n", fFlags));

trunk/src/VBox/Runtime/testcase/tstRTGetOpt.cpp

@@ -106 +106 @@
         { "--boolean",          408, RTGETOPT_REQ_BOOL_ONOFF },
         { "--booleanindex",     409, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
+        { "--pair32",           410, RTGETOPT_REQ_UINT32_PAIR  },
+        { "--optpair32",        411, RTGETOPT_REQ_UINT32_OPTIONAL_PAIR  },
+        { "--optpair64",        412, RTGETOPT_REQ_UINT64_OPTIONAL_PAIR  },
     };
 
@@ -187 +190 @@
         "-version",
         "-V",
+
+        /* 32-bit pairs */
+        "--pair32", "1536:0x1536",
+        "--optpair32", "0x42:042",
+        "--optpair32", "0128",
+        "--optpair64", "0x128 0x42",
+        "--optpair64", "0x128 :0x42",
+        "--optpair64", "0x128",
 
         /* done */
@@ -426 +437 @@
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 'V', 1);
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 'V', 1);
+
+    /* 32-bit pairs */
+    RTTestSub(hTest, "RTGetOpt - pairs");
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 410, 2);
+    CHECK(Val.PairU32.uFirst == 1536);
+    CHECK(Val.PairU32.uSecond == 0x1536);
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 411, 2);
+    CHECK(Val.PairU32.uFirst == 0x42);
+    CHECK(Val.PairU32.uSecond == 42);
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 411, 2);
+    CHECK(Val.PairU32.uFirst == 128);
+    CHECK(Val.PairU32.uSecond == UINT32_MAX);
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 412, 2);
+    CHECK(Val.PairU64.uFirst == 0x128);
+    CHECK(Val.PairU64.uSecond == 0x42);
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 412, 2);
+    CHECK(Val.PairU64.uFirst == 0x128);
+    CHECK(Val.PairU64.uSecond == 0x42);
+    CHECK_GETOPT(RTGetOpt(&GetState, &Val), 412, 2);
+    CHECK(Val.PairU64.uFirst == 0x128);
+    CHECK(Val.PairU64.uSecond == UINT64_MAX);
 
     /* the end */