Changeset 93543 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2022 12:40:40 PM (3 years ago)

Author:

vboxsync

Message:

IPRT: Default to UTF-8 on macOS when nothing else is given in the environment. bugref:10153

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• process-creation-posix.cpp (modified) (1 diff)
• utf8-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp

@@ -1447 +1447 @@
         }
         else
+#ifdef RT_OS_DARWIN /* @bugref{10153}: Darwin defaults to UTF-8. */
+            pszEncoding = "UTF-8";
+#else
             pszEncoding = "ASCII";
+#endif
     }
 

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

@@ -40 +40 @@
 #include <errno.h>
 #include <locale.h>
+#ifdef RT_OS_DARWIN
+# include <stdlib.h>
+#endif
 
 /* iconv prototype changed with 165+ (thanks to PSARC/2010/160 Bugster 7037400) */
@@ -107 +110 @@
 DECLHIDDEN(const char *) rtStrGetLocaleCodeset(void)
 {
+#ifdef RT_OS_DARWIN
+    /*
+     * @bugref{10153}: If no locale specified in the environment (typically the
+     *      case when launched via Finder, LaunchPad or similar) default to UTF-8.
+     */
+    static int8_t volatile s_fIsUtf8 = -1;
+    int8_t fIsUtf8 = s_fIsUtf8;
+    if (fIsUtf8)
+    {
+        if (fIsUtf8 == true)
+            return "UTF-8";
+
+        /* Initialize: */
+        fIsUtf8 = true;
+        static const char * const s_papszVariables[] = { "LC_ALL", "LC_CTYPE", "LANG" };
+        for (size_t i = 0; i < RT_ELEMENTS(s_papszVariables); i++)
+        {
+            const char *pszValue = getenv(s_papszVariables[i]);
+            if (pszValue && *pszValue)
+            {
+                fIsUtf8 = false;
+                break;
+            }
+        }
+        s_fIsUtf8 = fIsUtf8;
+        if (fIsUtf8 == true)
+            return "UTF-8";
+    }
+#endif
     return nl_langinfo(CODESET);
 }