Changeset 32198 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2010 1:38:53 PM (14 years ago)

Author:

vboxsync

Message:

VBoxControl: Backed out the parts of r65276 that concerned strcmp->RTStrICmp, only on/off should be handled case insensitively. This is for VBoxManage and RTGetOpt compatibility.

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -896 +896 @@
     bool fVerbose = false;
     if (   2 == argc
-        && (   RTStrICmp(argv[1], "-verbose")  == 0
-            || RTStrICmp(argv[1], "--verbose") == 0))
-    {
+        && (   strcmp(argv[1], "-verbose")  == 0
+            || strcmp(argv[1], "--verbose") == 0)
+       )
         fVerbose = true;
-    }
     else if (argc != 1)
     {
@@ -1007 +1006 @@
     {
         pszValue = argv[1];
-        if (   RTStrICmp(argv[2], "-flags") != 0
-            && RTStrICmp(argv[2], "--flags") != 0)
+        if (   strcmp(argv[2], "-flags") != 0
+            && strcmp(argv[2], "--flags") != 0)
             usageOK = false;
         pszFlags = argv[3];
@@ -1062 +1061 @@
     uint32_t cPatterns = 0;
     if (    argc > 1
-        && (   RTStrICmp(argv[0], "-patterns") == 0
-            || RTStrICmp(argv[0], "--patterns") == 0))
+        && (   strcmp(argv[0], "-patterns") == 0
+            || strcmp(argv[0], "--patterns") == 0))
     {
         papszPatterns = (char const * const *)&argv[1];
@@ -1136 +1135 @@
     for (int i = 1; usageOK && i < argc; ++i)
     {
-        if (   RTStrICmp(argv[i], "-timeout")  == 0
-            || RTStrICmp(argv[i], "--timeout") == 0)
+        if (   strcmp(argv[i], "-timeout")  == 0
+            || strcmp(argv[i], "--timeout") == 0)
         {
             if (   i + 1 >= argc
@@ -1147 +1146 @@
                 ++i;
         }
-        else if (   RTStrICmp(argv[i], "-timestamp")  == 0
-                 || RTStrICmp(argv[i], "--timestamp") == 0)
+        else if (   strcmp(argv[i], "-timestamp")  == 0
+                 || strcmp(argv[i], "--timestamp") == 0)
         {
             if (   i + 1 >= argc
@@ -1262 +1261 @@
         return 1;
     }
-    if (0 == RTStrICmp(argv[0], "get"))
+    if (0 == strcmp(argv[0], "get"))
         return getGuestProperty(argc - 1, argv + 1);
-    else if (0 == RTStrICmp(argv[0], "set"))
+    else if (0 == strcmp(argv[0], "set"))
         return setGuestProperty(argc - 1, argv + 1);
-    else if (0 == RTStrICmp(argv[0], "enumerate"))
+    else if (0 == strcmp(argv[0], "enumerate"))
         return enumGuestProperty(argc - 1, argv + 1);
-    else if (0 == RTStrICmp(argv[0], "wait"))
+    else if (0 == strcmp(argv[0], "wait"))
         return waitGuestProperty(argc - 1, argv + 1);
     /* else */
@@ -1286 +1285 @@
     if (argc == 1)
     {
-        if (   RTStrICmp(argv[0], "-automount")  == 0
-            || RTStrICmp(argv[0], "--automount") == 0
+        if (   strcmp(argv[0], "-automount")  == 0
+            || strcmp(argv[0], "--automount") == 0
            )
         {
@@ -1358 +1357 @@
         return 1;
     }
-    if (0 == RTStrICmp(argv[0], "list"))
+    if (0 == strcmp(argv[0], "list"))
         return listSharedFolders(argc - 1, argv + 1);
     /* else */
@@ -1418 +1417 @@
     while (!done && (iArg < argc))
     {
-        if (   0 == RTStrICmp(argv[iArg], "-v")
-            || 0 == RTStrICmp(argv[iArg], "--version")
-            || 0 == RTStrICmp(argv[iArg], "-version")
-            || 0 == RTStrICmp(argv[iArg], "getversion")
+        if (   0 == strcmp(argv[iArg], "-V")
+            || 0 == strcmp(argv[iArg], "-v")
+            || 0 == strcmp(argv[iArg], "--version")
+            || 0 == strcmp(argv[iArg], "-version")
+            || 0 == strcmp(argv[iArg], "getversion")
            )
             {
@@ -1430 +1430 @@
                 done = true;
             }
-        else if (   0 == RTStrICmp(argv[iArg], "-nologo")
-                 || 0 == RTStrICmp(argv[iArg], "--nologo"))
+        else if (   0 == strcmp(argv[iArg], "-nologo")
+                 || 0 == strcmp(argv[iArg], "--nologo"))
             fShowLogo = false;
-        else if (   0 == RTStrICmp(argv[iArg], "-help")
-                 || 0 == RTStrICmp(argv[iArg], "--help"))
+        else if (   0 == strcmp(argv[iArg], "-help")
+                 || 0 == strcmp(argv[iArg], "--help"))
         {
             fOnlyInfo = true;
@@ -1514 +1514 @@
                    && (g_commandHandlers[index].command != NULL))
             {
-                if (0 == RTStrICmp(argv[iArg], g_commandHandlers[index].command))
+                if (0 == strcmp(argv[iArg], g_commandHandlers[index].command))
                     found = true;
                 else