Changeset 42995 in vbox

Timestamp:

Aug 27, 2012 11:41:36 AM (13 years ago)

Author:

vboxsync

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

80327

Message:

VBoxServiceToolBox.cpp/cat: Fixed bug in --output handling. The output string was passed as the format string to a RTStrPrintf call. Fortuantely, the RTStrPrintf call and extra buffering is completely unnecessary. Replaced szOutput+RTStrPrintf by a pszOutput.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp (modified) (3 diffs)

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

@@ -367 +367 @@
     bool fUsageOK = true;
 
-    char szOutput[RTPATH_MAX] = { 0 };
+    const char *pszOutput = NULL;
     RTFILE hOutput = NIL_RTFILE;
     uint32_t fFlags = RTFILE_O_CREATE_REPLACE /* Output file flags. */
@@ -403 +403 @@
 
             case 'o':
-                if (!RTStrPrintf(szOutput, sizeof(szOutput), ValueUnion.psz))
-                    rc = VERR_NO_MEMORY;
+                pszOutput = ValueUnion.psz;
                 break;
 
@@ -438 +437 @@
     if (RT_SUCCESS(rc))
     {
-        if (strlen(szOutput))
-        {
-            rc = RTFileOpen(&hOutput, szOutput, fFlags);
+        if (pszOutput)
+        {
+            rc = RTFileOpen(&hOutput, pszOutput, fFlags);
             if (RT_FAILURE(rc))
                 RTMsgError("Could not create output file '%s', rc=%Rrc\n",
-                           szOutput, rc);
+                           pszOutput, rc);
         }