Changeset 79321 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jun 25, 2019 12:00:40 PM (6 years ago)

Author:

vboxsync

Message:

VBoxService: Bugfixes. bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (4 diffs)

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

@@ -133 +133 @@
  * @param   pObjInfo            The object info buffer.  (ditto)
  */
-static int vgsvcGstCtrlSessionHandleDirRemoveSub(char *pszDir, size_t cchDir, PRTDIRENTRY pDirEntry, PRTFSOBJINFO pObjInfo)
+static int vgsvcGstCtrlSessionHandleDirRemoveSub(char *pszDir, size_t cchDir, PRTDIRENTRY pDirEntry)
 {
     RTDIR hDir;
@@ -145 +145 @@
         {
             /* Construct the full name of the entry. */
-            if (cchDir + pDirEntry->cbName + 1 /* dir slash */ >= RTPATH_MAX)
+            if (cchDir + pDirEntry->cbName + 1 /* dir slash */ < RTPATH_MAX)
+                memcpy(&pszDir[cchDir], pDirEntry->szName, pDirEntry->cbName + 1);
+            else
             {
                 rc = VERR_FILENAME_TOO_LONG;
                 break;
             }
-            memcpy(&pszDir[cchDir], pDirEntry->szName, pDirEntry->cbName + 1);
-
-            /* Deal with the unknown type. */
+
+            /* Switch on type. */
             if (pDirEntry->enmType == RTDIRENTRYTYPE_UNKNOWN)
-            {
-                rc = RTPathQueryInfoEx(pszDir, pObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
-                if (RT_SUCCESS(rc) && RTFS_IS_DIRECTORY(pObjInfo->Attr.fMode))
-                    pDirEntry->enmType = RTDIRENTRYTYPE_DIRECTORY;
-                else if (RT_SUCCESS(rc) && RTFS_IS_FILE(pObjInfo->Attr.fMode))
-                    pDirEntry->enmType = RTDIRENTRYTYPE_FILE;
-                else if (RT_SUCCESS(rc) && RTFS_IS_SYMLINK(pObjInfo->Attr.fMode))
-                    pDirEntry->enmType = RTDIRENTRYTYPE_SYMLINK;
-            }
-
-            /* Try the delete the fs object. */
+                RTDirQueryUnknownType(pszDir, false /*fFollowSymlinks*/, &pDirEntry->enmType);
             switch (pDirEntry->enmType)
             {
                 case RTDIRENTRYTYPE_DIRECTORY:
                 {
-                    size_t cchSubDir = cchDir + pDirEntry->cbName;
-                    pszDir[cchSubDir++] = '/';
+                    size_t cchSubDir    = cchDir + pDirEntry->cbName;
+                    pszDir[cchSubDir++] = RTPATH_SLASH;
                     pszDir[cchSubDir]   = '\0';
-                    rc = vgsvcGstCtrlSessionHandleDirRemoveSub(pszDir, cchSubDir, pDirEntry, pObjInfo);
+                    rc = vgsvcGstCtrlSessionHandleDirRemoveSub(pszDir, cchSubDir, pDirEntry);
                     if (RT_SUCCESS(rc))
                     {
@@ -180 +171 @@
                     break;
                 }
-
-                /** @todo Implement deleting symlinks? Play safe for now. */
 
                 default:
@@ -230 +219 @@
                 else /* Only remove empty directory structures. Will fail if non-empty. */
                 {
-                    RTDIRENTRY  dirEntry;
-                    RTFSOBJINFO objInfo;
-                    rc = vgsvcGstCtrlSessionHandleDirRemoveSub(szDir, strlen(szDir), &dirEntry, &objInfo);
+                    RTDIRENTRY DirEntry;
+                    RTPathEnsureTrailingSeparator(szDir, sizeof(szDir));
+                    rc = vgsvcGstCtrlSessionHandleDirRemoveSub(szDir, strlen(szDir), &DirEntry);
                 }
                 VGSvcVerbose(4, "[Dir %s]: rmdir /s (%#x) -> rc=%Rrc\n", szDir, fFlags, rc);