Changeset 93057 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Dec 22, 2021 2:21:25 PM (3 years ago)

Author:

vboxsync

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

149064

Message:

IPRT: Added RTStrDupNEx and RTStrDupNExTag.

File:

• trunk/src/VBox/Runtime/common/string/stringalloc.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/stringalloc.cpp

@@ -116 +116 @@
 
 
-RTDECL(int)  RTStrDupExTag(char **ppszString, const char *pszString, const char *pszTag)
+RTDECL(int)  RTStrDupExTag(char **ppszCopy, const char *pszString, const char *pszTag)
 {
 #if defined(__cplusplus)
-    AssertPtr(ppszString);
+    AssertPtr(ppszCopy);
     AssertPtr(pszString);
 #endif
 
-    size_t cch = strlen(pszString) + 1;
-    char *psz = (char *)RTMemAllocTag(cch, pszTag);
-    if (psz)
-    {
-        memcpy(psz, pszString, cch);
-        *ppszString = psz;
-        return VINF_SUCCESS;
-    }
-    return VERR_NO_MEMORY;
+    size_t cch = strlen(pszString);
+    char *pszDst = (char *)RTMemAllocTag(cch + 1, pszTag);
+    if (pszDst)
+    {
+        memcpy(pszDst, pszString, cch);
+        pszDst[cch] = '\0';
+        *ppszCopy = pszDst;
+        return VINF_SUCCESS;
+    }
+    *ppszCopy = NULL;
+    return VERR_NO_STR_MEMORY;
 }
 RT_EXPORT_SYMBOL(RTStrDupExTag);
@@ -152 +154 @@
 }
 RT_EXPORT_SYMBOL(RTStrDupNTag);
+
+
+RTDECL(int) RTStrDupNExTag(char **ppszCopy, const char *pszString, size_t cchMax, const char *pszTag)
+{
+#if defined(__cplusplus)
+    AssertPtr(pszString);
+#endif
+    char const *pszEnd = RTStrEnd(pszString, cchMax);
+    size_t      cch    = pszEnd ? (uintptr_t)pszEnd - (uintptr_t)pszString : cchMax;
+    char       *pszDst = (char *)RTMemAllocTag(cch + 1, pszTag);
+    if (pszDst)
+    {
+        memcpy(pszDst, pszString, cch);
+        pszDst[cch] = '\0';
+        *ppszCopy = pszDst;
+        return VINF_SUCCESS;
+    }
+    *ppszCopy = NULL;
+    return VERR_NO_STR_MEMORY;
+}
+RT_EXPORT_SYMBOL(RTStrDupNExTag);