Changeset 35055 in vbox

Timestamp:

Dec 14, 2010 9:35:29 AM (14 years ago)

Author:

vboxsync

Message:

VBoxService/AutoMount: Logging, handle write protected mounts.

File:

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

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -150 +150 @@
     }
 #endif
+
+    VBoxServiceVerbose(4, "VBoxServiceAutoMountShareIsMounted: Share \"%s\" at mount point \"%s\" = %s\n",
+                       pszShare, fMounted ? pszMountPoint : "<None>", fMounted ? "Yes" : "No");
     return fMounted;
 }
@@ -190 +193 @@
             rc = RTPathSetMode(pszMountPoint, fMode);
             if (RT_FAILURE(rc))
-                VBoxServiceError("VBoxServiceAutoMountPrepareMountPoint: Could not set mode %RTfmode for mount directory \"%s\", rc = %Rrc\n",
-                                 fMode, pszMountPoint, rc);
+            {
+                if (rc == VERR_WRITE_PROTECT)
+                {
+                    VBoxServiceError("VBoxServiceAutoMountPrepareMountPoint: Mount directory \"%s\" already is used/mounted\n", pszMountPoint);
+                    rc = VINF_SUCCESS;
+                }
+                else
+                    VBoxServiceError("VBoxServiceAutoMountPrepareMountPoint: Could not set mode %RTfmode for mount directory \"%s\", rc = %Rrc\n",
+                                     fMode, pszMountPoint, rc);
+            }
         }
         else
@@ -368 +379 @@
 }
 
-static int VBoxServiceAutoMountProcessMappings(PVBGLR3SHAREDFOLDERMAPPING paMappings, uint32_t cMappings, 
+static int VBoxServiceAutoMountProcessMappings(PVBGLR3SHAREDFOLDERMAPPING paMappings, uint32_t cMappings,
                                                const char *pszMountDir, const char *pszSharePrefix, uint32_t uClientID)
 {
@@ -376 +387 @@
     AssertPtrReturn(pszMountDir, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszSharePrefix, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(*pszSharePrefix, VERR_INVALID_PARAMETER);
     AssertReturn(uClientID > 0, VERR_INVALID_PARAMETER);
 
@@ -391 +401 @@
             char *pszShareNameFull = NULL;
             if (RTStrAPrintf(&pszShareNameFull, "%s%s", pszSharePrefix, pszShareName) > 0)
-            {                
+            {
                 char szMountPoint[RTPATH_MAX];
                 rc = RTPathJoin(szMountPoint, sizeof(szMountPoint), pszMountDir, pszShareNameFull);
@@ -397 +407 @@
                 {
                     VBoxServiceVerbose(4, "VBoxServiceAutoMountWorker: Processing mount point \"%s\"\n", szMountPoint);
-    
+
                     struct group *grp_vboxsf = getgrnam("vboxsf");
                     if (grp_vboxsf)
@@ -418 +428 @@
                             NULL,                  /* convertcp */
                         };
-    
-                        /* We always use "/media" as our root mounting directory. */
-                        /** @todo Detect the correct "media/mnt" directory, based on the current guest (?). */
+
                         rc = VBoxServiceAutoMountSharedFolder(pszShareName, szMountPoint, &mount_opts);
                     }
@@ -462 +470 @@
         rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
                                            &paMappings, &cMappings);
-        if (RT_SUCCESS(rc))
+        if (   RT_SUCCESS(rc)
+            && cMappings)
         {
             char *pszMountDir;
@@ -474 +483 @@
                 char *pszSharePrefix;
                 rc = VbglR3SharedFolderGetMountPrefix(&pszSharePrefix);
-
-                {
-                }
                 if (RT_SUCCESS(rc))
                 {
@@ -501 +507 @@
             }
             else
-                VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder directory, rc = %Rrc\n", rc);                       
+                VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder directory, rc = %Rrc\n", rc);
             RTMemFree(paMappings);
         }
         else
-            VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder mappings, rc = %Rrc\n", rc);
+        {
+            if (RT_FAILURE(rc))
+                VBoxServiceError("VBoxServiceAutoMountWorker: Error while getting the shared folder mappings, rc = %Rrc\n", rc);
+            else if (!cMappings)
+                VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: No shared folder mappings fouund\n");
+        }
         VbglR3SharedFolderDisconnect(u32ClientId);
     }
@@ -512 +523 @@
     g_AutoMountEvent = NIL_RTSEMEVENTMULTI;
 
-    VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Finished\n");
-    return 0;
+    VBoxServiceVerbose(3, "VBoxServiceAutoMountWorker: Finished with rc=%Rrc\n", rc);
+    return VINF_SUCCESS;
 }