Changeset 31052 in vbox for trunk/src/VBox/Additions/common/VBoxControl

Timestamp:

Jul 23, 2010 12:10:41 PM (15 years ago)

Author:

vboxsync

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

63977

Message:

Shared Folders/AutoMount: Update.

File:

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

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

@@ -1274 +1274 @@
     bool usageOK = true;
     bool fOnlyShowAutoMount = false;
-    if (   argc == 1
-        && (   RTStrICmp(argv[0], "-automount") == 0
+    if (argc == 1)
+    {
+        if (   RTStrICmp(argv[0], "-automount") == 0
             || RTStrICmp(argv[0], "/automount") == 0)
-       )
-    {
-        fOnlyShowAutoMount = true;
+        {
+            fOnlyShowAutoMount = true;
+        }
+        else
+            usageOK = false;
     }
     else if (argc > 1)
@@ -1296 +1299 @@
     else
     {
-        uint32_t cMappings = 64; /* See shflsvc.h for define; should be used later. */
-        uint32_t cbMappings = cMappings * sizeof(VBGLR3SHAREDFOLDERMAPPING);
-        VBGLR3SHAREDFOLDERMAPPING *paMappings = (PVBGLR3SHAREDFOLDERMAPPING)RTMemAlloc(cbMappings);
-
-        if (paMappings)
-        {
-            rc = VbglR3SharedFolderGetMappings(u32ClientId, fOnlyShowAutoMount,
-                                               paMappings, cbMappings,
-                                               &cMappings);
-            if (RT_SUCCESS(rc))
+        PVBGLR3SHAREDFOLDERMAPPING paMappings;
+        uint32_t cMappings;
+        rc = VbglR3SharedFolderGetMappings(u32ClientId, fOnlyShowAutoMount,
+                                           &paMappings, &cMappings);
+        if (RT_SUCCESS(rc))
+        {
+            if (fOnlyShowAutoMount)
+                RTPrintf("Auto-mounted Shared Folder mappings (%u):\n\n", cMappings);
+            else
+                RTPrintf("Shared Folder mappings (%u):\n\n", cMappings);
+
+            for (uint32_t i = 0; i < cMappings; i++)
             {
-                /* Maximum mappings, see shflsvc.h */
-                if (cMappings > 64)
-                    cMappings = 64;
-                RTPrintf("Shared Folder Mappings (%u):\n\n", cMappings);
-                for (uint32_t i = 0; i < cMappings; i++)
+                char *pszName;
+                rc = VbglR3SharedFolderGetName(u32ClientId, paMappings[i].u32Root, &pszName);
+                if (RT_SUCCESS(rc))
                 {
-                    char *pszName;
-                    rc = VbglR3SharedFolderGetName(u32ClientId, paMappings[i].u32Root, &pszName);
-                    if (RT_SUCCESS(rc))
-                    {
-                        RTPrintf("%02u - %s\n", i + 1, pszName);
-                        RTStrFree(pszName);
-                    }
-                    else
-                        VBoxControlError("Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
-                                         paMappings[i].u32Root, rc);
+                    RTPrintf("%02u - %s\n", i + 1, pszName);
+                    RTStrFree(pszName);
                 }
-                if (cMappings == 0)
-                    RTPrintf("No Shared Folders available.\n");
+                else
+                    VBoxControlError("Error while getting the shared folder name for root node = %u, rc = %Rrc\n",
+                                     paMappings[i].u32Root, rc);
             }
-            else
-                VBoxControlError("Error while getting the shared folder mappings, rc = %Rrc\n", rc);
-            RTMemFree(paMappings);
+            if (cMappings == 0)
+                RTPrintf("No Shared Folders available.\n");
+            VbglR3SharedFolderFreeMappings(paMappings);
         }
         else
-            rc = VERR_NO_MEMORY;
+            VBoxControlError("Error while getting the shared folder mappings, rc = %Rrc\n", rc);
         VbglR3SharedFolderDisconnect(u32ClientId);
     }