Changeset 81323 in vbox

Timestamp:

Oct 17, 2019 3:27:53 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Also use shClTransferResolvePathAbs() in ShClTransferObjOpen(), simplified ShClTransferListOpen(). Untested.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (11 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -35 +35 @@
 static PSHCLTRANSFER shClTransferCtxGetTransferInternal(PSHCLTRANSFERCTX pTransferCtx, uint32_t uIdx);
 static int shClConvertFileCreateFlags(bool fWritable, unsigned fShClFlags, RTFMODE fMode, SHCLOBJHANDLE handleInitial, uint64_t *pfOpen);
+static int shClTransferResolvePathAbs(PSHCLTRANSFER pTransfer, const char *pszPath, uint32_t fFlags, char **ppszResolved);
 
 /** @todo Split this file up in different modules. */
@@ -815 +816 @@
                 if (RT_SUCCESS(rc))
                 {
-                    pInfo->pszPathLocalAbs = RTPathJoinA(pTransfer->pszPathRootAbs, pOpenCreateParms->pszPath);
-                    if (pInfo->pszPathLocalAbs)
+                    rc = shClTransferResolvePathAbs(pTransfer, pOpenCreateParms->pszPath, 0 /* fFlags */, &pInfo->pszPathLocalAbs);
+                    if (RT_SUCCESS(rc))
                     {
                         rc = RTFileOpen(&pInfo->u.Local.hFile, pInfo->pszPathLocalAbs, fOpen);
@@ -826 +827 @@
                             LogRel(("Shared Clipboard: Error opening file '%s', rc=%Rrc\n", pInfo->pszPathLocalAbs, rc));
                     }
-                    else
-                        rc = VERR_NO_MEMORY;
                 }
             }
@@ -1351 +1350 @@
     AssertReturn   (fFlags == 0, VERR_INVALID_PARAMETER);
 
+    LogFlowFunc(("pszPathRootAbs=%s, pszPath=%s\n", pTransfer->pszPathRootAbs, pszPath));
+
     /* Paranoia. */
     if (   !strlen(pTransfer->pszPathRootAbs)
@@ -1366 +1367 @@
     if (pszResolved)
     {
-        LogFlowFunc(("pszPathRootAbs=%s, pszPath=%s -> %s\n", pTransfer->pszPathRootAbs, pszPath, pszResolved));
+        LogFlowFunc(("Resolved to: %s\n", pszResolved));
 
         *ppszResolved = pszResolved;
@@ -1403 +1404 @@
         LogFlowFunc(("pszPath=%s\n", pOpenParms->pszPath));
 
-        char *pszPathAbs;
-        rc = shClTransferResolvePathAbs(pTransfer, pOpenParms->pszPath, 0 /* fFlags */, &pszPathAbs);
-        if (RT_SUCCESS(rc))
-        {
-            PSHCLLISTHANDLEINFO pInfo
-                = (PSHCLLISTHANDLEINFO)RTMemAlloc(sizeof(SHCLLISTHANDLEINFO));
-            if (pInfo)
+        PSHCLLISTHANDLEINFO pInfo
+            = (PSHCLLISTHANDLEINFO)RTMemAllocZ(sizeof(SHCLLISTHANDLEINFO));
+        if (pInfo)
+        {
+            rc = shClTransferResolvePathAbs(pTransfer, pOpenParms->pszPath, 0 /* fFlags */, &pInfo->pszPathLocalAbs);
+            if (RT_SUCCESS(rc))
             {
                 rc = ShClTransferListHandleInfoInit(pInfo);
@@ -1415 +1415 @@
                 {
                     RTFSOBJINFO objInfo;
-                    rc = RTPathQueryInfo(pOpenParms->pszPath, &objInfo, RTFSOBJATTRADD_NOTHING);
+                    rc = RTPathQueryInfo(pInfo->pszPathLocalAbs, &objInfo, RTFSOBJATTRADD_NOTHING);
                     if (RT_SUCCESS(rc))
                     {
                         if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
                         {
-                            rc = RTDirOpen(&pInfo->u.Local.hDir, pszPathAbs);
+                            rc = RTDirOpen(&pInfo->u.Local.hDir, pInfo->pszPathLocalAbs);
                             if (RT_SUCCESS(rc))
                             {
                                 pInfo->enmType = SHCLOBJTYPE_DIRECTORY;
 
-                                LogRel2(("Shared Clipboard: Opening directory '%s'\n", pszPathAbs));
+                                LogRel2(("Shared Clipboard: Opening directory '%s'\n", pInfo->pszPathLocalAbs));
                             }
                             else
@@ -1433 +1433 @@
                         else if (RTFS_IS_FILE(objInfo.Attr.fMode))
                         {
-                            rc = RTFileOpen(&pInfo->u.Local.hFile, pszPathAbs,
+                            rc = RTFileOpen(&pInfo->u.Local.hFile, pInfo->pszPathLocalAbs,
                                             RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
                             if (RT_SUCCESS(rc))
@@ -1439 +1439 @@
                                 pInfo->enmType = SHCLOBJTYPE_FILE;
 
-                                LogRel2(("Shared Clipboard: Opening file '%s'\n", pszPathAbs));
+                                LogRel2(("Shared Clipboard: Opening file '%s'\n", pInfo->pszPathLocalAbs));
                             }
                             else
@@ -1449 +1449 @@
                         if (RT_SUCCESS(rc))
                         {
-                            pInfo->hList           = sharedClipboardTransferListHandleNew(pTransfer);
-                            pInfo->pszPathLocalAbs = RTStrDup(pszPathAbs);
-                            if (pInfo->pszPathLocalAbs)
-                            {
-                                RTListAppend(&pTransfer->lstList, &pInfo->Node);
-                                pTransfer->cListHandles++;
-
-                                LogFlowFunc(("pszPathLocalAbs=%s, hList=%RU64, cListHandles=%RU32\n",
-                                             pInfo->pszPathLocalAbs, pInfo->hList, pTransfer->cListHandles));
-
-                                *phList = pInfo->hList;
-                            }
-                            else
-                                rc = VERR_NO_MEMORY;
+                            pInfo->hList = sharedClipboardTransferListHandleNew(pTransfer);
+
+                            RTListAppend(&pTransfer->lstList, &pInfo->Node);
+                            pTransfer->cListHandles++;
+
+                            LogFlowFunc(("pszPathLocalAbs=%s, hList=%RU64, cListHandles=%RU32\n",
+                                         pInfo->pszPathLocalAbs, pInfo->hList, pTransfer->cListHandles));
                         }
                         else
@@ -1478 +1471 @@
                         }
                     }
-
-                    if (RT_FAILURE(rc))
-                        ShClTransferListHandleInfoDestroy(pInfo);
-                }
-
-                if (RT_FAILURE(rc))
-                {
-                    RTMemFree(pInfo);
-                    pInfo = NULL;
                 }
             }
-            else
-                rc = VERR_NO_MEMORY;
-
-            RTStrFree(pszPathAbs);
-        }
+
+            if (RT_FAILURE(rc))
+            {
+                ShClTransferListHandleInfoDestroy(pInfo);
+
+                RTMemFree(pInfo);
+                pInfo = NULL;
+            }
+        }
+        else
+            rc = VERR_NO_MEMORY;
     }
     else if (pTransfer->State.enmSource == SHCLSOURCE_REMOTE)