Changeset 38235 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 29, 2011 10:07:03 AM (14 years ago)

Author:

vboxsync

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

73214

Message:

GuestCtrl: Update.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -174 +174 @@
     GETOPTDEF_COPYTO_TARGETDIR,
     GETOPTDEF_COPYTO_USERNAME
+};
+
+enum GETOPTDEF_MKDIR
+{
+    GETOPTDEF_MKDIR_PASSWORD = 1000,
+    GETOPTDEF_MKDIR_USERNAME
+};
+
+enum GETOPTDEF_STAT
+{
+    GETOPTDEF_STAT_PASSWORD = 1000,
+    GETOPTDEF_STAT_USERNAME
 };
 
@@ -347 +359 @@
         return VERR_GENERAL_FAILURE; /** @todo */
     }
-    AssertMsgFailedReturn(("Object has indicated no error!?\n"),
+    AssertMsgFailedReturn(("Object has indicated no error (%Rrc)!?\n", errorInfo.getResultCode()),
                           VERR_INVALID_PARAMETER);
 }
@@ -1609 +1621 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--mode",                'm',         RTGETOPT_REQ_UINT32  },
-        { "--parents",             'P',         RTGETOPT_REQ_NOTHING },
-        { "--password",            'p',         RTGETOPT_REQ_STRING  },
-        { "--username",            'u',         RTGETOPT_REQ_STRING  },
-        { "--verbose",             'v',         RTGETOPT_REQ_NOTHING }
+        { "--mode",                'm',                             RTGETOPT_REQ_UINT32  },
+        { "--parents",             'P',                             RTGETOPT_REQ_NOTHING },
+        { "--password",            GETOPTDEF_MKDIR_PASSWORD,        RTGETOPT_REQ_STRING  },
+        { "--username",            GETOPTDEF_MKDIR_USERNAME,        RTGETOPT_REQ_STRING  },
+        { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
 
@@ -1645 +1657 @@
                 break;
 
-            case 'p': /* Password */
+            case GETOPTDEF_MKDIR_PASSWORD: /* Password */
                 Utf8Password = ValueUnion.psz;
                 break;
 
-            case 'u': /* User name */
+            case GETOPTDEF_MKDIR_USERNAME: /* User name */
                 Utf8UserName = ValueUnion.psz;
                 break;
@@ -1714 +1726 @@
     AssertPtrReturn(pArg, VERR_INVALID_PARAMETER);
 
-    /*
-     * Parse arguments.
-     *
-     * Note! No direct returns here, everyone must go thru the cleanup at the
-     *       end of this function.
-     */
     static const RTGETOPTDEF s_aOptions[] =
     {
-        /** @todo Implement "--dereference/-L", and "--file-system/-f" later! */
-        { "--password",            'p',         RTGETOPT_REQ_STRING  },
-        { "--username",            'u',         RTGETOPT_REQ_STRING  },
-        { "--verbose",             'v',         RTGETOPT_REQ_NOTHING }
+        { "--dereference",         'L',                             RTGETOPT_REQ_NOTHING },
+        { "--file-system",         'f',                             RTGETOPT_REQ_NOTHING },
+        { "--format",              'c',                             RTGETOPT_REQ_STRING },
+        { "--password",            GETOPTDEF_STAT_PASSWORD,         RTGETOPT_REQ_STRING  },
+        { "--terse",               't',                             RTGETOPT_REQ_NOTHING },
+        { "--username",            GETOPTDEF_STAT_USERNAME,         RTGETOPT_REQ_STRING  },
+        { "--verbose",             'v',                             RTGETOPT_REQ_NOTHING }
     };
 
@@ -1738 +1747 @@
 
     bool fVerbose = false;
-    DESTDIRMAP mapDirs;
+    DESTDIRMAP mapObjs;
 
     RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
@@ -1747 +1756 @@
         switch (ch)
         {
-            case 'p': /* Password */
+            case GETOPTDEF_STAT_PASSWORD: /* Password */
                 Utf8Password = ValueUnion.psz;
                 break;
 
-            case 'u': /* User name */
+            case GETOPTDEF_STAT_USERNAME: /* User name */
                 Utf8UserName = ValueUnion.psz;
                 break;
+
+            case 'L': /* Dereference */
+            case 'f': /* File-system */
+            case 'c': /* Format */
+            case 't': /* Terse */
+                return errorSyntax(USAGE_GUESTCONTROL, "Command \"%s\" not implemented yet!",
+                                   ValueUnion.psz);
+                break; /* Never reached. */
 
             case 'v': /* Verbose */
@@ -1761 +1778 @@
             case VINF_GETOPT_NOT_OPTION:
             {
-                mapDirs[ValueUnion.psz]; /* Add element to check to map. */
+                mapObjs[ValueUnion.psz]; /* Add element to check to map. */
                 break;
             }
 
             default:
-                rcExit = RTGetOptPrintError(ch, &ValueUnion);
-                break;
-        }
-    }
-
-    uint32_t cDirs = mapDirs.size();
-    if (rcExit == RTEXITCODE_SUCCESS && !cDirs)
-        rcExit = errorSyntax(USAGE_GUESTCONTROL, "No element to check specified!");
+                return RTGetOptPrintError(ch, &ValueUnion);
+                break; /* Never reached. */
+        }
+    }
+
+    uint32_t cObjs = mapObjs.size();
+    if (rcExit == RTEXITCODE_SUCCESS && !cObjs)
+        rcExit = errorSyntax(USAGE_GUESTCONTROL, "No element(s) to check specified!");
 
     if (rcExit == RTEXITCODE_SUCCESS && Utf8UserName.isEmpty())
@@ -1785 +1802 @@
         HRESULT hrc = S_OK;
 
-        DESTDIRMAPITER it = mapDirs.begin();
-        while (it != mapDirs.end())
+        DESTDIRMAPITER it = mapObjs.begin();
+        while (it != mapObjs.end())
         {
             if (fVerbose)