vbox的更動 35482 路徑 trunk/src/VBox/HostServices/SharedFolders

時間撮記:

2011-1-11 下午12:53:42 (14 年 以前)

作者:

vboxsync

訊息:

HostServices/Shared Folders: fixed parameter parsing for symlinks, fixes 32/64-bit issue (thanks Brian Campbell!)

位置:

trunk/src/VBox/HostServices/SharedFolders

檔案:

• service.cpp (修改) (3 筆差異)
• vbsf.cpp (修改) (3 筆差異)
• vbsf.h (修改) (1 筆差異)

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

@@ -1169 +1169 @@
                 rc = VERR_INVALID_PARAMETER;
             }
-            else
-            if (   paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT   /* root */
-                || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR     /* newPath */
-                || paParms[2].type != VBOX_HGCM_SVC_PARM_PTR     /* oldPath */
-                || paParms[3].type != VBOX_HGCM_SVC_PARM_PTR     /* info */
+            else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT   /* root */
+                     || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR     /* newPath */
+                     || paParms[2].type != VBOX_HGCM_SVC_PARM_PTR     /* oldPath */
+                     || paParms[3].type != VBOX_HGCM_SVC_PARM_PTR     /* info */
                     )
             {
@@ -1184 +1183 @@
                 SHFLSTRING  *pNewPath = (SHFLSTRING *)paParms[1].u.pointer.addr;
                 SHFLSTRING  *pOldPath = (SHFLSTRING *)paParms[2].u.pointer.addr;
-                RTFSOBJINFO *pInfo    = (RTFSOBJINFO *)paParms[3].u.pointer.addr;
+                SHFLFSOBJINFO *pInfo  = (SHFLFSOBJINFO *)paParms[3].u.pointer.addr;
                 uint32_t     cbInfo   = paParms[3].u.pointer.size;
 
@@ -1190 +1189 @@
                 if (    !ShflStringIsValid(pNewPath, paParms[1].u.pointer.size)
                     ||  !ShflStringIsValid(pOldPath, paParms[2].u.pointer.size)
-                    ||  (cbInfo != sizeof(RTFSOBJINFO))
+                    ||  (cbInfo != sizeof(SHFLFSOBJINFO))
                    )
                 {

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

@@ -550 +550 @@
                             Assert(rc == VINF_SUCCESS || rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
                         }
-                        else
-                        if (end == src)
+                        else if (end == src)
                             rc = VINF_SUCCESS;  /* trailing delimiter */
                         else
@@ -2147 +2146 @@
 }
 
-int vbsfSymlink(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pNewPath, SHFLSTRING *pOldPath, RTFSOBJINFO *pInfo)
+int vbsfSymlink(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pNewPath, SHFLSTRING *pOldPath, SHFLFSOBJINFO *pInfo)
 {
     int rc = VINF_SUCCESS;
@@ -2164 +2163 @@
     rc = RTSymlinkCreate(pszFullNewPath, (const char *)pOldPath->String.utf8, RTSYMLINKTYPE_UNKNOWN);
     if (RT_SUCCESS (rc))
-        rc = RTPathQueryInfoEx(pszFullNewPath, pInfo, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+    {
+        RTFSOBJINFO info;
+        rc = RTPathQueryInfoEx(pszFullNewPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+        if (RT_SUCCESS(rc))
+            vbfsCopyFsObjInfoFromIprt(pInfo, &info);
+    }
 
     vbsfFreeFullPath(pszFullNewPath);

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

@@ -39 +39 @@
 int vbsfQueryFileInfo(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLHANDLE Handle, uint32_t flags, uint32_t *pcbBuffer, uint8_t *pBuffer);
 int vbsfReadLink(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pPath, uint32_t cbPath, uint8_t *pBuffer, uint32_t cbBuffer);
-int vbsfSymlink(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pNewPath, SHFLSTRING *pOldPath, RTFSOBJINFO *pInfo);
+int vbsfSymlink(SHFLCLIENTDATA *pClient, SHFLROOT root, SHFLSTRING *pNewPath, SHFLSTRING *pOldPath, SHFLFSOBJINFO *pInfo);
 
 #endif /* __VBSF__H */