Changeset 83400 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Mar 25, 2020 9:31:22 AM (5 years ago)

Author:

vboxsync

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

136617

Message:

Guest Control/VBoxService: Resolved another @todo: Revamped vgsvcGstCtrlProcessDumpToFile() and renamed it to vgsvcGstCtrlProcessDbgDumpToFileF(). bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -32 +32 @@
 #include <iprt/process.h>
 #include <iprt/semaphore.h>
+#include <iprt/string.h>
 #include <iprt/string.h>
 #include <iprt/thread.h>
@@ -1418 +1419 @@
 
 #ifdef DEBUG
-static int vgsvcGstCtrlProcessDumpToFile(const char *pszFileName, void *pvBuf, size_t cbBuf)
-{
-    AssertPtrReturn(pszFileName, VERR_INVALID_POINTER);
+/**
+ * Dumps content to a file in the OS temporary directory.
+ *
+ * @returns VBox status code.
+ * @param   pvBuf               Buffer of content to dump.
+ * @param   cbBuf               Size (in bytes) of content to dump.
+ * @param   pszFileNmFmt        Pointer to the file name format string, @see pg_rt_str_format.
+ * @param   ...                 The format argument.
+ */
+static int vgsvcGstCtrlProcessDbgDumpToFileF(const void *pvBuf, size_t cbBuf, const char *pszFileNmFmt, ...)
+{
+    AssertPtrReturn(pszFileNmFmt, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
 
@@ -1426 +1436 @@
         return VINF_SUCCESS;
 
-    char szFile[RTPATH_MAX];
-
-    int rc = RTPathTemp(szFile, sizeof(szFile));
+    va_list va;
+    va_start(va, pszFileNmFmt);
+
+    char *pszFileName = NULL;
+    const int cchFileName = RTStrAPrintfV(&pszFileName, pszFileNmFmt, va);
+
+    va_end(va);
+
+    if (!cchFileName)
+        return VERR_NO_MEMORY;
+
+    char szPathFileAbs[RTPATH_MAX];
+    int rc = RTPathTemp(szPathFileAbs, sizeof(szPathFileAbs));
     if (RT_SUCCESS(rc))
-        rc = RTPathAppend(szFile, sizeof(szFile), pszFileName);
+        rc = RTPathAppend(szPathFileAbs, sizeof(szPathFileAbs), pszFileName);
+
+    RTStrFree(pszFileName);
 
     if (RT_SUCCESS(rc))
     {
-        VGSvcVerbose(4, "Dumping %ld bytes to '%s'\n", cbBuf, szFile);
+        VGSvcVerbose(4, "Dumping %zu bytes to '%s'\n", cbBuf, szPathFileAbs);
 
         RTFILE fh;
-        rc = RTFileOpen(&fh, szFile, RTFILE_O_OPEN_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);
+        rc = RTFileOpen(&fh, szPathFileAbs, RTFILE_O_OPEN_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);
         if (RT_SUCCESS(rc))
         {
@@ -1923 +1945 @@
                )
             {
-                /** @todo r=bird: vgsvcGstCtrlProcessDumpToFile(void *pvBuf, size_t cbBuf, const char *pszFileNmFmt, ...) */
-                char szDumpFile[RTPATH_MAX];
-                if (!RTStrPrintf(szDumpFile, sizeof(szDumpFile), "VBoxService_Session%RU32_PID%RU32_StdOut.txt",
-                                 pSession->StartupInfo.uSessionID, pThis->uPID)) rc = VERR_BUFFER_UNDERFLOW;
-                if (RT_SUCCESS(rc))
-                    rc = vgsvcGstCtrlProcessDumpToFile(szDumpFile, pvBuf, cbRead);
+                rc = vgsvcGstCtrlProcessDbgDumpToFileF(pvBuf, cbRead, "VBoxService_Session%RU32_PID%RU32_StdOut.txt",
+                                                pSession->StartupInfo.uSessionID, pThis->uPID);
                 AssertRC(rc);
             }
@@ -1934 +1952 @@
                      && uHandle == OUTPUT_HANDLE_ID_STDERR)
             {
-                char szDumpFile[RTPATH_MAX];
-                if (!RTStrPrintf(szDumpFile, sizeof(szDumpFile), "VBoxService_Session%RU32_PID%RU32_StdErr.txt",
-                                 pSession->StartupInfo.uSessionID, pThis->uPID))
-                    rc = VERR_BUFFER_UNDERFLOW;
-                if (RT_SUCCESS(rc))
-                    rc = vgsvcGstCtrlProcessDumpToFile(szDumpFile, pvBuf, cbRead);
+                rc = vgsvcGstCtrlProcessDbgDumpToFileF(pvBuf, cbRead, "VBoxService_Session%RU32_PID%RU32_StdErr.txt",
+                                                pSession->StartupInfo.uSessionID, pThis->uPID);
                 AssertRC(rc);
             }