Changeset 59637 in vbox for trunk/src/VBox/Frontends/VBoxBugReport

Timestamp:

Feb 11, 2016 1:10:28 PM (9 years ago)

Author:

vboxsync

Message:

BugReportTool(bugref:8169): Meaningful error messages, fallback to home dir if no write access, print where the output went

Location:

trunk/src/VBox/Frontends/VBoxBugReport

Files:

• VBoxBugReport.cpp (modified) (3 diffs)
• VBoxBugReport.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp

@@ -556 +556 @@
             hr = virtualBox.createLocalObject(CLSID_VirtualBox);
             if (FAILED(hr))
-                RTStrmPrintf(g_pStdErr, "WARNING: failed to create the VirtualBox object (hr=0x%x)\n", hr);
+                RTStrmPrintf(g_pStdErr, "WARNING: Failed to create the VirtualBox object (hr=0x%x)\n", hr);
             else
             {
                 hr = session.createInprocObject(CLSID_Session);
                 if (FAILED(hr))
-                    RTStrmPrintf(g_pStdErr, "WARNING: failed to create a session object (hr=0x%x)\n", hr);
+                    RTStrmPrintf(g_pStdErr, "WARNING: Failed to create a session object (hr=0x%x)\n", hr);
             }
 
@@ -601 +601 @@
                                 Time.u8Hour, Time.u8Minute, Time.u8Second,
                                 fTextOutput ? "txt" : "tgz");
+        RTCString strFallbackOutFile;
         if (!pszOutputFile)
+        {
+            RTFILE tmp;
             pszOutputFile = strOutFile.c_str();
+            int rc = RTFileOpen(&tmp, pszOutputFile, RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE);
+            if (rc == VERR_ACCESS_DENIED)
+            {
+                char szUserHome[RTPATH_MAX];
+                handleRtError(RTPathUserHome(szUserHome, sizeof(szUserHome)), "Failed to obtain home directory");
+                strFallbackOutFile.printf("%s/%s", szUserHome, strOutFile.c_str());
+                pszOutputFile = strFallbackOutFile.c_str();
+            }
+            else if (RT_SUCCESS(rc))
+            {
+                RTFileClose(tmp);
+                RTFileDelete(pszOutputFile);
+            }
+        }
         BugReport *pReport;
         if (fTextOutput)
@@ -610 +627 @@
         createBugReport(pReport, homeDir, list);
         pReport->complete();
+        RTPrintf("Report was written to '%s'\n", pszOutputFile);
         delete pReport;
     }

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.h

@@ -52 +52 @@
         RTCString msgArgs(pszMsgFmt, va);
         va_end(va);
-        RTCStringFmt msg("%s (rc=%d)\n", msgArgs.c_str(), rc);
+        RTCStringFmt msg("%s. %s (%d)\n", msgArgs.c_str(), RTErrGetFull(rc), rc);
         throw RTCError(msg.c_str());
     }