Changeset 77495 in vbox for trunk/src

Timestamp:

Feb 28, 2019 8:44:11 AM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Renamed GuestSessionTask::directoryCreate() -> GuestSessionTask::directoryCreateOnGuest() and added GuestSessionTask::directoryCreateOnHost().

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImplTasks.h (modified) (1 diff)
• src-client/GuestSessionImplTasks.cpp (modified) (8 diffs)

trunk/src/VBox/Main/include/GuestSessionImplTasks.h

@@ -188 +188 @@
     /** @name Directory handling primitives.
      * @{ */
-    int directoryCreate(const com::Utf8Str &strPath, DirectoryCreateFlag_T enmDirecotryCreateFlags, uint32_t uMode,
-                        bool fFollowSymlinks);
+    int directoryCreateOnGuest(const com::Utf8Str &strPath,
+                               DirectoryCreateFlag_T enmDirectoryCreateFlags, uint32_t uMode,
+                               bool fFollowSymlinks, bool fCanExist);
+    int directoryCreateOnHost(const com::Utf8Str &strPath, uint32_t fCreate, uint32_t uMode, bool fCanExist);
     /** @}  */
 

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

@@ -223 +223 @@
  * @param  uMode                    Directory mode to use for creation.
  * @param  fFollowSymlinks          Whether to follow symlinks on the guest or not.
+ * @param  fCanExist                Whether the directory to create is allowed to exist already.
  */
-int GuestSessionTask::directoryCreate(const com::Utf8Str &strPath,
-                                      DirectoryCreateFlag_T enmDirectoryCreateFlags, uint32_t uMode, bool fFollowSymlinks)
-{
-    LogFlowFunc(("strPath=%s, fFlags=0x%x, uMode=%RU32, fFollowSymlinks=%RTbool\n",
-                 strPath.c_str(), enmDirectoryCreateFlags, uMode, fFollowSymlinks));
+int GuestSessionTask::directoryCreateOnGuest(const com::Utf8Str &strPath,
+                                             DirectoryCreateFlag_T enmDirectoryCreateFlags, uint32_t uMode,
+                                             bool fFollowSymlinks, bool fCanExist)
+{
+    LogFlowFunc(("strPath=%s, enmDirectoryCreateFlags=0x%x, uMode=%RU32, fFollowSymlinks=%RTbool, fCanExist=%RTbool\n",
+                 strPath.c_str(), enmDirectoryCreateFlags, uMode, fFollowSymlinks, fCanExist));
 
     GuestFsObjData objData; int rcGuest;
@@ -234 +236 @@
     if (RT_SUCCESS(rc))
     {
-        return VERR_ALREADY_EXISTS;
+        if (!fCanExist)
+        {
+            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                Utf8StrFmt(GuestSession::tr("Guest directory \"%s\" already exists"), strPath.c_str()));
+            return VERR_ALREADY_EXISTS;
+        }
     }
     else
@@ -268 +275 @@
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                 Utf8StrFmt(GuestSession::tr("Error creating directory on the guest: %Rrc"), strPath.c_str(), rc));
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
+ * Creates a directory on the host.
+ *
+ * @return VBox status code. VERR_ALREADY_EXISTS if directory on the guest already exists.
+ * @param  strPath                  Absolute path to directory on the host (host style path) to create.
+ * @param  fCreate                  Directory creation flags.
+ * @param  uMode                    Directory mode to use for creation.
+ * @param  fCanExist                Whether the directory to create is allowed to exist already.
+ */
+int GuestSessionTask::directoryCreateOnHost(const com::Utf8Str &strPath, uint32_t fCreate, uint32_t uMode, bool fCanExist)
+{
+    LogFlowFunc(("strPath=%s, fCreate=0x%x, uMode=%RU32, fCanExist=%RTbool\n", strPath.c_str(), fCreate, uMode, fCanExist));
+
+    int rc = RTDirCreate(strPath.c_str(), uMode, fCreate);
+    if (RT_FAILURE(rc))
+    {
+        if (rc == VERR_ALREADY_EXISTS)
+        {
+            if (!fCanExist)
+            {
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr("Host directory \"%s\" already exists"), strPath.c_str()));
+            }
+            else
+                rc = VINF_SUCCESS;
+        }
+        else
+            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                Utf8StrFmt(GuestSession::tr("Could not create host directory \"%s\": %Rrc"),
+                                           strPath.c_str(), rc));
     }
 
@@ -1510 +1553 @@
 
         const bool     fCopyIntoExisting = pList->mSourceSpec.Type.Dir.fCopyFlags & DirectoryCopyFlag_CopyIntoExisting;
+        const bool     fFollowSymlinks   = true; /** @todo */
         const uint32_t fDirMode          = 0700; /** @todo Play safe by default; implement ACLs. */
+              uint32_t fDirCreate = 0;
+
+        if (!fFollowSymlinks)
+            fDirCreate |= RTDIRCREATE_FLAGS_NO_SYMLINKS;
 
         LogFlowFunc(("List: srcRootAbs=%s, dstRootAbs=%s\n", pList->mSrcRootAbs.c_str(), pList->mDstRootAbs.c_str()));
@@ -1517 +1565 @@
         if (pList->mSourceSpec.enmType == FsObjType_Directory)
         {
-            rc = RTDirCreate(pList->mDstRootAbs.c_str(), fDirMode, 0 /* fCreate */);
-            if (   rc == VWRN_ALREADY_EXISTS
-                && !fCopyIntoExisting)
-            {
-                break;
-            }
+            rc = directoryCreateOnHost(pList->mDstRootAbs.c_str(), fDirMode, fDirCreate, fCopyIntoExisting);
+            if (RT_FAILURE(rc))
+                break;
         }
 
@@ -1550 +1595 @@
                     if (!pList->mSourceSpec.fDryRun)
                     {
-                        rc = RTDirCreate(strDstAbs.c_str(), fDirMode, 0 /* fCreate */);
-                        if (rc == VERR_ALREADY_EXISTS)
-                        {
-                            if (!fCopyIntoExisting)
-                            {
-                                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                    Utf8StrFmt(GuestSession::tr("Destination directory \"%s\" already exists"),
-                                                               strDstAbs.c_str()));
-                                break;
-                            }
-
-                            rc = VINF_SUCCESS;
-                        }
-
+                        rc = directoryCreateOnHost(pList->mDstRootAbs.c_str(), fDirMode, fDirCreate, fCopyIntoExisting);
                         if (RT_FAILURE(rc))
                             break;
@@ -1775 +1807 @@
             fFollowSymlinks   = pList->mSourceSpec.Type.Dir.fFollowSymlinks;
 
-            rc = directoryCreate(pList->mDstRootAbs.c_str(), DirectoryCreateFlag_None, fDirMode,
-                                 pList->mSourceSpec.Type.Dir.fFollowSymlinks);
-            if (   rc == VWRN_ALREADY_EXISTS
-                && !fCopyIntoExisting)
-            {
-                break;
-            }
+            rc = directoryCreateOnGuest(pList->mDstRootAbs.c_str(), DirectoryCreateFlag_None, fDirMode,
+                                        pList->mSourceSpec.Type.Dir.fFollowSymlinks, fCopyIntoExisting);
+            if (RT_FAILURE(rc))
+                break;
         }
         else if (pList->mSourceSpec.enmType == FsObjType_File)
@@ -1813 +1842 @@
                     if (!pList->mSourceSpec.fDryRun)
                     {
-                        rc = directoryCreate(strDstAbs.c_str(), DirectoryCreateFlag_None, fDirMode, fFollowSymlinks);
+                        rc = directoryCreateOnGuest(strDstAbs.c_str(), DirectoryCreateFlag_None, fDirMode,
+                                                    fFollowSymlinks, fCopyIntoExisting);
                         if (RT_FAILURE(rc))
-                        {
-                            if (rc == VERR_ALREADY_EXISTS)
-                            {
-                                if (!fCopyIntoExisting)
-                                {
-                                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                        Utf8StrFmt(GuestSession::tr("Destination directory '%s' already exists"),
-                                                                   strDstAbs.c_str()));
-                                }
-                                else /* Copy into destination directory. */
-                                    rc = VINF_SUCCESS;
-                            }
-                        }
+                            break;
                     }
                     break;