Changeset 87072 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2020 4:51:00 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Bugfixes, docs. bugref:9874

File:

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

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

@@ -70 +70 @@
 *   Prototypes                                                                                                                   *
 *********************************************************************************************************************************/
-int ShClTransferHttpServerDestroyInternal(PSHCLHTTPSERVER pThis);
+int shClTransferHttpServerDestroyInternal(PSHCLHTTPSERVER pThis);
 
 
@@ -105 +105 @@
 static int shClTransferHttpPathValidate(PSHCLHTTPSERVER pThis, const char *pszUrl)
 {
+    AssertPtrReturn(pszUrl, VERR_INVALID_POINTER);
+
+    int rc = VERR_PATH_NOT_FOUND;
+
     PSHCLHTTPSERVERTRANSFER pSrvTx;
     RTListForEach(&pThis->lstTransfers, pSrvTx, SHCLHTTPSERVERTRANSFER, Node)
     {
         AssertPtr(pSrvTx->pTransfer);
+
+        const char *psz = pszUrl;
+
         /* Be picky here, do a case sensitive comparison. */
-        if (RTStrStartsWith(pszUrl, pSrvTx->szPathVirtual))
-            return VINF_SUCCESS;
-    }
-
-    return VERR_PATH_NOT_FOUND;
-}
-
+        if (RTStrStartsWith(psz, pSrvTx->szPathVirtual))
+        {
+            /* Skip the virtual root path. */
+            psz += RTStrNLen(pSrvTx->szPathVirtual, RTPATH_MAX);
+
+
+
+            LogFlowFunc(("psz=%s\n", psz));
+
+            rc = VINF_SUCCESS;
+            break;
+        }
+    }
+
+    LogFlowFunc(("pszUrl=%s, rc=%Rrc\n", pszUrl, rc));
+    return rc;
+}
+
+/** @copydoc RTHTTPSERVERCALLBACKS::pfnOpen */
 static DECLCALLBACK(int) shClTransferHttpOpen(PRTHTTPCALLBACKDATA pData, PRTHTTPSERVERREQ pReq, void **ppvHandle)
 {
@@ -132 +151 @@
 }
 
+/** @copydoc RTHTTPSERVERCALLBACKS::pfnRead */
 static DECLCALLBACK(int) shClTransferHttpRead(PRTHTTPCALLBACKDATA pData, void *pvHandle, void *pvBuf, size_t cbBuf, size_t *pcbRead)
 {
@@ -145 +165 @@
 }
 
+/** @copydoc RTHTTPSERVERCALLBACKS::pfnClose */
 static DECLCALLBACK(int) shClTransferHttpClose(PRTHTTPCALLBACKDATA pData, void *pvHandle)
 {
@@ -158 +179 @@
 }
 
+/** @copydoc RTHTTPSERVERCALLBACKS::pfnQueryInfo */
 static DECLCALLBACK(int) shClTransferHttpQueryInfo(PRTHTTPCALLBACKDATA pData,
                                                    PRTHTTPSERVERREQ pReq, PRTFSOBJINFO pObjInfo, char **ppszMIMEHint)
@@ -174 +196 @@
 }
 
+/** @copydoc RTHTTPSERVERCALLBACKS::pfnDestroy */
 static DECLCALLBACK(int) shClTransferHttpDestroy(PRTHTTPCALLBACKDATA pData)
 {
@@ -179 +202 @@
     Assert(pData->cbUser == sizeof(SHCLHTTPSERVER));
 
-    return ShClTransferHttpServerDestroyInternal(pThis);
+    return shClTransferHttpServerDestroyInternal(pThis);
 }