Changeset 86074 in vbox for trunk/src/VBox/Runtime/r3/generic

Timestamp:

Sep 9, 2020 2:34:49 PM (4 years ago)

Author:

vboxsync

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

140292

Message:

IPRT/RTLocaleQueryLocaleName: ticketref:19856 'VBoxManage unattended install' fails to detect system locale

File:

• trunk/src/VBox/Runtime/r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp

@@ -36 +36 @@
 #include <iprt/errcore.h>
 #include <iprt/string.h>
+#ifdef RT_OS_SOLARIS
+#include <iprt/path.h>
+#endif /* RT_OS_SOLARIS */
 
 
@@ -42 +45 @@
 {
     const char *pszLocale = setlocale(LC_ALL, NULL);
-    if (!pszLocale)
+    if (pszLocale)
+    {
+#ifdef RT_OS_SOLARIS /* Solaris can return a locale starting with a slash ('/'), e.g. /en_GB.UTF-8/C/C/C/C/C */
+        if (RTPATH_IS_SLASH(*pszLocale))
+            pszLocale++;
+#endif /* RT_OS_SOLARIS */
         return RTStrCopy(pszName, cbName, pszLocale);
+    }
     return VERR_NOT_AVAILABLE;
 }