Changeset 102340 in vbox for trunk/src/libs/xpcom18a4/ipc

Timestamp:

Nov 27, 2023 5:50:21 PM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Replace the uses of PL_strncpyz with RTStrCopyPand get rid of it, bugref:10545

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp

@@ -37 +37 @@
 #define LOG_GROUP LOG_GROUP_IPC
 
-#if defined(XP_WIN)
-#elif defined(XP_OS2) && defined(XP_OS2_NATIVEIPC)
-#else
-#include <string.h>
-#ifdef XP_UNIX
 #include <unistd.h>
 #include <sys/types.h>
 #include <pwd.h>
-#endif
+
 #include "ipcConfig.h"
-#include "plstr.h"
 
 #include <iprt/env.h>
+#include <iprt/string.h>
 #include <VBox/log.h>
 
-#if defined(XP_OS2) && !defined(XP_OS2_NATIVEIPC)
-#ifdef VBOX
-static const char kDefaultSocketPrefix[] = "\\socket\\vbox-";
-#else
-static const char kDefaultSocketPrefix[] = "\\socket\\mozilla-";
-#endif
-static const char kDefaultSocketSuffix[] = "-ipc\\ipcd";
-#else
-#ifdef VBOX
 static const char kDefaultSocketPrefix[] = "/tmp/.vbox-";
-#else
-static const char kDefaultSocketPrefix[] = "/tmp/.mozilla-";
-#endif
 static const char kDefaultSocketSuffix[] = "-ipc/ipcd";
-#endif
 
 void IPC_GetDefaultSocketPath(char *buf, PRUint32 bufLen)
@@ -73 +55 @@
     int len;
 
-    PL_strncpyz(buf, kDefaultSocketPrefix, bufLen);
-    buf    += (sizeof(kDefaultSocketPrefix) - 1);
-    bufLen -= (sizeof(kDefaultSocketPrefix) - 1);
+    char *pszDst = buf;
+    size_t cbDst = bufLen;
+    int vrc = RTStrCopyP(&pszDst, &cbDst, kDefaultSocketPrefix);
+    AssertRC(vrc); RT_NOREF(vrc);
 
     logName = RTEnvGet("VBOX_IPC_SOCKETID");
-#if defined(VBOX) && defined(XP_UNIX)
     if (!logName || !logName[0]) {
         struct passwd *passStruct = getpwuid(getuid());
@@ -84 +66 @@
             logName = passStruct->pw_name;
     }
-#endif
+
     if (!logName || !logName[0]) {
         logName = RTEnvGet("LOGNAME");
@@ -95 +77 @@
         }
     }
-    PL_strncpyz(buf, logName, bufLen);
-    len = strlen(logName);
-    buf    += len;
-    bufLen -= len;
+
+    vrc = RTStrCopyP(&pszDst, &cbDst, logName);
+    AssertRC(vrc); RT_NOREF(vrc);
 
 end:
-    PL_strncpyz(buf, kDefaultSocketSuffix, bufLen);
+    vrc = RTStrCopyP(&pszDst, &cbDst, kDefaultSocketSuffix);
+    AssertRC(vrc); RT_NOREF(vrc);
 }
-
-#endif