Changeset 42763 in vbox

Timestamp:

Aug 10, 2012 7:51:17 PM (12 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxService: vbox_mktemp tool: add --tmpdir option and clean up.

File:

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

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

@@ -136 +136 @@
              "                             [--verbose|-v] [<file>...]\n"
              "  rm <general options>       [-r|-R] <file>...\n"
-             "  mktemp <general options>   [--directory|-d] [--secure|-s]\n"
-             "                             [--mode|-m <mode>] <template>\n"
+             "  mktemp <general options>   [--directory|-d] [--mode|-m <mode>]\n"
+             "                             [--secure|-s] [--tmpdir|-t <path>]\n"
+             "                             <template>\n"
              "  mkdir <general options>    [--mode|-m <mode>] [--parents|-p]\n"
              "                             [--verbose|-v] <directory>...\n"
@@ -1135 +1136 @@
     "Create a temporary directory based on the template supplied. The first string\n"
     "of consecutive 'X' characters in the template will be replaced to form a unique\n"
-    "name for the directory.  The template must contain an absolute path.  The\n"
-    "default creation mode is 0600 for files and 0700 for directories.\n"
+    "name for the directory.  The template may not contain a path.  The default\n"
+    "creation mode is 0600 for files and 0700 for directories.  If no path is\n"
+    "specified the default temporary directory will be used.\n"
     "Options:\n\n"
     "  [--directory|-d]           Create a directory instead of a file.\n"
     "  [--mode|-m <mode>]         Create the object with mode <mode>.\n"
     "  [--secure|-s]              Fail if the object cannot be created securely.\n"
+    "  [--tmpdir|-t <path>]       Create the object with the absolute path <path>.\n"
     "\n";
 
@@ -1186 +1189 @@
         { "--mode",      'm', RTGETOPT_REQ_STRING },
         { "--secure",    's', RTGETOPT_REQ_NOTHING },
+        { "--tmpdir",    't', RTGETOPT_REQ_STRING },
     };
 
@@ -1207 +1211 @@
     AssertRCReturn(rc, RTEXITCODE_INIT);
 
-    bool     fVerbose     = false;
-    uint32_t fFlags       = 0;
-    uint32_t fOutputFlags = 0;
-    int      cNonOptions  = 0;
-    RTFMODE  fMode        = 0700;
-    bool     fModeSet     = false;
-    char    *pszTemplate, *pszFilename;
+    bool        fVerbose     = false;
+    uint32_t    fFlags       = 0;
+    uint32_t    fOutputFlags = 0;
+    int         cNonOptions  = 0;
+    RTFMODE     fMode        = 0700;
+    bool        fModeSet     = false;
+    const char *pcszPath     = NULL;
+    const char *pcszTemplate;
+    char        szTemplateWithPath[RTPATH_MAX] = "";
 
     while (   (ch = RTGetOpt(&GetState, &ValueUnion))
@@ -1251 +1257 @@
                 break;
 
+            case 't':
+                pcszPath = ValueUnion.psz;
+                break;
+
             case VINF_GETOPT_NOT_OPTION:
                 /* RTGetOpt will sort these to the end of the argv vector so
@@ -1261 +1271 @@
         }
     }
-    if (RT_SUCCESS(rc))
-    {
-        /* Print magic/version. */
-        if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
-        {
-            rc = VBoxServiceToolboxStrmInit();
-            if (RT_FAILURE(rc))
-                RTMsgError("Error while initializing parseable streams, rc=%Rrc\n", rc);
-            VBoxServiceToolboxPrintStrmHeader("vbt_mktemp", 1 /* Stream version */);
-        }
+    /* Print magic/version. */
+    if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE)
+    {
+        rc = VBoxServiceToolboxStrmInit();
+        if (RT_FAILURE(rc))
+            RTMsgError("Error while initializing parseable streams, rc=%Rrc\n", rc);
+        VBoxServiceToolboxPrintStrmHeader("vbt_mktemp", 1 /* Stream version */);
     }
 
@@ -1280 +1287 @@
     }
     /* We need exactly one template, containing at least one 'X'. */
-    if (RT_SUCCESS(rc) && cNonOptions != 1)
+    if (cNonOptions != 1)
     {
         toolboxMkTempReport("Please specify exactly one template.\n", "",
@@ -1286 +1293 @@
         return RTEXITCODE_SYNTAX;
     }
-    pszTemplate = argv[argc - 1];
-    pszFilename = RTPathFilename(pszTemplate);
-    if (   RT_SUCCESS(rc)
-        && (!pszFilename || !strchr(pszFilename, 'X')))  /* IPRT asserts this. */
-    {
-        toolboxMkTempReport("Template '%s' should contain a file name with at least one 'X' character.\n",
-                            pszTemplate, true, VERR_INVALID_PARAMETER,
+    pcszTemplate = argv[argc - 1];
+    /* Validate that the template is as IPRT requires (asserted by IPRT). */
+    if (RTPathHasPath(pcszTemplate) || !strchr(pcszTemplate, 'X'))
+    {
+        toolboxMkTempReport("Template '%s' should contain a file name with no path and at least one 'X' character.\n",
+                            pcszTemplate, true, VERR_INVALID_PARAMETER,
                             fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
     }
-    /* For now require an absolute path - perhaps later if we support a
-     * current directory concept we can change this. */
-    if (!RTPathStartsWithRoot(pszTemplate))
-    {
-        toolboxMkTempReport("Template '%s' should contain an absolute path.\n",
-                            pszTemplate, true, VERR_INVALID_PARAMETER,
+    if (pcszPath && !RTPathStartsWithRoot(pcszPath))
+    {
+        toolboxMkTempReport("Path '%s' should be absolute.\n",
+                            pcszPath, true, VERR_INVALID_PARAMETER,
                             fOutputFlags, &rc);
         return RTEXITCODE_FAILURE;
     }
-
-    if (RT_SUCCESS(rc))
-    {
-        if (fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_DIRECTORY)
-        {
-            rc =   fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
-                 ? RTDirCreateTempSecure(pszTemplate)
-                 : RTDirCreateTemp(pszTemplate, fMode);
-            toolboxMkTempReport("Created temporary directory '%s'.\n",
-                                pszTemplate, RT_SUCCESS(rc), rc,
-                                fOutputFlags, NULL);
-            /* RTDirCreateTemp[Secure] sets the template to "" on failure. */
-            toolboxMkTempReport("The following error occurred while creating the temporary directory%s: %Rrc.\n",
-                                pszTemplate, RT_FAILURE(rc), rc,
-                                fOutputFlags, NULL);
-        }
-        else
-        {
-            rc =   fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
-                 ? RTFileCreateTempSecure(pszTemplate)
-                 : RTFileCreateTemp(pszTemplate, fMode);
-            toolboxMkTempReport("Created temporary file '%s'.\n",
-                                pszTemplate, RT_SUCCESS(rc), rc,
-                                fOutputFlags, NULL);
-            /* RTFileCreateTemp[Secure] sets the template to "" on failure. */
-            toolboxMkTempReport("The following error occurred while creating the temporary file%s: %Rrc.\n",
-                                pszTemplate, RT_FAILURE(rc), rc,
-                                fOutputFlags, NULL);
-        }
-        if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
-            VBoxServiceToolboxPrintStrmTermination();
-    }
+    if (pcszPath)
+    {
+        rc = RTStrCopy(szTemplateWithPath, sizeof(szTemplateWithPath),
+                       pcszPath);
+        if (RT_FAILURE(rc))
+        {
+            toolboxMkTempReport("Path '%s' too long.\n", pcszPath, true,
+                                VERR_INVALID_PARAMETER, fOutputFlags, &rc);
+            return RTEXITCODE_FAILURE;
+        }
+    }
+    else
+    {
+        rc = RTPathTemp(szTemplateWithPath, sizeof(szTemplateWithPath));
+        if (RT_FAILURE(rc))
+        {
+            toolboxMkTempReport("Failed to get the temporary directory.\n",
+                                "", true, VERR_INVALID_PARAMETER,
+                                fOutputFlags, &rc);
+            return RTEXITCODE_FAILURE;
+        }
+    }
+    rc = RTPathAppend(szTemplateWithPath, sizeof(szTemplateWithPath),
+                      pcszTemplate);
+    if (RT_FAILURE(rc))
+    {
+        toolboxMkTempReport("Template '%s' too long for path.\n",
+                            pcszTemplate, true, VERR_INVALID_PARAMETER,
+                            fOutputFlags, &rc);
+        return RTEXITCODE_FAILURE;
+    }
+
+    if (fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_DIRECTORY)
+    {
+        rc =   fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
+             ? RTDirCreateTempSecure(szTemplateWithPath)
+             : RTDirCreateTemp(szTemplateWithPath, fMode);
+        toolboxMkTempReport("Created temporary directory '%s'.\n",
+                            szTemplateWithPath, RT_SUCCESS(rc), rc,
+                            fOutputFlags, NULL);
+        /* RTDirCreateTemp[Secure] sets the template to "" on failure. */
+        toolboxMkTempReport("The following error occurred while creating a temporary directory from template '%s': %Rrc.\n",
+                            pcszTemplate, RT_FAILURE(rc), rc, fOutputFlags,
+                            NULL);
+    }
+    else
+    {
+        rc =   fFlags & VBOXSERVICETOOLBOXMKTEMPFLAG_SECURE
+             ? RTFileCreateTempSecure(szTemplateWithPath)
+             : RTFileCreateTemp(szTemplateWithPath, fMode);
+        toolboxMkTempReport("Created temporary file '%s'.\n",
+                            szTemplateWithPath, RT_SUCCESS(rc), rc,
+                            fOutputFlags, NULL);
+        /* RTFileCreateTemp[Secure] sets the template to "" on failure. */
+        toolboxMkTempReport("The following error occurred while creating a temporary file from template '%s': %Rrc.\n",
+                            pcszTemplate, RT_FAILURE(rc), rc, fOutputFlags,
+                            NULL);
+    }
+    if (fOutputFlags & VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE) /* Output termination. */
+        VBoxServiceToolboxPrintStrmTermination();
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }