Changeset 83982 in vbox

Timestamp:

Apr 26, 2020 11:36:21 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/getopt.cpp: Assume options are 7-bit ASCII / basic latin, so we don't need to drag in the case tables in static builds.

File:

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

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

@@ -45 +45 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef IPRT_MINIMAL
+#ifdef IN_RT_STATIC  /* We don't need full unicode case insensitive if we ASSUME basic latin only. */
 # define RTStrICmp  RTStrICmpAscii
 # define RTStrNICmp RTStrNICmpAscii
-#else
 #endif
 
@@ -88 +87 @@
     pState->cNonOptions  = 0;
 
+#ifdef RT_STRICT
     /* validate the options. */
     for (size_t i = 0; i < cOptions; i++)
@@ -95 +95 @@
         Assert(paOptions[i].iShort != VINF_GETOPT_NOT_OPTION);
         Assert(paOptions[i].iShort != '-');
-    }
+        if (paOptions[i].fFlags & RTGETOPT_FLAG_ICASE)
+        {
+            const char   *psz = paOptions[i].pszLong;
+            unsigned char ch;
+            while ((ch = *psz++) != '\0')
+                Assert(ch <= 0x7f); /* ASSUMPTION that we can use RTStrICmpAscii and RTStrNICmpAscii. */
+        }
+    }
+#endif
 
     return VINF_SUCCESS;