vbox的更動 77531 路徑 trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

時間撮記:

2019-3-1 下午02:44:31 (6 年 以前)

作者:

vboxsync

訊息:

Guest Control/Main: Fixed directory creation / mode flags for session tasks.

檔案:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (修改) (6 筆差異)

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

@@ -221 +221 @@
  * @param  strPath                  Absolute path to directory on the guest (guest style path) to create.
  * @param  enmDirectoryCreateFlags  Directory creation flags.
- * @param  uMode                    Directory mode to use for creation.
+ * @param  fMode                    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::directoryCreateOnGuest(const com::Utf8Str &strPath,
-                                             DirectoryCreateFlag_T enmDirectoryCreateFlags, uint32_t uMode,
+                                             DirectoryCreateFlag_T enmDirectoryCreateFlags, uint32_t fMode,
                                              bool fFollowSymlinks, bool fCanExist)
 {
-    LogFlowFunc(("strPath=%s, enmDirectoryCreateFlags=0x%x, uMode=%RU32, fFollowSymlinks=%RTbool, fCanExist=%RTbool\n",
-                 strPath.c_str(), enmDirectoryCreateFlags, uMode, fFollowSymlinks, fCanExist));
+    LogFlowFunc(("strPath=%s, enmDirectoryCreateFlags=0x%x, fMode=%RU32, fFollowSymlinks=%RTbool, fCanExist=%RTbool\n",
+                 strPath.c_str(), enmDirectoryCreateFlags, fMode, fFollowSymlinks, fCanExist));
 
     GuestFsObjData objData; int rcGuest;
@@ -253 +253 @@
                     case VERR_FILE_NOT_FOUND:
                     case VERR_PATH_NOT_FOUND:
-                        rc = mSession->i_directoryCreate(strPath.c_str(), uMode, enmDirectoryCreateFlags, &rcGuest);
+                        rc = mSession->i_directoryCreate(strPath.c_str(), fMode, enmDirectoryCreateFlags, &rcGuest);
                         break;
                     default:
@@ -287 +287 @@
  * @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  fMode                    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);
+int GuestSessionTask::directoryCreateOnHost(const com::Utf8Str &strPath, uint32_t fCreate, uint32_t fMode, bool fCanExist)
+{
+    LogFlowFunc(("strPath=%s, fCreate=0x%x, fMode=%RU32, fCanExist=%RTbool\n", strPath.c_str(), fCreate, fMode, fCanExist));
+
+    int rc = RTDirCreate(strPath.c_str(), fMode, fCreate);
     if (RT_FAILURE(rc))
     {
@@ -1555 +1555 @@
         const bool     fFollowSymlinks   = true; /** @todo */
         const uint32_t fDirMode          = 0700; /** @todo Play safe by default; implement ACLs. */
-              uint32_t fDirCreate = 0;
+              uint32_t fDirCreate        = 0;
 
         if (!fFollowSymlinks)
@@ -1566 +1566 @@
             && pList->mSourceSpec.fDryRun == false)
         {
-            rc = directoryCreateOnHost(pList->mDstRootAbs, fDirMode, fDirCreate, fCopyIntoExisting);
+            rc = directoryCreateOnHost(pList->mDstRootAbs, fDirCreate, fDirMode, fCopyIntoExisting);
             if (RT_FAILURE(rc))
                 break;
@@ -1595 +1595 @@
                     LogFlowFunc(("Directory '%s': %s -> %s\n", pEntry->strPath.c_str(), strSrcAbs.c_str(), strDstAbs.c_str()));
                     if (!pList->mSourceSpec.fDryRun)
-                        rc = directoryCreateOnHost(strDstAbs, fDirMode, fDirCreate, fCopyIntoExisting);
+                        rc = directoryCreateOnHost(strDstAbs, fDirCreate, fDirMode, fCopyIntoExisting);
                     break;