Changeset 42655 in vbox for trunk

Timestamp:

Aug 7, 2012 11:39:09 AM (12 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxService: make vbox_rmdir and vbox_mktemp tool output code a little nicer.

File:

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

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

@@ -960 +960 @@
  */
 static void toolboxRmReport(const char *pcszMessage, const char *pcszFile,
-                            int rc, uint32_t fOutputFlags, int *prc)
-{
+                            bool fActive, int rc, uint32_t fOutputFlags,
+                            int *prc)
+{
+    if (!fActive)
+        return;
     if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
     {
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            RTPrintf(pcszMessage, pcszFile, rc);
+        else
             RTMsgError(pcszMessage, pcszFile, rc);
     }
@@ -1046 +1051 @@
         }
     }
-    /* We need at least one file. */
-    if (RT_SUCCESS(rc) && cNonOptions == 0)
-    {
-        RTMsgError("No files or directories specified.");
-        return RTEXITCODE_FAILURE;
-    }
-
     if (RT_SUCCESS(rc))
     {
@@ -1065 +1063 @@
     }
 
+    /* We need at least one file. */
+    if (RT_SUCCESS(rc) && cNonOptions == 0)
+    {
+        toolboxRmReport("No files or directories specified.\n", NULL, true, 0,
+                        fOutputFlags, NULL);
+        return RTEXITCODE_FAILURE;
+    }
     if (RT_SUCCESS(rc))
     {
@@ -1075 +1080 @@
                 if (!(fFlags & VBOXSERVICETOOLBOXRMFLAG_RECURSIVE))
                     toolboxRmReport("Cannot remove directory '%s' as the '-R' option was not specified.\n",
-                                    argv[i], VERR_INVALID_PARAMETER,
+                                    argv[i], true, VERR_INVALID_PARAMETER,
                                     fOutputFlags, &rc);
                 else
@@ -1081 +1086 @@
                     rc2 = RTDirRemoveRecursive(argv[i],
                                                RTDIRRMREC_F_CONTENT_AND_DIR);
+                    toolboxRmReport("", argv[i], RT_SUCCESS(rc2), rc2,
+                                    fOutputFlags, NULL);
                     toolboxRmReport("The following error occurred while removing directory '%s': %Rrc.\n",
-                                    argv[i], rc2, fOutputFlags, &rc);
+                                    argv[i], RT_FAILURE(rc2), rc2,
+                                    fOutputFlags, &rc);
                 }
             }
@@ -1088 +1096 @@
             {
                 rc2 = RTFileDelete(argv[i]);
+                toolboxRmReport("", argv[i], RT_SUCCESS(rc2), rc2,
+                                fOutputFlags, NULL);
                 toolboxRmReport("The following error occurred while removing file '%s': %Rrc.\n",
-                                argv[i], rc2, fOutputFlags, &rc);
+                                argv[i], RT_FAILURE(rc2), rc2, fOutputFlags,
+                                &rc);
             }
             else
                 toolboxRmReport("File '%s' does not exist.\n", argv[i],
-                                VERR_FILE_NOT_FOUND, fOutputFlags, &rc);
+                                true, VERR_FILE_NOT_FOUND, fOutputFlags, &rc);
         }
 
@@ -1120 +1131 @@
  */
 static void toolboxMkTempReport(const char *pcszMessage, const char *pcszFile,
-                                int rc, uint32_t fOutputFlags, int *prc)
-{
+                                bool fActive, int rc, uint32_t fOutputFlags,
+                                int *prc)
+{
+    if (!fActive)
+        return;
     if (!(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
-    {
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            RTPrintf(pcszMessage, pcszFile, rc);
+        else
             RTMsgError(pcszMessage, pcszFile, rc);
-    }
     else
         RTPrintf("name=%s%crc=%d%c", pcszFile, 0, rc, 0);
@@ -1161 +1175 @@
     uint32_t fOutputFlags = 0;
     int cNonOptions       = 0;
+    char *pszName;
 
     while (   (ch = RTGetOpt(&GetState, &ValueUnion))
@@ -1206 +1221 @@
     if (RT_SUCCESS(rc) && cNonOptions != 1)
     {
-        toolboxMkTempReport("Please specify exactly one template.\n",
-                            "", VERR_INVALID_PARAMETER, fOutputFlags, &rc);
+        toolboxMkTempReport("Please specify exactly one template.\n", "",
+                            true, VERR_INVALID_PARAMETER, fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
     }
-    if (RT_SUCCESS(rc) && !strchr(argv[argc - 1], 'X'))  /* IPRT asserts this. */
+    pszName = argv[argc - 1];
+    if (RT_SUCCESS(rc) && !strchr(pszName, 'X'))  /* IPRT asserts this. */
     {
         toolboxMkTempReport("Template '%s' should contain at least one 'X' character.\n",
-                            argv[argc - 1], VERR_INVALID_PARAMETER,
+                            pszName, true, VERR_INVALID_PARAMETER,
                             fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
@@ -1220 +1236 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTDirCreateTemp(argv[argc - 1]);
+        rc = RTDirCreateTemp(pszName);
+        toolboxMkTempReport("Created temporary directory '%s'.\n",
+                            pszName, RT_SUCCESS(rc), rc, fOutputFlags, NULL);
         toolboxMkTempReport("The following error occurred while creating a temporary directory with template '%s': %Rrc.\n",
-                            argv[argc - 1], rc, fOutputFlags, NULL);
-        if (   RT_SUCCESS(rc)
-            && !(fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE))
-            RTPrintf("Created temporary directory '%s'.\n", argv[argc - 1]);
+                            pszName, RT_FAILURE(rc), rc, fOutputFlags, NULL);
         if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
             VBoxServiceToolboxPrintStrmTermination();