Changeset 39612 in vbox for trunk/src/VBox/HostServices/SharedFolders

Timestamp:

Dec 14, 2011 2:19:55 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75392

Message:

IPRT/*: add _NO_SYMLINKS flags to certain functions

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• testcase/tstSharedFolderService.cpp (modified) (2 diffs)
• teststubs.h (modified) (2 diffs)
• vbsf.cpp (modified) (10 diffs)

trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp

@@ -125 +125 @@
 static RTFMODE testRTDirCreateMode;
 
-extern int testRTDirCreate(const char *pszPath, RTFMODE fMode)
+extern int testRTDirCreate(const char *pszPath, RTFMODE fMode, uint32_t fCreate)
 {
  /* RTPrintf("%s: pszPath=%s, fMode=0x%llx\n", __PRETTY_FUNCTION__, pszPath,
@@ -389 +389 @@
 }
 
-extern int testRTSymlinkDelete(const char *pszSymlink) { RTPrintf("%s\n", __PRETTY_FUNCTION__); return 0; }
+extern int testRTSymlinkDelete(const char *pszSymlink, uint32_t fDelete) 
+{ RTPrintf("%s\n", __PRETTY_FUNCTION__); return 0; }
 extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget,
-                              size_t cbTarget) { RTPrintf("%s\n", __PRETTY_FUNCTION__); return 0; }
+                              size_t cbTarget, uint32_t fRead)
+{ RTPrintf("%s\n", __PRETTY_FUNCTION__); return 0; }
 
 /******************************************************************************

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

@@ -30 +30 @@
 extern int testRTDirClose(PRTDIR pDir);
 #define RTDirCreate          testRTDirCreate
-extern int testRTDirCreate(const char *pszPath, RTFMODE fMode);
+extern int testRTDirCreate(const char *pszPath, RTFMODE fMode, uint32_t fCreate);
 #define RTDirOpen            testRTDirOpen
 extern int testRTDirOpen(PRTDIR *ppDir, const char *pszPath);
@@ -76 +76 @@
 extern int testRTPathQueryInfoEx(const char *pszPath, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAdditionalAttribs, uint32_t fFlags);
 #define RTSymlinkDelete      testRTSymlinkDelete
-extern int testRTSymlinkDelete(const char *pszSymlink);
+extern int testRTSymlinkDelete(const char *pszSymlink, uint32_t fDelete);
 #define RTSymlinkRead        testRTSymlinkRead
-extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget, size_t cbTarget);
+extern int testRTSymlinkRead(const char *pszSymlink, char *pszTarget, size_t cbTarget, uint32_t fRead);
 
 #endif /* __VBSF_TEST_STUBS__H */

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

@@ -139 +139 @@
     strcat(pDirEntry->szName, szWildCard);
 
-    rc = RTDirOpenFiltered(&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT);
+    rc = RTDirOpenFiltered(&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT, RTDIROPENFILTERED_FLAGS_NO_SYMLINKS);
     *(pszStartComponent-1) = RTPATH_DELIMITER;
     if (RT_FAILURE(rc))
@@ -582 +582 @@
 static int vbsfConvertFileOpenFlags(unsigned fShflFlags, RTFMODE fMode, SHFLHANDLE handleInitial, uint32_t *pfOpen)
 {
-    uint32_t fOpen = 0;
+    uint32_t fOpen = RTFILE_O_NO_SYMLINKS;
     int rc = VINF_SUCCESS;
 
@@ -1011 +1011 @@
 
             pParms->Result = SHFL_FILE_CREATED;
-            rc = RTDirCreate(pszPath, fMode);
+            rc = RTDirCreate(pszPath, fMode, RTDIRCREATE_FLAGS_NO_SYMLINKS);
             if (RT_FAILURE(rc))
             {
@@ -1031 +1031 @@
         {
             /* Open the directory now */
-            rc = RTDirOpen(&pHandle->dir.Handle, pszPath);
+            rc = RTDirOpenFiltered(&pHandle->dir.Handle, pszPath,
+                                   RTDIRFILTER_NONE, RTDIROPENFILTERED_FLAGS_NO_SYMLINKS);
             if (RT_SUCCESS(rc))
             {
@@ -1545 +1546 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTDirOpenFiltered(&pHandle->dir.SearchHandle, pszFullPath, RTDIRFILTER_WINNT);
+                rc = RTDirOpenFiltered(&pHandle->dir.SearchHandle, pszFullPath,
+                                       RTDIRFILTER_WINNT, RTDIROPENFILTERED_FLAGS_NO_SYMLINKS);
 
                 /* free the path string */
@@ -1728 +1730 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTSymlinkRead(pszFullPath, (char *) pBuffer, cbBuffer);
+        rc = RTSymlinkRead(pszFullPath, (char *) pBuffer, cbBuffer, RTSYMLINKREAD_FLAGS_NO_SYMLINKS);
 
         /* free the path string */
@@ -1851 +1853 @@
 #endif
 
-            rc = RTFileSetMode((RTFILE)pHandle->file.Handle, fMode);
+            rc = RTFileSetMode(pHandle->file.Handle, fMode);
             if (rc != VINF_SUCCESS)
             {
@@ -2175 +2177 @@
         {
             if (flags & SHFL_REMOVE_SYMLINK)
-                rc = RTSymlinkDelete(pszFullPath);
-            else if (flags & SHFL_REMOVE_FILE)
-                rc = RTFileDelete(pszFullPath);
+                rc = RTSymlinkDelete(pszFullPath, RTSYMLINKDELETE_FLAGS_NO_SYMLINKS);
             else
-                rc = RTDirRemove(pszFullPath);
+                rc = RTPathUnlink(pszFullPath, RTPATHUNLINK_FLAGS_NO_SYMLINKS);
         }
 
@@ -2241 +2241 @@
             if (flags & SHFL_RENAME_FILE)
             {
-                rc = RTFileMove(pszFullPathSrc, pszFullPathDest, (flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTFILEMOVE_FLAGS_REPLACE : 0);
+                rc = RTFileMove(pszFullPathSrc, pszFullPathDest,
+                                  ((flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTFILEMOVE_FLAGS_REPLACE : 0)
+                                | RTFILEMOVE_FLAGS_NO_SYMLINKS);
             }
             else
             {
                 /* NT ignores the REPLACE flag and simply return and already exists error. */
-                rc = RTDirRename(pszFullPathSrc, pszFullPathDest, (flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTPATHRENAME_FLAGS_REPLACE : 0);
+                rc = RTDirRename(pszFullPathSrc, pszFullPathDest,
+                                   ((flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTPATHRENAME_FLAGS_REPLACE : 0)
+                                 | RTPATHRENAME_FLAGS_NO_SYMLINKS);
             }
         }
@@ -2286 +2290 @@
         return rc;
 
-    rc = RTSymlinkCreate(pszFullNewPath, (const char *)pOldPath->String.utf8, RTSYMLINKTYPE_UNKNOWN);
+    rc = RTSymlinkCreate(pszFullNewPath, (const char *)pOldPath->String.utf8,
+                         RTSYMLINKTYPE_UNKNOWN, RTSYMLINKCREATE_FLAGS_NO_SYMLINKS);
     if (RT_SUCCESS(rc))
     {