Changeset 103285 in vbox for trunk/src/VBox/Main/src-server/xpcom/server_module.cpp

Timestamp:

Feb 8, 2024 3:27:12 PM (12 months ago)

Author:

vboxsync

Message:

Re-applied r161549 again (Got rid of a lot of deprecated strcpy / strcat calls; now using the IPRT pendants (found by Parfait)), left out some stuff which wasn't wanted, less bloated version of DrvAudio.cpp. bugref:3409

File:

• trunk/src/VBox/Main/src-server/xpcom/server_module.cpp (modified) (8 diffs)

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

@@ -75 +75 @@
 
 /** Name of the server executable. */
-const char VBoxSVC_exe[] = RTPATH_SLASH_STR "VBoxSVC" HOSTSUFF_EXE;
+const char g_szVBoxSVC_exe[] = RTPATH_SLASH_STR "VBoxSVC" HOSTSUFF_EXE;
 
 enum
@@ -88 +88 @@
  *  Full path to the VBoxSVC executable.
  */
-static char VBoxSVCPath[RTPATH_MAX];
-static bool IsVBoxSVCPathSet = false;
+static char g_szVBoxSVCPath[RTPATH_MAX];
+static bool g_fIsVBoxSVCPathSet = false;
 
 /*
@@ -116 +116 @@
         const char *apszArgs[] =
         {
-            VBoxSVCPath,
+            g_szVBoxSVCPath,
             "--auto-shutdown",
             "--inherit-startup-pipe",
@@ -132 +132 @@
         hStdNil.u.hFile = NIL_RTFILE;
 
-        vrc = RTProcCreateEx(VBoxSVCPath, apszArgs, RTENV_DEFAULT,
+        vrc = RTProcCreateEx(g_szVBoxSVCPath, apszArgs, RTENV_DEFAULT,
                              RTPROC_FLAGS_DETACHED, &hStdNil, &hStdNil, &hStdNil,
                              NULL /* pszAsUser */, NULL /* pszPassword */, NULL /* pExtraData */,
@@ -187 +187 @@
         }
 
-        if (!IsVBoxSVCPathSet)
+        if (!g_fIsVBoxSVCPathSet)
         {
             /* Get the directory containing XPCOM components -- the VBoxSVC
@@ -204 +204 @@
 
                     LogFlowFunc(("component directory = \"%s\"\n", path.get()));
-                    AssertBreakStmt(path.Length() + strlen(VBoxSVC_exe) < RTPATH_MAX,
+                    AssertBreakStmt(path.Length() + strlen(g_szVBoxSVC_exe) < RTPATH_MAX,
                                     rc = NS_ERROR_FAILURE);
 
@@ -212 +212 @@
                     if (cbKernArch > 0)
                     {
-                        sprintf(VBoxSVCPath, "/opt/VirtualBox/%s%s", achKernArch, VBoxSVC_exe);
-                        IsVBoxSVCPathSet = true;
+                        sprintf(g_szVBoxSVCPath, "/opt/VirtualBox/%s%s", achKernArch, g_szVBoxSVC_exe);
+                        g_fIsVBoxSVCPathSet = true;
                     }
                     else
                         rc = NS_ERROR_UNEXPECTED;
 #else
-                    strcpy(VBoxSVCPath, path.get());
-                    RTPathStripFilename(VBoxSVCPath);
-                    strcat(VBoxSVCPath, VBoxSVC_exe);
-
-                    IsVBoxSVCPathSet = true;
+                    int vrc = RTStrCopy(g_szVBoxSVCPath, sizeof(g_szVBoxSVCPath), path.get());
+                    AssertRCBreakStmt(vrc, rc = NS_ERROR_FAILURE);
+                    RTPathStripFilename(g_szVBoxSVCPath);
+                    vrc = RTStrCat(g_szVBoxSVCPath, sizeof(g_szVBoxSVCPath), g_szVBoxSVC_exe);
+                    AssertRCBreakStmt(vrc, rc = NS_ERROR_FAILURE);
+
+                    g_fIsVBoxSVCPathSet = true;
 #endif
                 }
@@ -247 +249 @@
             if (NS_FAILED(rc))
             {
-                LogFlowFunc(("Starting server \"%s\"...\n", VBoxSVCPath));
+                LogFlowFunc(("Starting server \"%s\"...\n", g_szVBoxSVCPath));
 
                 startedOnce = true;