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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160476

Message:

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

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• ipc/ipcd/shared/src/ipcConfig.cpp (modified) (4 diffs)
• nsprpub/lib/libc/include/plstr.h (modified) (1 diff)
• nsprpub/lib/libc/src/strcpy.c (deleted)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -384 +384 @@
         nsprpub/lib/ds/plarena.c \
         nsprpub/lib/ds/plhash.c \
-        nsprpub/lib/libc/src/strcpy.c \
         nsprpub/lib/libc/src/strcmp.c \
         nsprpub/lib/libc/src/strccmp.c \

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

trunk/src/libs/xpcom18a4/nsprpub/lib/libc/include/plstr.h

@@ -78 +78 @@
 PR_BEGIN_EXTERN_C
 /*
- * PL_strncpy
- *
- * Copies the source string into the destination buffer, up to and including
- * the trailing '\0' or up to and including the max'th character, whichever
- * comes first.  It does not (can not) verify that the destination buffer is
- * large enough.  If the source string is longer than the maximum length,
- * the result will *not* be null-terminated (JLRU).
- */
-
-PR_EXTERN(char *)
-PL_strncpy(char *dest, const char *src, PRUint32 max);
-
-/*
- * PL_strncpyz
- *
- * Copies the source string into the destination buffer, up to and including 
- * the trailing '\0' or up but not including the max'th character, whichever 
- * comes first.  It does not (can not) verify that the destination buffer is
- * large enough.  The destination string is always terminated with a '\0',
- * unlike the traditional libc implementation.  It returns the "dest" argument.
- *
- * NOTE: If you call this with a source "abcdefg" and a max of 5, the 
- * destination will end up with "abcd\0" (i.e., it's strlen length will be 4)!
- *
- * This means you can do this:
- *
- *     char buffer[ SOME_SIZE ];
- *     PL_strncpyz(buffer, src, sizeof(buffer));
- *
- * and the result will be properly terminated.
- */
-
-PR_EXTERN(char *)
-PL_strncpyz(char *dest, const char *src, PRUint32 max);
-
-/*
  * PL_strcmp
  *