Ticket #495: patch.diff

source/ps/GameSetup/GameSetup.h

@@ -33 +33 @@
  **/
 extern void EarlyInit();
 
+extern void setDefaultIfLocaleInvalid();
+
 enum InitFlags
 {
     // avoid setting a video mode / initializing OpenGL; assume that has

source/ps/GameSetup/GameSetup.cpp

@@ -721 +721 @@
     debug_filter_add(L"TIMER");
     debug_filter_add(L"HRT");
 
+    setDefaultIfLocaleInvalid();
+
     cpu_ConfigureFloatingPoint();
 
     timer_LatchStartTime();
@@ -740 +742 @@
     srand(time(NULL));  // NOTE: this rand should *not* be used for simulation!
 }
 
+void setDefaultIfLocaleInvalid()
+{
+    // I don't believe $LANGUAGE needs to be included because it isn't checked
+    // by setlocale() nor std::locale::locale(const chr*).
+    // LC_ALL is checked first, and LANG last.
+    const char* const LocaleEnvVars[] = {"LC_ALL", "LC_COLLATE",
+            "LC_CTYPE", "LC_MONETARY",
+            "LC_NUMERIC", "LC_TIME",
+            "LC_MESSAGES", "LANG"};
+
+    try
+    {
+        // this constructor is similar to setlocale(LC_ALL, ""),
+        // but instead of returning NULL, it throws runtime_error
+        // when the first locale env variable found contains an invalid value
+        std::locale::locale("");
+    }
+    catch (std::runtime_error& e)
+    {
+        LOGWARNING(L"Warning: Invalid Locale Settings");
+
+        for (size_t i = 0; i < ARRAY_SIZE(LocaleEnvVars); i++)
+        {
+            if (char* envval = getenv(LocaleEnvVars[i]))
+            {
+                LOGWARNING(L"%hs=\"%hs\"", LocaleEnvVars[i], envval);
+            }
+            else
+            {
+                LOGWARNING(L"%hs=\"(unset)\"", LocaleEnvVars[i]);
+            }
+        }
+
+        // We should set LC_ALL since it overrides LANG
+        if (setenv("LC_ALL", std::locale::classic().name().c_str(), 1))
+        {
+            LOGERROR(L"Unable to set LC_ALL env variable.");
+            exit(EXIT_FAILURE);
+        }
+
+        LOGWARNING(L"Setting LC_ALL env variable to: %hs", getenv("LC_ALL"));
+    }
+
+    return;
+}
+
 static bool Autostart(const CmdLineArgs& args);
 
 void Init(const CmdLineArgs& args, int UNUSED(flags))