Changeset 41100 in vbox

Timestamp:

Apr 30, 2012 3:18:06 PM (13 years ago)

Author:

vboxsync

Message:

better error report if the global settings directory is not accessible

Location:

trunk/src/VBox

Files:

• Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp (modified) (1 diff)
• Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Main/src-server/xpcom/server.cpp (modified) (1 diff)
• Main/webservice/vboxweb.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp

@@ -1092 +1092 @@
     using namespace com;
     HRESULT hrc = com::Initialize();
+# ifdef VBOX_WITH_XPCOM
+    if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
+    {
+        char szHome[RTPATH_MAX] = "";
+        com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome));
+        return RTMsgErrorExit(RTEXITCODE_FAILURE,
+               "Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome);
+    }
+# endif
     if (FAILED(hrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM (%Rhrc)!", hrc);

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -755 +755 @@
 
     rc = com::Initialize();
+#ifdef VBOX_WITH_XPCOM
+    if (rc == NS_ERROR_FILE_ACCESS_DENIED)
+    {
+        char szHome[RTPATH_MAX] = "";
+        com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome));
+        RTPrintf("Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome);
+        return 1;
+    }
+#endif
     if (FAILED(rc))
     {

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -38 +38 @@
 #include <iprt/buildconfig.h>
 #include <iprt/initterm.h>
+#include <iprt/path.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -333 +334 @@
     using namespace com;
     HRESULT hrc = com::Initialize();
+# ifdef VBOX_WITH_XPCOM
+    if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
+    {
+        char szHome[RTPATH_MAX] = "";
+        com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome));
+        return RTMsgErrorExit(RTEXITCODE_FAILURE,
+               "Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome);
+    }
+# endif
     if (FAILED(hrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM!");

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1320 +1320 @@
 
     rc = com::Initialize();
+#ifdef VBOX_WITH_XPCOM
+    if (rc == NS_ERROR_FILE_ACCESS_DENIED)
+    {
+        char szHome[RTPATH_MAX] = "";
+        com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome));
+        RTPrintf("Failed to initialize COM because the global settings directory '%s' is not accessible!\n", szHome);
+        return 1;
+    }
+#endif
     if (FAILED(rc))
     {

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -884 +884 @@
     if (!pszLogFile)
     {
-        char szLogFile[RTPATH_MAX];
+        char szLogFile[RTPATH_MAX] = "";
         vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));
+        if (vrc == VERR_ACCESS_DENIED)
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open global settings directory '%s'", szLogFile);
         if (RT_SUCCESS(vrc))
             vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
         if (RT_SUCCESS(vrc))
             pszLogFile = RTStrDup(szLogFile);
+        if (RT_FAILURE(vrc))
+            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to determine release log file (%Rrc)", vrc);
     }
     char szError[RTPATH_MAX + 128];

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1143 +1143 @@
     // initialize COM/XPCOM
     HRESULT hrc = com::Initialize();
+#ifdef VBOX_WITH_XPCOM
+    if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
+    {
+        char szHome[RTPATH_MAX] = "";
+        com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome));
+        return RTMsgErrorExit(RTEXITCODE_FAILURE,
+               "Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome);
+    }
+#endif
     if (FAILED(hrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to initialize COM! hrc=%Rhrc\n", hrc);