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

Timestamp:

Nov 30, 2010 10:57:21 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68333

Message:

RTGetOpt: Made it a bit less understanding about spaces after the option/value separator (':' or '='). See defect #5320.

File:

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

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

@@ -207 +207 @@
             {
                 /*
-                 * A value is required with the argument. We're trying to be very
+                 * A value is required with the argument. We're trying to be
                  * understanding here and will permit any of the following:
                  *      --long12:value,  --long12=value, --long12 value,
                  *      --long:value,    --long=value,   --long value,
-                 *      --long: value,   --long= value
                  *
                  * If the option is index, then all trailing chars must be
@@ -574 +573 @@
              * Find the argument value.
              *
-             * A value is required with the argument. We're trying to be very
+             * A value is required with the argument. We're trying to be
              * understanding here and will permit any of the following:
-             *      -svalue, -s:value, -s=value,
-             *      -s value, -s: value, -s= value
+             *      -svalue, -s value, -s:value and -s=value
              * (Ditto for long options.)
              */
@@ -583 +581 @@
             if (fShort)
             {
-                if (    pszArgThis[2] == '\0'
-                    ||  (  pszArgThis[3] == '\0'
-                         && (   pszArgThis[2] == ':'
-                             || pszArgThis[2] == '=')) )
+                if (pszArgThis[2] == '\0')
                 {
                     if (iThis + 1 >= pState->argc)
@@ -636 +631 @@
                 else
                 {
-                    if (    pszArgThis[cchLong]     == '\0'
-                        ||  pszArgThis[cchLong + 1] == '\0')
+                    if (pszArgThis[cchLong] == '\0')
                     {
                         if (iThis + 1 >= pState->argc)