From: ThorstenB <brehmt@gmail.com>
Date: Mon, 18 Jul 2011 18:15:50 +0000 (+0200)
Subject: Clean solution for locale problem.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5f70abb16d3765cd05e2b97755d458b22967ba28;p=simgear.git

Clean solution for locale problem.
Changing and reverting the locale isn't thread-safe. Instead, setup the
environment to ensure the active locale sticks to default "C" locale at
any time.
---

diff --git a/simgear/scene/tsync/terrasync.cxx b/simgear/scene/tsync/terrasync.cxx
index 197d63c0..0c28a46c 100644
--- a/simgear/scene/tsync/terrasync.cxx
+++ b/simgear/scene/tsync/terrasync.cxx
@@ -563,6 +563,11 @@ int SGTerraSync::SvnThread::svnClientSetup(void)
     if (_svn_pool) return EXIT_SUCCESS;
     // No, so initialize svn internals generally
 
+    /* svn_cmdline_init configures the locale. Setup environment to ensure the
+     * default "C" locale remains active, since fgfs isn't locale aware - especially
+     * requires "." as decimal point in strings containing floating point varibales. */
+    setenv("LC_ALL", "C", 1);
+
 #ifdef _MSC_VER
     // there is a segfault when providing an error stream.
     //  Apparently, calling setvbuf with a nul buffer is
@@ -573,12 +578,6 @@ int SGTerraSync::SvnThread::svnClientSetup(void)
     if (svn_cmdline_init("terrasync", stderr) != EXIT_SUCCESS)
         return EXIT_FAILURE;
 #endif
-    /* Oh no! svn_cmdline_init configures the locale - affecting numeric output
-     * formats (i.e. sprintf("%f", ...)). fgfs relies on "C" locale in many places
-     * (including assumptions on required sprintf buffer sizes). Things go horribly
-     * wrong when the locale is changed to anything else but "C". Might be enough to
-     * revert LC_NUMERIC locale - but we'll do a complete revert for now...*/
-    setlocale(LC_ALL,"C");
 
     apr_pool_t *pool;
     apr_pool_create(&pool, NULL);