Remove POSIX locale workaround

6 files changed, 4 insertions, 124 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfb28cc..349342e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,16 +11,6 @@ set(CMAKE_BUILD_TYPE Release)
 find_package(Lua51 REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
 
-# Use thread-safe POSIX.1-2008 uselocale() where available, otherwise
-# fall back to ANSI C setlocale().
-include(CheckFunctionExists)
-CHECK_FUNCTION_EXISTS(uselocale HAVE_USELOCALE)
-if(HAVE_USELOCALE)
-    add_definitions(-DUSE_POSIX_USELOCALE)
-else()
-    add_definitions(-DUSE_POSIX_SETLOCALE)
-endif()
-
 # Handle platforms missing isinf() macro (Eg, some Solaris systems).
 include(CheckSymbolExists)
 CHECK_SYMBOL_EXISTS(isinf math.h HAVE_ISINF)
diff --git a/Makefile b/Makefile
index 9b1b649..7685363 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,6 @@
 LUA_VERSION =   5.1
 
-## Available Lua CJSON specific workarounds
-#
-# To ensure JSON encoding/decoding works correctly for locales using
-# comma decimal separators, Lua CJSON must be compiled with one of
-# these options:
-# USE_POSIX_USELOCALE: Linux, OSX. Thread safe. Recommended option.
-# USE_POSIX_SETLOCALE: Works on all ANSI C platforms. May be used when
-#                      thread-safety isn't required.
+## Available defines for CJSON_CFLAGS
 #
 # USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf().
 
@@ -15,7 +8,6 @@ LUA_VERSION =   5.1
 PREFIX =            /usr/local
 #CFLAGS =            -g -Wall -pedantic -fno-inline
 CFLAGS =            -O3 -Wall -pedantic
-CJSON_CFLAGS =      -DUSE_POSIX_SETLOCALE
 CJSON_LDFLAGS =     -shared
 LUA_INCLUDE_DIR =   $(PREFIX)/include
 LUA_MODULE_DIR =    $(PREFIX)/lib/lua/$(LUA_VERSION)
@@ -29,18 +21,16 @@ INSTALL_CMD =       install
 # specific details.
 
 ## Linux
-#CJSON_CFLAGS =      -DUSE_POSIX_USELOCALE
 
 ## FreeBSD
 #LUA_INCLUDE_DIR =   $(PREFIX)/include/lua51
 
 ## MacOSX (Macports)
 #PREFIX =            /opt/local
-#CJSON_CFLAGS =      -DUSE_POSIX_USELOCALE
 #CJSON_LDFLAGS =     -bundle -undefined dynamic_lookup
 
 ## Solaris
-#CJSON_CFLAGS =      -DUSE_POSIX_SETLOCALE -DUSE_INTERNAL_ISINF
+#CJSON_CFLAGS =      -DUSE_INTERNAL_ISINF
 
 ## End platform specific section
 
diff --git a/lua-cjson-1.0devel-1.rockspec b/lua-cjson-1.0devel-1.rockspec
index 8df0658..3890ec1 100644
--- a/lua-cjson-1.0devel-1.rockspec
+++ b/lua-cjson-1.0devel-1.rockspec
@@ -24,29 +24,16 @@ build = {
     modules = {
         cjson = {
             sources = { "lua_cjson.c", "strbuf.c" },
--- Optional workarounds:
--- USE_POSIX_USELOCALE: Linux, OSX. Thread safe. Recommended.
--- USE_POSIX_SETLOCALE: Works on all ANSI C platforms. May be used when
---                      thread-safety isn't required.
+-- Optional workaround:
 -- USE_INTERNAL_ISINF:  Provide internal isinf() implementation. Required
 --                      on some Solaris platforms.
             defines = {
-                "USE_POSIX_SETLOCALE",
 -- LuaRocks does not support platform specific configuration for Solaris.
 -- Uncomment the line below on Solaris platforms.
 --                "USE_INTERNAL_ISINF"
             }
         }
     },
-    -- Override default build options (per platform)
-    platforms = {
-        linux = { modules = { cjson = { defines = {
-            [1] = "USE_POSIX_USELOCALE"
-        } } } },
-        macosx = { modules = { cjson = { defines = {
-            [1] = "USE_POSIX_USELOCALE"
-        } } } }
-    },
     copy_directories = { "tests" }
 }
 
diff --git a/lua-cjson.spec b/lua-cjson.spec
index 942151e..c7aec95 100644
--- a/lua-cjson.spec
+++ b/lua-cjson.spec
@@ -24,8 +24,7 @@ Lua CJSON provides fast, standards compliant JSON support for Lua.
 
 
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags}" CJSON_CFLAGS="-DUSE_POSIX_USELOCALE" \
-        LUA_INCLUDE_DIR="%{_includedir}"
+make %{?_smp_mflags} CFLAGS="%{optflags}" LUA_INCLUDE_DIR="%{_includedir}"
 
 
 %install
diff --git a/lua_cjson.c b/lua_cjson.c
index 0f6d675..f5ea0dd 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -48,48 +48,6 @@
 #define CJSON_VERSION   "1.0devel"
 #endif
 
-/* Support to reset locale to POSIX for strtod() / sprintf().
- * Some locales use comma as a decimal separator. This breaks JSON. */
-#ifdef USE_POSIX_USELOCALE
-
-#ifdef USE_POSIX_SETLOCALE
-#error Must not define USE_POSIX_USELOCALE and USE_POSIX_SETLOCALE simultaneously.
-#endif
-
-/* unistd.h defines _POSIX_VERSION */
-#include <unistd.h>
-
-#if _POSIX_VERSION >= 200809L
-/* POSIX.1-2008 adds threadsafe locale support */
-#include <locale.h>
-#elif defined(_POSIX_VERSION)
-/* Some pre-POSIX.1-2008 operating systems offer xlocale.h instead */
-#include <xlocale.h>
-#else
-#error Missing _POSIX_VERSION define
-#endif  /* _POSIX_VERSION */
-
-#define LOCALE_SET_POSIX(x) (x)->saved_locale = uselocale((x)->posix_locale)
-#define LOCALE_RESTORE(x)   uselocale((x)->saved_locale)
-
-#elif defined(USE_POSIX_SETLOCALE)
-/* ANSI C / ISO C90 implementation. Not thread-safe, affects entire process. */
-#include <locale.h>
-
-#define LOCALE_SET_POSIX(x) \
-    do { \
-        (x)->saved_locale = setlocale(LC_NUMERIC, NULL); \
-        setlocale(LC_NUMERIC, "C"); \
-    } while(0)
-#define LOCALE_RESTORE(x)   setlocale(LC_NUMERIC, (x)->saved_locale)
-
-#else   /* Do not work around locale support in strtod() / sprintf() */
-
-#define LOCALE_SET_POSIX(x) do { } while(0)
-#define LOCALE_RESTORE(x)   do { } while(0)
-
-#endif
-
 /* Workaround for Solaris platforms missing isinf() */
 #if !defined(isinf) && (defined(USE_INTERNAL_ISINF) || defined(MISSING_ISINF))
 #define isinf(x) (!isnan(x) && isnan((x) - (x)))
@@ -146,12 +104,6 @@ typedef struct {
     char *char2escape[256]; /* Encoding */
 #endif
     strbuf_t encode_buf;
-#if defined(USE_POSIX_USELOCALE)
-    locale_t saved_locale;
-    locale_t posix_locale;
-#elif defined(USE_POSIX_SETLOCALE)
-    const char *saved_locale;
-#endif
     char number_fmt[8];     /* "%.XXg\0" */
     int current_depth;
 
@@ -395,10 +347,6 @@ static int json_destroy_config(lua_State *l)
     json_config_t *cfg;
 
     cfg = lua_touserdata(l, 1);
-#ifdef USE_POSIX_USELOCALE
-    if (cfg->posix_locale)
-        freelocale(cfg->posix_locale);
-#endif
     if (cfg)
         strbuf_free(&cfg->encode_buf);
     cfg = NULL;
@@ -420,13 +368,6 @@ static void json_create_config(lua_State *l)
     lua_setmetatable(l, -2);
 
     strbuf_init(&cfg->encode_buf, 0);
-#ifdef USE_POSIX_USELOCALE
-    cfg->saved_locale = NULL;
-    /* Must not lua_error() before cfg->posix_locale has been initialised */
-    cfg->posix_locale = newlocale(LC_ALL_MASK, "C", NULL);
-    if (!cfg->posix_locale)
-        luaL_error(l, "Failed to create POSIX locale for JSON");
-#endif
 
     cfg->encode_sparse_convert = DEFAULT_SPARSE_CONVERT;
     cfg->encode_sparse_ratio = DEFAULT_SPARSE_RATIO;
@@ -490,7 +431,6 @@ static void json_encode_exception(lua_State *l, json_config_t *cfg, int lindex,
 {
     if (!cfg->encode_keep_buffer)
         strbuf_free(&cfg->encode_buf);
-    LOCALE_RESTORE(cfg);
     luaL_error(l, "Cannot serialise %s: %s",
                   lua_typename(l, lua_type(l, lindex)), reason);
 }
@@ -581,7 +521,6 @@ static void json_encode_descend(lua_State *l, json_config_t *cfg)
     if (cfg->current_depth > cfg->encode_max_depth) {
         if (!cfg->encode_keep_buffer)
             strbuf_free(&cfg->encode_buf);
-        LOCALE_RESTORE(cfg);
         luaL_error(l, "Cannot serialise, excessive nesting (%d)",
                    cfg->current_depth);
     }
@@ -746,13 +685,9 @@ static int json_encode(lua_State *l)
     else
         strbuf_init(&cfg->encode_buf, 0);
 
-    LOCALE_SET_POSIX(cfg);
-
     json_append_data(l, cfg, &cfg->encode_buf);
     json = strbuf_string(&cfg->encode_buf, &len);
 
-    LOCALE_RESTORE(cfg);
-
     lua_pushlstring(l, json, len);
 
     if (!cfg->encode_keep_buffer)
@@ -1133,8 +1068,6 @@ static void json_throw_parse_error(lua_State *l, json_parse_t *json,
     else
         found = json_token_type_name[token->type];
 
-    LOCALE_RESTORE(json->cfg);
-
     /* Note: token->index is 0 based, display starting from 1 */
     luaL_error(l, "Expected %s but found %s at character %d",
                exp, found, token->index + 1);
@@ -1146,7 +1079,6 @@ static void json_decode_checkstack(lua_State *l, json_parse_t *json, int n)
         return;
 
     strbuf_free(json->tmp);
-    LOCALE_RESTORE(json->cfg);
     luaL_error(l, "Too many nested data structures");
 }
 
@@ -1276,8 +1208,6 @@ static void lua_json_decode(lua_State *l, const char *json_text, int json_len)
      * string must be smaller than the entire json string */
     json.tmp = strbuf_new(json_len);
 
-    LOCALE_SET_POSIX(json.cfg);
-
     json_next_token(&json, &token);
     json_process_value(l, &json, &token);
 
@@ -1287,8 +1217,6 @@ static void lua_json_decode(lua_State *l, const char *json_text, int json_len)
     if (token.type != T_END)
         json_throw_parse_error(l, &json, "the end", &token);
 
-    LOCALE_RESTORE(json.cfg);
-
     strbuf_free(json.tmp);
 }
 
diff --git a/manual.txt b/manual.txt
index 2917339..a3e12cf 100644
--- a/manual.txt
+++ b/manual.txt
@@ -47,20 +47,6 @@ LuaRocks:: Unix, Windows
 Build options (#define)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Lua CJSON uses +strtod+(3) and +snprintf+(3) to perform numeric
-conversion as they are usually well supported, fast and bug free. Lua
-CJSON may optionally be compiled with (only) one of the following
-preprocessor macros to support locales with comma decimal separators:
-
-[horizontal]
-USE_POSIX_USELOCALE:: Thread safe. Supported by Linux and Mac OSX.
-Recommended where available.
-
-USE_POSIX_SETLOCALE:: Use only with single threaded programs.
-Works on all ANSI C platforms.
-
-Also available:
-
 [horizontal]
 USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing isinf().