Changeset 82841 in vbox for trunk/src/VBox

Timestamp:

Jan 23, 2020 10:02:26 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/FTP: Implemented support for directory traversing. bugref:9646

File:

• trunk/src/VBox/Runtime/tools/RTFTPServer.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/tools/RTFTPServer.cpp

@@ -69 +69 @@
 typedef struct FTPSERVERDATA
 {
-    char szRootDir[RTPATH_MAX];
+    /** The absolute path of the FTP server's root directory. */
+    char szPathRootAbs[RTPATH_MAX];
+    /** The relative current working directory (CWD) to szRootDir. */
     char szCWD[RTPATH_MAX];
     RTFILE hFile;
@@ -241 +243 @@
 static DECLCALLBACK(int) onFileGetSize(PRTFTPCALLBACKDATA pData, const char *pcszPath, uint64_t *puSize)
 {
-    RT_NOREF(pData);
+    PFTPSERVERDATA pThis = (PFTPSERVERDATA)pData->pvUser;
+    Assert(pData->cbUser == sizeof(FTPSERVERDATA));
+
+    char *pszStat = NULL;
+    if (RTStrAPrintf(&pszStat, "%s/%s", pThis->szPathRootAbs, pcszPath) <= 0)
+        return VERR_NO_MEMORY;
 
     RTPrintf("Retrieving file size for '%s' ...\n", pcszPath);
@@ -256 +263 @@
     }
 
+    RTStrFree(pszStat);
+
     return rc;
 }
@@ -264 +273 @@
     Assert(pData->cbUser == sizeof(FTPSERVERDATA));
 
-    const char *pcszStat = pcszPath ? pcszPath : pThis->szCWD;
-
-    RTPrintf("Stat for '%s'\n", pcszStat);
+    char *pszStat = NULL;
+    if (RTStrAPrintf(&pszStat, "%s/%s", pThis->szPathRootAbs, pcszPath) <= 0)
+        return VERR_NO_MEMORY;
+
+    RTPrintf("Stat for '%s'\n", pszStat);
 
     RTFILE hFile;
-    int rc = RTFileOpen(&hFile, pcszStat,
+    int rc = RTFileOpen(&hFile, pszStat,
                         RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (RT_SUCCESS(rc))
@@ -284 +295 @@
     }
 
+    RTStrFree(pszStat);
+
     return rc;
 }
@@ -327 +340 @@
     /* Construct absolute path. */
     char *pszPathAbs = NULL;
-    int rc = RTStrAAppend(&pszPathAbs, pThis->szRootDir);
-    AssertRCReturn(rc, rc);
-    rc = RTStrAAppend(&pszPathAbs, pcszPath);
-    AssertRCReturn(rc, rc);
+    if (RTStrAPrintf(&pszPathAbs, "%s/%s", pThis->szPathRootAbs, pcszPath) <= 0)
+        return VERR_NO_MEMORY;
 
     RTPrintf("Opening directory '%s'\n", pszPathAbs);
 
-    rc = RTVfsChainOpenDir(pszPathAbs, 0 /*fFlags*/, &pHandle->hVfsDir, NULL /* poffError */, NULL /* pErrInfo */);
+    int rc = RTVfsChainOpenDir(pszPathAbs, 0 /*fFlags*/, &pHandle->hVfsDir, NULL /* poffError */, NULL /* pErrInfo */);
     if (RT_SUCCESS(rc))
     {
@@ -489 +500 @@
 
             case 'r':
-                RTStrCopy(g_FTPServerData.szRootDir, sizeof(g_FTPServerData.szRootDir), ValueUnion.psz);
+                RTStrCopy(g_FTPServerData.szPathRootAbs, sizeof(g_FTPServerData.szPathRootAbs), ValueUnion.psz);
                 break;
 
@@ -524 +535 @@
     }
 
-    if (!strlen(g_FTPServerData.szRootDir))
+    if (!strlen(g_FTPServerData.szPathRootAbs))
     {
         /* By default use the current directory as serving root directory. */
-        rc = RTPathGetCurrent(g_FTPServerData.szRootDir, sizeof(g_FTPServerData.szRootDir));
+        rc = RTPathGetCurrent(g_FTPServerData.szPathRootAbs, sizeof(g_FTPServerData.szPathRootAbs));
         if (RT_FAILURE(rc))
             return RTMsgErrorExit(RTEXITCODE_FAILURE, "Retrieving current directory failed: %Rrc", rc);
@@ -566 +577 @@
         {
             RTPrintf("Starting FTP server at %s:%RU16 ...\n", szAddress, uPort);
-            RTPrintf("Root directory is '%s'\n", g_FTPServerData.szRootDir);
+            RTPrintf("Root directory is '%s'\n", g_FTPServerData.szPathRootAbs);
 
             RTPrintf("Running FTP server ...\n");