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

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

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/utf8-posix.cpp (modified) (3 diffs)
• win/env-win.cpp (modified) (3 diffs)
• win/utf8-win.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);
 }

trunk/src/VBox/Runtime/r3/win/env-win.cpp

@@ -173 +173 @@
 }
 
-RTDECL(int) RTEnvSetUtf8(const char *pszVar, const char *pszValue)
-{
-    AssertReturn(strchr(pszVar, '=') == NULL, VERR_ENV_INVALID_VAR_NAME);
-
+
+/**
+ * Worker common to RTEnvSetUtf8() and rtEnvSetExWorker().
+ */
+int rtEnvSetUtf8Worker(const char *pchVar, size_t cchVar, const char *pszValue)
+{
     size_t cwcVar;
-    int rc = RTStrCalcUtf16LenEx(pszVar, RTSTR_MAX, &cwcVar);
+    int rc = RTStrCalcUtf16LenEx(pchVar, cchVar, &cwcVar);
     if (RT_SUCCESS(rc))
     {
         size_t cwcValue;
-        rc = RTStrCalcUtf16LenEx(pszVar, RTSTR_MAX, &cwcValue);
+        rc = RTStrCalcUtf16LenEx(pszValue, RTSTR_MAX, &cwcValue);
         if (RT_SUCCESS(rc))
         {
@@ -188 +190 @@
             if (pwszTmp)
             {
-                rc = RTStrToUtf16Ex(pszVar, RTSTR_MAX, &pwszTmp, cwcVar + 1, NULL);
+                rc = RTStrToUtf16Ex(pchVar, cchVar, &pwszTmp, cwcVar + 1, NULL);
                 if (RT_SUCCESS(rc))
                 {
@@ -212 +214 @@
 
 
+RTDECL(int) RTEnvSetUtf8(const char *pszVar, const char *pszValue)
+{
+    size_t cchVar = strlen(pszVar);
+    AssertReturn(memchr(pszVar, '=', cchVar) == NULL, VERR_ENV_INVALID_VAR_NAME);
+    return rtEnvSetUtf8Worker(pszVar, cchVar, pszValue);
+}
+
+
 RTDECL(int) RTEnvUnsetBad(const char *pszVar)
 {

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

@@ -39 +39 @@
 
 
+
 RTR3DECL(int)  RTStrUtf8ToCurrentCPTag(char **ppszString, const char *pszString, const char *pszTag)
+{
+    return RTStrUtf8ToCurrentCPExTag(ppszString, pszString, RTSTR_MAX, pszTag);
+}
+
+
+RTR3DECL(int)  RTStrUtf8ToCurrentCPExTag(char **ppszString, const char *pszString, size_t cchString, const char *pszTag)
 {
     Assert(ppszString);
@@ -47 +54 @@
      * Check for zero length input string.
      */
-    if (!*pszString)
+    if (cchString < 1 || !*pszString)
     {
         *ppszString = (char *)RTMemTmpAllocZTag(sizeof(char), pszTag);
@@ -61 +68 @@
      */
     PRTUTF16 pwszString = NULL;
-    int rc = RTStrToUtf16(pszString, &pwszString);
+    int rc = RTStrToUtf16Ex(pszString, cchString, &pwszString, 0, NULL);
     if (RT_FAILURE(rc))
         return rc;