Changeset 72264 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 18, 2018 4:14:52 PM (7 years ago)

Author:

vboxsync

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

122712

Message:

IPRT/rtDbgCfgTryDownloadAndOpen: Support non-url servers, like UNC.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgcfg.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgcfg.cpp

@@ -739 +739 @@
                                       PFNRTDBGCFGOPEN pfnCallback, void *pvUser1, void *pvUser2)
 {
-#ifdef IPRT_WITH_HTTP
     RT_NOREF_PV(pszUuidMappingSubDir); /** @todo do we bother trying pszUuidMappingSubDir? */
     RT_NOREF_PV(pszCacheSuffix); /** @todo do we bother trying pszUuidMappingSubDir? */
@@ -795 +794 @@
 
     /*
-     * Download the file.
-     */
-    RTHTTP hHttp;
-    rc = RTHttpCreate(&hHttp);
-    if (RT_FAILURE(rc))
-        return rc;
-    RTHttpUseSystemProxySettings(hHttp);
-
-    static const char * const s_apszHeaders[] =
-    {
-        "User-Agent: Microsoft-Symbol-Server/6.6.0999.9",
-        "Pragma: no-cache",
-    };
-
-    rc = RTHttpSetHeaders(hHttp, RT_ELEMENTS(s_apszHeaders), s_apszHeaders);
-    if (RT_SUCCESS(rc))
-    {
-        char szUrl[_2K];
-        RTStrPrintf(szUrl, sizeof(szUrl), "%s/%s/%s/%s", pszServer, pszFilename, pszCacheSubDir, pszFilename);
-
-        /** @todo Use some temporary file name and rename it after the operation
-         *        since not all systems support read-deny file sharing
-         *        settings. */
-        rtDbgCfgLog2(pThis, "Downloading '%s' to '%s'...\n", szUrl, pszPath);
-        rc = RTHttpGetFile(hHttp, szUrl, pszPath);
-        if (RT_FAILURE(rc))
-        {
-            RTFileDelete(pszPath);
-            rtDbgCfgLog1(pThis, "%Rrc on URL '%s'\n", rc, szUrl);
-        }
-        if (rc == VERR_HTTP_NOT_FOUND)
-        {
-            /* Try the compressed version of the file. */
-            pszPath[strlen(pszPath) - 1] = '_';
-            szUrl[strlen(szUrl)     - 1] = '_';
-            rtDbgCfgLog2(pThis, "Downloading '%s' to '%s'...\n", szUrl, pszPath);
-            rc = RTHttpGetFile(hHttp, szUrl, pszPath);
+     * Download/copy the file.
+     */
+    char szUrl[_2K];
+    /* Download URL? */
+    if (   RTStrIStartsWith(pszServer, "http://")
+        || RTStrIStartsWith(pszServer, "https://")
+        || RTStrIStartsWith(pszServer, "ftp://") )
+    {
+#ifdef IPRT_WITH_HTTP
+        RTHTTP hHttp;
+        rc = RTHttpCreate(&hHttp);
+        if (RT_SUCCESS(rc))
+        {
+            RTHttpUseSystemProxySettings(hHttp);
+
+            static const char * const s_apszHeaders[] =
+            {
+                "User-Agent: Microsoft-Symbol-Server/6.6.0999.9",
+                "Pragma: no-cache",
+            };
+
+            rc = RTHttpSetHeaders(hHttp, RT_ELEMENTS(s_apszHeaders), s_apszHeaders);
             if (RT_SUCCESS(rc))
-                rc = rtDbgCfgUnpackMsCacheFile(pThis, pszPath, pszFilename);
-            else
-            {
-                rtDbgCfgLog1(pThis, "%Rrc on URL '%s'\n", rc, pszPath);
+            {
+                RTStrPrintf(szUrl, sizeof(szUrl), "%s/%s/%s/%s", pszServer, pszFilename, pszCacheSubDir, pszFilename);
+
+                /** @todo Use some temporary file name and rename it after the operation
+                 *        since not all systems support read-deny file sharing
+                 *        settings. */
+                rtDbgCfgLog2(pThis, "Downloading '%s' to '%s'...\n", szUrl, pszPath);
+                rc = RTHttpGetFile(hHttp, szUrl, pszPath);
+                if (RT_FAILURE(rc))
+                {
+                    RTFileDelete(pszPath);
+                    rtDbgCfgLog1(pThis, "%Rrc on URL '%s'\n", rc, szUrl);
+                }
+                if (rc == VERR_HTTP_NOT_FOUND)
+                {
+                    /* Try the compressed version of the file. */
+                    pszPath[strlen(pszPath) - 1] = '_';
+                    szUrl[strlen(szUrl)     - 1] = '_';
+                    rtDbgCfgLog2(pThis, "Downloading '%s' to '%s'...\n", szUrl, pszPath);
+                    rc = RTHttpGetFile(hHttp, szUrl, pszPath);
+                    if (RT_SUCCESS(rc))
+                        rc = rtDbgCfgUnpackMsCacheFile(pThis, pszPath, pszFilename);
+                    else
+                    {
+                        rtDbgCfgLog1(pThis, "%Rrc on URL '%s'\n", rc, pszPath);
+                        RTFileDelete(pszPath);
+                    }
+                }
+            }
+
+            RTHttpDestroy(hHttp);
+        }
+#else
+        rc = VWRN_NOT_FOUND;
+#endif
+    }
+    /* No download, assume dir on server share. */
+    else
+    {
+        if (RTStrIStartsWith(pszServer, "file:///"))
+            pszServer += 4 + 1 + 3 - 1;
+
+        /* Compose the path to the uncompressed file on the server. */
+        rc = RTPathJoin(szUrl, sizeof(szUrl), pszServer, pszFilename);
+        if (RT_SUCCESS(rc))
+            rc = RTPathAppend(szUrl, sizeof(szUrl), pszCacheSubDir);
+        if (RT_SUCCESS(rc))
+            rc = RTPathAppend(szUrl, sizeof(szUrl), pszFilename);
+        if (RT_SUCCESS(rc))
+        {
+            rtDbgCfgLog2(pThis, "Copying '%s' to '%s'...\n", szUrl, pszPath);
+            rc = RTFileCopy(szUrl, pszPath);
+            if (RT_FAILURE(rc))
+            {
                 RTFileDelete(pszPath);
-            }
-        }
-    }
-
-    RTHttpDestroy(hHttp);
-
+                rtDbgCfgLog1(pThis, "%Rrc on '%s'\n", rc, szUrl);
+
+                /* Try the compressed version. */
+                pszPath[strlen(pszPath) - 1] = '_';
+                szUrl[strlen(szUrl)     - 1] = '_';
+                rtDbgCfgLog2(pThis, "Copying '%s' to '%s'...\n", szUrl, pszPath);
+                rc = RTFileCopy(szUrl, pszPath);
+                if (RT_SUCCESS(rc))
+                    rc = rtDbgCfgUnpackMsCacheFile(pThis, pszPath, pszFilename);
+                else
+                {
+                    rtDbgCfgLog1(pThis, "%Rrc on '%s'\n", rc, pszPath);
+                    RTFileDelete(pszPath);
+                }
+            }
+        }
+    }
     if (RT_SUCCESS(rc))
     {
@@ -869 +914 @@
 
     return rc;
-
-#else  /* !IPRT_WITH_HTTP */
-    RT_NOREF_PV(pThis); RT_NOREF_PV(pszServer); RT_NOREF_PV(pszPath); RT_NOREF_PV(pszCacheSubDir);
-    RT_NOREF_PV(pszUuidMappingSubDir); RT_NOREF_PV(pSplitFn); RT_NOREF_PV(pszCacheSuffix); RT_NOREF_PV(fFlags);
-    RT_NOREF_PV(pfnCallback); RT_NOREF_PV(pvUser1); RT_NOREF_PV(pvUser2);
-    return VWRN_NOT_FOUND;
-#endif /* !IPRT_WITH_HTTP */
 }