Changeset 80764 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Sep 13, 2019 6:52:50 AM (6 years ago)

Author:

vboxsync

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

133329

Message:

IPRT: Optimized RTEnvPutEx. bugref:9341

File:

• trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp

@@ -490 +490 @@
 
 
-RTR3DECL(int)  RTStrCurrentCPToUtf8Tag(char **ppszString, const char *pszString, const char *pszTag)
+RTR3DECL(int)  RTStrUtf8ToCurrentCPExTag(char **ppszString, const char *pszString, size_t cchString, const char *pszTag)
 {
     Assert(ppszString);
@@ -497 +497 @@
 
     /*
-     * Attempt with UTF-8 length of 2x the native length.
-     */
-    size_t cch = strlen(pszString);
-    if (cch <= 0)
+     * Assume result string length is not longer than UTF-8 string.
+     */
+    cchString = RTStrNLen(pszString, cchString);
+    if (cchString < 1)
     {
         /* zero length string passed. */
@@ -508 +508 @@
         return VERR_NO_TMP_MEMORY;
     }
+    return rtStrConvertWrapper(pszString, cchString, "UTF-8", ppszString, 0, "", 1, RTSTRICONV_UTF8_TO_LOCALE);
+}
+
+
+RTR3DECL(int)  RTStrCurrentCPToUtf8Tag(char **ppszString, const char *pszString, const char *pszTag)
+{
+    Assert(ppszString);
+    Assert(pszString);
+    *ppszString = NULL;
+
+    /*
+     * Attempt with UTF-8 length of 2x the native length.
+     */
+    size_t cch = strlen(pszString);
+    if (cch <= 0)
+    {
+        /* zero length string passed. */
+        *ppszString = (char *)RTMemTmpAllocZTag(sizeof(char), pszTag);
+        if (*ppszString)
+            return VINF_SUCCESS;
+        return VERR_NO_TMP_MEMORY;
+    }
     return rtStrConvertWrapper(pszString, cch, "", ppszString, 0, "UTF-8", 2, RTSTRICONV_LOCALE_TO_UTF8);
 }