Make real number encoding and decoding work under all locales

The decimal point '.' is changed to locale's decimal point
before/after JSON conversion to make C standard library's
locale-specific string conversion functions work correctly.

All the tests now call setlocale(LC_ALL, "") on startup to use the
locale set in the environment.

Fixes GH-32.

test/bin/json_process.c

@@ -5,12 +5,20 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <jansson.h>
 
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 static int getenv_int(const char *name)
 {
     char *value, *end;
@@ -55,6 +63,10 @@ int main(int argc, char *argv[])
     json_t *json;
     json_error_t error;
 
+#if HAVE_SETLOCALE
+    setlocale(LC_ALL, "");
+#endif
+
     if(argc != 1) {
         fprintf(stderr, "usage: %s\n", argv[0]);
         return 2;

test/suites/api/test_array.c

@@ -387,7 +387,7 @@ static void test_circular()
 }
 
 
-int main()
+static void run_tests()
 {
     test_misc();
     test_insert();
@@ -395,6 +395,4 @@ int main()
     test_clear();
     test_extend();
     test_circular();
-
-    return 0;
 }

test/suites/api/test_copy.c

@@ -307,7 +307,7 @@ static void test_deep_copy_object(void)
     json_decref(copy);
 }
 
-int main()
+static void run_tests()
 {
     test_copy_simple();
     test_deep_copy_simple();
@@ -315,5 +315,4 @@ int main()
     test_deep_copy_array();
     test_copy_object();
     test_deep_copy_object();
-    return 0;
 }

test/suites/api/test_dump.c

@@ -133,10 +133,9 @@ static void encode_other_than_array_or_object()
 
 }
 
-int main()
+static void run_tests()
 {
     encode_twice();
     circular_references();
     encode_other_than_array_or_object();
-    return 0;
 }

test/suites/api/test_dump_callback.c

@@ -26,7 +26,7 @@ static int my_writer(const char *buffer, size_t len, void *data) {
     return 0;
 }
 
-int main(void)
+static void run_tests()
 {
     struct my_sink s;
     json_t *json;
@@ -78,6 +78,4 @@ int main(void)
     json_decref(json);
     free(dumped_to_string);
     free(s.buf);
-    return EXIT_SUCCESS;
 }
-

test/suites/api/test_equal.c

@@ -180,11 +180,10 @@ static void test_equal_complex()
     /* TODO: There's no negative test case here */
 }
 
-int main()
+static void run_tests()
 {
     test_equal_simple();
     test_equal_array();
     test_equal_object();
     test_equal_complex();
-    return 0;
 }

test/suites/api/test_load.c

@@ -50,11 +50,9 @@ static void disable_eof_check()
     json_decref(json);
 }
 
-int main()
+static void run_tests()
 {
     file_not_found();
     reject_duplicates();
     disable_eof_check();
-
-    return 0;
 }

test/suites/api/test_loadb.c

@@ -9,7 +9,7 @@
 #include <string.h>
 #include "util.h"
 
-int main()
+static void run_tests()
 {
     json_t *json;
     json_error_t error;
@@ -33,6 +33,4 @@ int main()
     if(strcmp(error.text, "']' expected near end of file") != 0) {
         fail("json_loadb returned an invalid error message for an unclosed top-level array");
     }
-
-    return 0;
 }

test/suites/api/test_memory_funcs.c

@@ -75,10 +75,8 @@ static void test_secure_funcs(void)
     create_and_free_complex_object();
 }
 
-int main()
+static void run_tests()
 {
     test_simple();
     test_secure_funcs();
-
-    return 0;
 }

test/suites/api/test_number.c

@@ -8,7 +8,7 @@
 #include <jansson.h>
 #include "util.h"
 
-int main()
+static void run_tests()
 {
     json_t *integer, *real;
     int i;
@@ -39,6 +39,4 @@ int main()
 
     json_decref(integer);
     json_decref(real);
-
-    return 0;
 }

test/suites/api/test_object.c

@@ -437,7 +437,7 @@ static void test_preserve_order()
     json_decref(object);
 }
 
-int main()
+static void run_tests()
 {
     test_misc();
     test_clear();
@@ -446,6 +446,4 @@ int main()
     test_set_nocheck();
     test_iterators();
     test_preserve_order();
-
-    return 0;
 }

test/suites/api/test_pack.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include "util.h"
 
-int main()
+static void run_tests()
 {
     json_t *value;
     int i;
@@ -227,6 +227,4 @@ int main()
     if(json_pack_ex(&error, 0, "{s:s}", "foo", "\xff\xff"))
         fail("json_pack failed to catch invalid UTF-8 in a string");
     check_error("Invalid UTF-8 string", "<args>", 1, 4, 4);
-
-    return 0;
 }

test/suites/api/test_simple.c

@@ -10,7 +10,7 @@
 #include "util.h"
 
 /* Call the simple functions not covered by other tests of the public API */
-int main()
+static void run_tests()
 {
     json_t *value;
 
@@ -180,6 +180,4 @@ int main()
     json_incref(value);
     if(value->refcount != (size_t)-1)
       fail("refcounting null works incorrectly");
-
-    return 0;
 }

test/suites/api/test_unpack.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include "util.h"
 
-int main()
+static void run_tests()
 {
     json_t *j, *j2;
     int i1, i2, i3;
@@ -336,6 +336,4 @@ int main()
         fail("json_unpack nested array with strict validation failed");
     check_error("1 array item(s) left unpacked", "<validation>", 1, 5, 5);
     json_decref(j);
-
-    return 0;
 }

test/suites/api/util.h

@@ -8,8 +8,16 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
 #include <jansson.h>
 
 #define failhdr fprintf(stderr, "%s:%s:%d: ", __FILE__, __FUNCTION__, __LINE__)
@@ -52,4 +60,15 @@
         }                                                               \
     } while(0)
 
+
+static void run_tests();
+
+int main() {
+#ifdef HAVE_SETLOCALE
+    setlocale(LC_ALL, "");
+#endif
+    run_tests();
+    return 0;
+}
+
 #endif