Changeset 104565 in vbox

Timestamp:

May 8, 2024 4:30:28 PM (7 months ago)

Author:

vboxsync

Message:

Guest Control/VBoxService: Return the full path of the created file / directory and not only the (filled out) template. bugref:9783

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (6 diffs)

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

@@ -2274 +2274 @@
      */
     char     szTemplate[RTPATH_MAX];
+    char     szTempPathAbs[RTPATH_MAX] = ""; /* Absolute path to temporary directory / file created. */
     char     szPath[RTPATH_MAX];
     uint32_t fFlags = GSTCTL_CREATETEMP_F_NONE;
@@ -2303 +2304 @@
             if (RT_SUCCESS(rc))
             {
-                char szTemplateWithPath[RTPATH_MAX] = "";
                 if (szPath[0] != '\0')
                 {
-                    rc = RTStrCopy(szTemplateWithPath, sizeof(szTemplateWithPath), szPath);
+                    rc = RTStrCopy(szTempPathAbs, sizeof(szTempPathAbs), szPath);
                     if (RT_FAILURE(rc))
                     {
@@ -2315 +2315 @@
                 else
                 {
-                    rc = RTPathTemp(szTemplateWithPath, sizeof(szTemplateWithPath));
+                    rc = RTPathTemp(szTempPathAbs, sizeof(szTempPathAbs));
                     if (RT_FAILURE(rc))
                     {
@@ -2325 +2325 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = RTPathAppend(szTemplateWithPath, sizeof(szTemplateWithPath), szTemplate);
+                    rc = RTPathAppend(szTempPathAbs, sizeof(szTempPathAbs), szTemplate);
                     if (RT_FAILURE(rc))
                     {
@@ -2337 +2337 @@
                         {
                             if (fSecure)
-                                rc = RTDirCreateTempSecure(szTemplateWithPath); /* File mode is fixed to 0700. */
+                                rc = RTDirCreateTempSecure(szTempPathAbs); /* File mode is fixed to 0700. */
                             else
-                                rc = RTDirCreateTemp(szTemplate, fMode);
+                                rc = RTDirCreateTemp(szTempPathAbs, fMode);
                         }
                         else /* File */
                         {
                             if (fSecure)
-                                rc = RTFileCreateTempSecure(szTemplateWithPath); /* File mode is fixed to 0700. */
+                                rc = RTFileCreateTempSecure(szTempPathAbs); /* File mode is fixed to 0700. */
                             else
-                                rc = RTFileCreateTemp(szTemplate, fMode);
+                                rc = RTFileCreateTemp(szTempPathAbs, fMode);
                         }
 
-                        VGSvcVerbose(3, "Creating temporary %s (szTemplate='%s', fFlags=%#x, fMode=%#x) -> rc=%Rrc\n",
-                                     pszWhat, szTemplate, fFlags, fMode, rc);
+                        VGSvcVerbose(3, "Creating temporary %s (szTemplate='%s', fFlags=%#x, fMode=%#x) -> %s, rc=%Rrc\n",
+                                     pszWhat, szTemplate, fFlags, fMode, szTempPathAbs, rc);
                     }
                 }
@@ -2364 +2364 @@
          * Report result back to host.
          */
-        int rc2 = VbglR3GuestCtrlFsCbCreateTemp(pHostCtx, rc, szTemplate);
+        int rc2 = VbglR3GuestCtrlFsCbCreateTemp(pHostCtx, rc, szTempPathAbs);
         if (RT_FAILURE(rc2))
         {