Changeset 43952 in vbox

Timestamp:

Nov 23, 2012 3:21:25 PM (12 years ago)

Author:

vboxsync

Message:

Shared folders: instead of dropping a shared folder which does not have a mapping on the host, include it but make any operation on it fail. This is necessary to keep SSM consistent.

Location:

trunk

Files:

• include/VBox/shflsvc.h (modified) (1 diff)
• src/VBox/HostServices/SharedFolders/mappings.cpp (modified) (4 diffs)
• src/VBox/HostServices/SharedFolders/mappings.h (modified) (2 diffs)
• src/VBox/HostServices/SharedFolders/service.cpp (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (4 diffs)

trunk/include/VBox/shflsvc.h

@@ -1339 +1339 @@
  */
 
+/** mapping is writable */
 #define SHFL_ADD_MAPPING_F_WRITABLE         (RT_BIT_32(0))
+/** mapping is automounted by the guest */
 #define SHFL_ADD_MAPPING_F_AUTOMOUNT        (RT_BIT_32(1))
+/** allow the guest to create symlinks */
 #define SHFL_ADD_MAPPING_F_CREATE_SYMLINKS  (RT_BIT_32(2))
+/** mapping is actually missing on the host */
+#define SHFL_ADD_MAPPING_F_MISSING          (RT_BIT_32(3))
 
 #define SHFL_CPARMS_ADD_MAPPING  (3)

trunk/src/VBox/HostServices/SharedFolders/mappings.cpp

@@ -192 +192 @@
  */
 int vbsfMappingsAdd(PSHFLSTRING pFolderName, PSHFLSTRING pMapName,
-                    bool fWritable, bool fAutoMount, bool fSymlinksCreate)
+                    bool fWritable, bool fAutoMount, bool fSymlinksCreate, bool fMissing)
 {
     unsigned i;
@@ -237 +237 @@
             FolderMapping[i].fAutoMount      = fAutoMount;
             FolderMapping[i].fSymlinksCreate = fSymlinksCreate;
+            FolderMapping[i].fMissing        = fMissing;
 
             /* Check if the host file system is case sensitive */
@@ -318 +319 @@
     MAPPING *pFolderMapping = vbsfMappingGetByRoot(root);
     AssertReturn(pFolderMapping, NULL);
+    if (pFolderMapping->fMissing)
+        return NULL;
     return pFolderMapping->pszFolderName;
 }
@@ -460 +463 @@
     AssertReturn(pFolderMapping, VERR_INVALID_PARAMETER);
 
-    if (pFolderMapping->fValid == true)
+    if (   pFolderMapping->fValid
+        && !pFolderMapping->fMissing)
         *fWritable = pFolderMapping->fWritable;
     else

trunk/src/VBox/HostServices/SharedFolders/mappings.h

@@ -32 +32 @@
     bool        fAutoMount;           /**< folder will be auto-mounted by the guest */
     bool        fSymlinksCreate;      /**< guest is able to create symlinks */
+    bool        fMissing;             /**< mapping not invalid but host path does not exist.
+                                           Any guest operation on such a folder fails! */
 } MAPPING;
 /** Pointer to a MAPPING structure. */
@@ -41 +43 @@
 
 int vbsfMappingsAdd(PSHFLSTRING pFolderName, PSHFLSTRING pMapName,
-                    bool fWritable, bool fAutoMount, bool fCreateSymlinks);
+                    bool fWritable, bool fAutoMount, bool fCreateSymlinks, bool fMissing);
 int vbsfMappingsRemove(PSHFLSTRING pMapName);
 

trunk/src/VBox/HostServices/SharedFolders/service.cpp

@@ -1314 +1314 @@
             else
             {
-                LogRel(("    Host path '%ls', map name '%ls', %s, automount=%s, create_symlinks=%s\n",
+                LogRel(("    Host path '%ls', map name '%ls', %s, automount=%s, create_symlinks=%s, missing=%s\n",
                         ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.ucs2,
                         ((SHFLSTRING *)paParms[1].u.pointer.addr)->String.ucs2,
                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_WRITABLE) ? "writable" : "read-only",
                         RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_AUTOMOUNT) ? "true" : "false",
-                        RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_CREATE_SYMLINKS) ? "true" : "false"));
+                        RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_CREATE_SYMLINKS) ? "true" : "false",
+                        RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_MISSING) ? "true" : "false"));
 
                 /* Execute the function. */
@@ -1325 +1326 @@
                                      RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_WRITABLE),
                                      RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_AUTOMOUNT),
-                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_CREATE_SYMLINKS));
+                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_CREATE_SYMLINKS),
+                                     RT_BOOL(fFlags & SHFL_ADD_MAPPING_F_MISSING));
                 if (RT_SUCCESS(rc))
                 {

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -7357 +7357 @@
                           hostPathFull,
                           sizeof(hostPathFull));
+
+    bool fMissing = false;
     if (RT_FAILURE(vrc))
         return setError(E_INVALIDARG,
@@ -7362 +7364 @@
                         aData.m_strHostPath.c_str(), vrc);
     if (!RTPathExists(hostPathFull))
-        return setError(E_INVALIDARG,
-                        tr("Shared folder path '%s' does not exist on the host"),
-                        aData.m_strHostPath.c_str());
+        fMissing = true;
+
     /* Check whether the path is full (absolute) */
     if (RTPathCompare(aData.m_strHostPath.c_str(), hostPathFull) != 0)
@@ -7410 +7411 @@
     parms[2].u.uint32 = (aData.m_fWritable ? SHFL_ADD_MAPPING_F_WRITABLE : 0)
                       | (aData.m_fAutoMount ? SHFL_ADD_MAPPING_F_AUTOMOUNT : 0)
-                      | (fSymlinksCreate ? SHFL_ADD_MAPPING_F_CREATE_SYMLINKS : 0);
+                      | (fSymlinksCreate ? SHFL_ADD_MAPPING_F_CREATE_SYMLINKS : 0)
+                      | (fMissing ? SHFL_ADD_MAPPING_F_MISSING : 0)
+                      ;
 
     vrc = m_pVMMDev->hgcmHostCall("VBoxSharedFolders",
@@ -7422 +7425 @@
             tr("Could not create a shared folder '%s' mapped to '%s' (%Rrc)"),
             strName.c_str(), aData.m_strHostPath.c_str(), vrc);
+
+    if (fMissing)
+        return setError(E_INVALIDARG,
+                        tr("Shared folder path '%s' does not exist on the host"),
+                        aData.m_strHostPath.c_str());
 
     return S_OK;