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

Timestamp:

Aug 10, 2020 4:02:28 PM (5 years ago)

Author:

vboxsync

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

139806

Message:

IPRT: RTFTPServer -> RTFtpServer. bugref:9437

Location:

trunk/src/VBox/Runtime/tools

Files:

• Makefile.kmk (modified) (1 diff)
• RTFtpServer.cpp (moved) (moved from trunk/src/VBox/Runtime/tools/RTFTPServer.cpp ) (8 diffs)

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -140 +140 @@
  RTLdrFlt_SOURCES = RTLdrFlt.cpp
 
- # RTFTPServer implements a simple FTP server.
- PROGRAMS += RTFTPServer
- RTFTPServer_TEMPLATE = VBoxR3Tool
- RTFTPServer_SOURCES = RTFTPServer.cpp
+ # RTFtpServer implements a simple FTP server.
+ PROGRAMS += RTFtpServer
+ RTFtpServer_TEMPLATE = VBoxR3Tool
+ RTFtpServer_SOURCES = RTFtpServer.cpp
 
  # RTGzip - our gzip clone (for testing the gzip/gunzip streaming code)

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

@@ -2 +2 @@
 /** @file
  * IPRT - Utility for running a (simple) FTP server.
+ *
+ * Use this setup to best see what's going on:
+ *    VBOX_LOG=rt_ftp=~0
+ *    VBOX_LOG_DEST="nofile stderr"
+ *    VBOX_LOG_FLAGS="unbuffered enabled thread msprog"
+ *
  */
 
@@ -25 +31 @@
  */
 
-/*
- * Use this setup to best see what's going on:
- *
- *    VBOX_LOG=rt_ftp=~0
- *    VBOX_LOG_DEST="nofile stderr"
- *    VBOX_LOG_FLAGS="unbuffered enabled thread msprog"
- *
- */
-
 
 /*********************************************************************************************************************************
@@ -111 +108 @@
 /** Set by the signal handler when the FTP server shall be terminated. */
 static volatile bool  g_fCanceled = false;
-static FTPSERVERDATA  g_FTPServerData;
+static FTPSERVERDATA  g_FtpServerData;
 
 
@@ -512 +509 @@
     uint16_t uPort         = 2121;
 
-    RT_ZERO(g_FTPServerData);
+    RT_ZERO(g_FtpServerData);
 
     /*
@@ -546 +543 @@
 
             case 'r':
-                RTStrCopy(g_FTPServerData.szPathRootAbs, sizeof(g_FTPServerData.szPathRootAbs), ValueUnion.psz);
+                RTStrCopy(g_FtpServerData.szPathRootAbs, sizeof(g_FtpServerData.szPathRootAbs), ValueUnion.psz);
                 break;
 
@@ -581 +578 @@
     }
 
-    if (!strlen(g_FTPServerData.szPathRootAbs))
+    if (!strlen(g_FtpServerData.szPathRootAbs))
     {
         /* By default use the current directory as serving root directory. */
-        rc = RTPathGetCurrent(g_FTPServerData.szPathRootAbs, sizeof(g_FTPServerData.szPathRootAbs));
+        rc = RTPathGetCurrent(g_FtpServerData.szPathRootAbs, sizeof(g_FtpServerData.szPathRootAbs));
         if (RT_FAILURE(rc))
             return RTMsgErrorExit(RTEXITCODE_FAILURE, "Retrieving current directory failed: %Rrc", rc);
@@ -590 +587 @@
 
     /* Initialize CWD. */
-    RTStrPrintf2(g_FTPServerData.szCWD, sizeof(g_FTPServerData.szCWD), "/");
+    RTStrPrintf2(g_FtpServerData.szCWD, sizeof(g_FtpServerData.szCWD), "/");
 
     /* Install signal handler. */
@@ -619 +616 @@
         RTFTPSERVER hFTPServer;
         rc = RTFtpServerCreate(&hFTPServer, szAddress, uPort, &Callbacks,
-                               &g_FTPServerData, sizeof(g_FTPServerData));
+                               &g_FtpServerData, sizeof(g_FtpServerData));
         if (RT_SUCCESS(rc))
         {
             RTPrintf("Starting FTP server at %s:%RU16 ...\n", szAddress, uPort);
-            RTPrintf("Root directory is '%s'\n", g_FTPServerData.szPathRootAbs);
+            RTPrintf("Root directory is '%s'\n", g_FtpServerData.szPathRootAbs);
 
             RTPrintf("Running FTP server ...\n");