Changeset 54611 in vbox for trunk/src/VBox

Timestamp:

Mar 3, 2015 9:23:06 PM (10 years ago)

Author:

vboxsync

Message:

VBoxControl writelog: Append newline to each argument if it hasn't got any.

File:

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

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -151 +151 @@
 #endif
     if (eWhich == WRITE_LOG || eWhich == USAGE_ALL)
-        doUsage("", g_pszProgName, "writelog [--] <msg>");
+        doUsage("", g_pszProgName, "writelog [-n|--no-newline] [--] <msg>");
     if (eWhich == TAKE_SNAPSHOT || eWhich == USAGE_ALL)
         doUsage("", g_pszProgName, "takesnapshot");
@@ -1765 +1765 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--dummy", 'D', RTGETOPT_REQ_NOTHING }
+        { "--no-newline", 'n', RTGETOPT_REQ_NOTHING },
     };
+    bool fNoNewline = false;
 
     RTGETOPTSTATE GetOptState;
@@ -1780 +1781 @@
             {
                 case VINF_GETOPT_NOT_OPTION:
-                    rc = VbglR3WriteLog(ValueUnion.psz, strlen(ValueUnion.psz));
+                {
+                    size_t cch = strlen(ValueUnion.psz);
+                    if (   fNoNewline
+                        || (cch > 0 && ValueUnion.psz[cch - 1] == '\n') )
+                        rc = VbglR3WriteLog(ValueUnion.psz, cch);
+                    else
+                    {
+                        char *pszDup = (char *)RTMemDupEx(ValueUnion.psz, cch, 2);
+                        if (RT_SUCCESS(rc))
+                        {
+                            pszDup[cch++] = '\n';
+                            pszDup[cch]   = '\0';
+                            rc = VbglR3WriteLog(pszDup, cch);
+                            RTMemFree(pszDup);
+                        }
+                        else
+                            rc = VERR_NO_MEMORY;
+                    }
                     if (RT_FAILURE(rc))
                         return VBoxControlError("VbglR3WriteLog: %Rrc", rc);
+                    break;
+                }
+
+                case 'n':
+                    fNoNewline = true;
                     break;