From 0df488874f52a881d14b5876babaa780bb6200ee Mon Sep 17 00:00:00 2001
From: Jesper Lundgren <jesperlundgren@exosite.com>
Date: Mon, 9 Mar 2020 16:12:24 +0800
Subject: [PATCH 01/57] feature: add option to disable forward slash escaping

Thanks @spacewander for optimization and documentation.
---
 README.md       | 13 +++++++++++++
 lua_cjson.c     | 18 ++++++++++++++++++
 tests/agentzh.t | 19 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/README.md b/README.md
index 83bfd767..ace23d11 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Table of Contents
     * [array_mt](#array_mt)
     * [empty_array_mt](#empty_array_mt)
     * [encode_number_precision](#encode_number_precision)
+    * [encode_escape_forward_slash](#encode_escape_forward_slash)
     * [decode_array_with_array_mt](#decode_array_with_array_mt)
 
 Description
@@ -158,6 +159,18 @@ This fork allows encoding of numbers with a `precision` up to 16 decimals (vs. 1
 
 [Back to TOC](#table-of-contents)
 
+encode_escape_forward_slash
+---------------------------
+**syntax:** `cjson.encode_escape_forward_slash(enabled)`
+
+**default:** true
+
+If enabled, forward slash '/' will be encoded as '\/'.
+
+If disabled, forward slash '/' will be encoded as '/' (no escape is applied).
+
+[Back to TOC](#table-of-contents)
+
 decode_array_with_array_mt
 --------------------------
 **syntax:** `cjson.decode_array_with_array_mt(enabled)`
diff --git a/lua_cjson.c b/lua_cjson.c
index 2a69699d..875bdafd 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -81,6 +81,7 @@
 #define DEFAULT_ENCODE_NUMBER_PRECISION 14
 #define DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT 1
 #define DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT 0
+#define DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH 1
 
 #ifdef DISABLE_INVALID_NUMBERS
 #undef DEFAULT_DECODE_INVALID_NUMBERS
@@ -155,6 +156,7 @@ typedef struct {
     int encode_number_precision;
     int encode_keep_buffer;
     int encode_empty_table_as_object;
+    int encode_escape_forward_slash;
 
     int decode_invalid_numbers;
     int decode_max_depth;
@@ -406,6 +408,20 @@ static int json_cfg_decode_invalid_numbers(lua_State *l)
     return 1;
 }
 
+static int json_cfg_encode_escape_forward_slash(lua_State *l)
+{
+    int            ret;
+    json_config_t *cfg = json_arg_init(l, 1);
+
+    ret = json_enum_option(l, 1, &cfg->encode_escape_forward_slash, NULL, 1);
+    if (cfg->encode_escape_forward_slash) {
+        char2escape['/'] = "\\/";
+    } else {
+        char2escape['/'] = NULL;
+    }
+    return ret;
+}
+
 static int json_destroy_config(lua_State *l)
 {
     json_config_t *cfg;
@@ -442,6 +458,7 @@ static void json_create_config(lua_State *l)
     cfg->encode_number_precision = DEFAULT_ENCODE_NUMBER_PRECISION;
     cfg->encode_empty_table_as_object = DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT;
     cfg->decode_array_with_array_mt = DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT;
+    cfg->encode_escape_forward_slash = DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH;
 
 #if DEFAULT_ENCODE_KEEP_BUFFER > 0
     strbuf_init(&cfg->encode_buf, 0);
@@ -1457,6 +1474,7 @@ static int lua_cjson_new(lua_State *l)
         { "encode_keep_buffer", json_cfg_encode_keep_buffer },
         { "encode_invalid_numbers", json_cfg_encode_invalid_numbers },
         { "decode_invalid_numbers", json_cfg_decode_invalid_numbers },
+        { "encode_escape_forward_slash", json_cfg_encode_escape_forward_slash },
         { "new", lua_cjson_new },
         { NULL, NULL }
     };
diff --git a/tests/agentzh.t b/tests/agentzh.t
index 79673377..7591902b 100644
--- a/tests/agentzh.t
+++ b/tests/agentzh.t
@@ -284,3 +284,22 @@ print(string.format("%16.0f", cjson.decode("9007199254740992")))
 9.007199254741e+15
 9007199254740992
 9007199254740992
+
+
+
+=== TEST 21: / in string
+--- lua
+local cjson = require "cjson"
+local a={test = "http://google.com/google"}
+local b=cjson.encode(a)
+print(b)
+cjson.encode_escape_forward_slash(false)
+local b=cjson.encode(a)
+print(b)
+cjson.encode_escape_forward_slash(true)
+local b=cjson.encode(a)
+print(b)
+--- out
+{"test":"http:\/\/google.com\/google"}
+{"test":"http://google.com/google"}
+{"test":"http:\/\/google.com\/google"}

From 5c25e6f98afe0e8c814411e6f0ee4b24f19ddc83 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 17:31:38 -0700
Subject: [PATCH 02/57] support lua 5.2 with LUA_COMPAT_ALL

---
 lua_cjson.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua_cjson.c b/lua_cjson.c
index 875bdafd..b8dac313 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -36,6 +36,9 @@
  *       difficult to know object/array sizes ahead of time.
  */
 
+
+#define LUA_COMPAT_ALL 1
+
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>

From dbfac1a8b2a6e316a6f61d41a1196b4664883a7b Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 18:01:05 -0700
Subject: [PATCH 03/57] support lua 5.3 with LUA_COMPAT_5_1

---
 lua_cjson.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua_cjson.c b/lua_cjson.c
index b8dac313..020ba212 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -38,6 +38,7 @@
 
 
 #define LUA_COMPAT_ALL 1
+#define LUA_COMPAT_5_1 1
 
 #include <assert.h>
 #include <stdint.h>

From 3cdf14a8ddd283e9738860359fbdc5ba4e618972 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 18:18:27 -0700
Subject: [PATCH 04/57] Lua 5.2+ unpack support

---
 lua/cjson/util.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
index 5d80106a..48fa33cc 100644
--- a/lua/cjson/util.lua
+++ b/lua/cjson/util.lua
@@ -1,5 +1,7 @@
 local json = require "cjson"
 
+local unpack = unpack or table.unpack
+
 -- Various common routines used by the Lua CJSON package
 --
 -- Mark Pulford <mark@kyne.com.au>

From dcd5c253ce2839c10cc4e40ca98202fc29270762 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 18:43:47 -0700
Subject: [PATCH 05/57] Lua 5.2+ maxn support

---
 lua/cjson/util.lua | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
index 48fa33cc..24052572 100644
--- a/lua/cjson/util.lua
+++ b/lua/cjson/util.lua
@@ -2,6 +2,16 @@ local json = require "cjson"
 
 local unpack = unpack or table.unpack
 
+local maxn = table.maxn or function(t)
+    local max = 0
+    for k,v in pairs(t) do
+        if type(k) == "number" and k > max then
+            max = k
+        end
+    end
+    return max
+end
+
 -- Various common routines used by the Lua CJSON package
 --
 -- Mark Pulford <mark@kyne.com.au>
@@ -194,7 +204,7 @@ local function run_test(testname, func, input, should_work, output)
     local result = {}
     local tmp = { pcall(func, unpack(input)) }
     local success = tmp[1]
-    for i = 2, table.maxn(tmp) do
+    for i = 2, maxn(tmp) do
         result[i - 1] = tmp[i]
     end
 

From f5cf8297aebfe8f23ccf086a671d6cacd1c1613e Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 13:43:18 -0700
Subject: [PATCH 06/57] use macro instead of header defines for Lua 5.2+
 support

---
 lua_cjson.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua_cjson.c b/lua_cjson.c
index 020ba212..45ebe78b 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -36,10 +36,6 @@
  *       difficult to know object/array sizes ahead of time.
  */
 
-
-#define LUA_COMPAT_ALL 1
-#define LUA_COMPAT_5_1 1
-
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
@@ -106,6 +102,10 @@
 #define json_lightudata_mask(ludata)    (ludata)
 #endif
 
+#if LUA_VERSION_NUM > 501
+#define lua_objlen(L,i)		lua_rawlen(L, (i))
+#endif
+
 static const char * const *json_empty_array;
 static const char * const *json_array;
 

From 6534a2315c5f9fd3e327ac21214f6c354aa38149 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 17:34:33 -0700
Subject: [PATCH 07/57] see what happens if we run tests on github actions

---
 .github/workflows/test.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..1c33dccf
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,29 @@
+name: test
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        luaVersion: ["5.1", "5.2", "5.3", "luajit", "luajit-openresty"]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+
+    - uses: leafo/gh-actions-lua@v3
+      with:
+        luaVersion: ${{ matrix.luaVersion }}
+
+    - uses: leafo/gh-actions-luarocks@v2
+
+    - name: build
+      run: |
+        luarocks make
+
+    - name: test
+      run: |
+        ./runtests.sh

From cfa855df543d8c93d0d9c8fc73bff535b1d56ac8 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 17:37:43 -0700
Subject: [PATCH 08/57] fail if tests are blocked

---
 runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtests.sh b/runtests.sh
index 82dc8c1d..85b7811d 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -39,7 +39,7 @@ then
 Please ensure you do not have the Lua CJSON module installed before
 running these tests.
 EOT
-    exit
+    exit 1
 fi
 cd ..
 

From d3685e3477b04ca129863251882f281b5975701f Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 17:40:18 -0700
Subject: [PATCH 09/57] build after tests, so tests can do their own build test

---
 .github/workflows/test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1c33dccf..9c3fa93e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,10 +20,11 @@ jobs:
 
     - uses: leafo/gh-actions-luarocks@v2
 
+    - name: test
+      run: |
+        ./runtests.sh
+
     - name: build
       run: |
         luarocks make
 
-    - name: test
-      run: |
-        ./runtests.sh

From e55b93ff0c0aee0449d8cd8e94b91096d11a38e1 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 17:48:46 -0700
Subject: [PATCH 10/57] use local lua for makefile build

---
 .github/workflows/test.yml | 2 +-
 runtests.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c3fa93e..f8bea285 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
 
     - name: test
       run: |
-        ./runtests.sh
+        ./runtests.sh PREFIX=.lua
 
     - name: build
       run: |
diff --git a/runtests.sh b/runtests.sh
index 85b7811d..748bd404 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -50,7 +50,7 @@ luarocks remove --local lua-cjson
 make clean
 
 echo "===== Testing Makefile build ====="
-make
+make "$@"
 cp -r lua/cjson cjson.so tests
 do_tests
 make clean

From 7f21cad7f007d79d470d38a3546287bc2eab1b18 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 18:11:28 -0700
Subject: [PATCH 11/57] tell cmake where lua is

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f8bea285..04c407c8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
 
     - name: test
       run: |
-        ./runtests.sh PREFIX=.lua
+        LUA_DIR=.lua ./runtests.sh PREFIX=.lua
 
     - name: build
       run: |

From 0d0c4063d00bc33549832a8d58a00c9836c04df8 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 18:18:18 -0700
Subject: [PATCH 12/57] make tests fail when they fail

---
 runtests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtests.sh b/runtests.sh
index 748bd404..bfb01d90 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
+set -eo pipefail
 
 PLATFORM="`uname -s`"
 [ "$1" ] && VERSION="$1" || VERSION="2.1devel"
 
-set -e
 
 # Portable "ggrep -A" replacement.
 # Work around Solaris awk record limit of 2559 bytes.

From 3882fac81a08c24c948faafe980dd181a906fa00 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 19:09:00 -0700
Subject: [PATCH 13/57] add one_of testing to avoid hash table ordering causing
 test to fail

---
 lua/cjson/util.lua | 29 +++++++++++++++++++++++++++--
 tests/test.lua     |  7 ++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
index 24052572..7cf66be4 100644
--- a/lua/cjson/util.lua
+++ b/lua/cjson/util.lua
@@ -12,6 +12,17 @@ local maxn = table.maxn or function(t)
     return max
 end
 
+local _one_of_mt = {}
+
+local function one_of(t)
+    setmetatable(t, _one_of_mt)
+    return t
+end
+
+local function is_one_of(t)
+    return type(t) == "table" and getmetatable(t) == _one_of_mt
+end
+
 -- Various common routines used by the Lua CJSON package
 --
 -- Mark Pulford <mark@kyne.com.au>
@@ -59,7 +70,11 @@ local function serialise_table(value, indent, depth)
     local max = is_array(value)
 
     local comma = false
-    local fragment = { "{" .. spacing2 }
+    local prefix = "{"
+    if is_one_of(value) then
+        prefix = "ONE_OF{"
+    end
+    local fragment = { prefix .. spacing2 }
     if max > 0 then
         -- Serialise array
         for i = 1, max do
@@ -146,6 +161,15 @@ local function file_save(filename, data)
 end
 
 local function compare_values(val1, val2)
+    if is_one_of(val2) then
+        for _, option in ipairs(val2) do
+            if compare_values(val1, option) then
+                return true
+            end
+        end
+        return false
+    end
+
     local type1 = type(val1)
     local type2 = type(val2)
     if type1 ~= type2 then
@@ -281,7 +305,8 @@ return {
     run_test_summary = run_test_summary,
     run_test = run_test,
     run_test_group = run_test_group,
-    run_script = run_script
+    run_script = run_script,
+    one_of = one_of
 }
 
 -- vi:ai et sw=4 ts=4:
diff --git a/tests/test.lua b/tests/test.lua
index d1bf7e4f..b2162b91 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -293,7 +293,12 @@ local cjson_tests = {
       true, { '["one",null,null,"sparse test"]' } },
     { "Encode sparse array as object",
       json.encode, { { [1] = "one", [5] = "sparse test" } },
-      true, { '{"5":"sparse test","1":"one"}' } },
+      true, {
+          util.one_of{
+              '{"5":"sparse test","1":"one"}',
+              '{"1":"one","5":"sparse test"}'
+          }
+      } },
     { "Encode table with numeric string key as object",
       json.encode, { { ["2"] = "numeric string key test" } },
       true, { '{"2":"numeric string key test"}' } },

From 96187b423dbec0d502bb1c4200094527458d83c2 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 19:22:24 -0700
Subject: [PATCH 14/57] support error message testing for modern versions of
 lua

---
 tests/test.lua | 68 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/tests/test.lua b/tests/test.lua
index b2162b91..aeded765 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -294,7 +294,7 @@ local cjson_tests = {
     { "Encode sparse array as object",
       json.encode, { { [1] = "one", [5] = "sparse test" } },
       true, {
-          util.one_of{
+          util.one_of {
               '{"5":"sparse test","1":"one"}',
               '{"1":"one","5":"sparse test"}'
           }
@@ -363,32 +363,71 @@ local cjson_tests = {
       json.encode_keep_buffer, { true }, true, { true } },
 
     -- Test config API errors
-    -- Function is listed as '?' due to pcall
+    -- Function is listed as '?' due to pcall for older versions of Lua
     { "Set encode_number_precision(0) [throw error]",
       json.encode_number_precision, { 0 },
-      false, { "bad argument #1 to '?' (expected integer between 1 and 16)" } },
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (expected integer between 1 and 16)",
+              "bad argument #1 to 'cjson.encode_number_precision' (expected integer between 1 and 16)"
+          }
+      } },
     { "Set encode_number_precision(\"five\") [throw error]",
       json.encode_number_precision, { "five" },
-      false, { "bad argument #1 to '?' (number expected, got string)" } },
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (number expected, got string)",
+              "bad argument #1 to 'cjson.encode_number_precision' (number expected, got string)"
+          }
+      } },
     { "Set encode_keep_buffer(nil, true) [throw error]",
       json.encode_keep_buffer, { nil, true },
-      false, { "bad argument #2 to '?' (found too many arguments)" } },
+      false, {
+          util.one_of {
+              "bad argument #2 to '?' (found too many arguments)",
+              "bad argument #2 to 'cjson.encode_keep_buffer' (found too many arguments)"
+          }
+      } },
     { "Set encode_max_depth(\"wrong\") [throw error]",
       json.encode_max_depth, { "wrong" },
-      false, { "bad argument #1 to '?' (number expected, got string)" } },
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (number expected, got string)",
+              "bad argument #1 to 'cjson.encode_max_depth' (number expected, got string)"
+          }
+      } },
     { "Set decode_max_depth(0) [throw error]",
       json.decode_max_depth, { "0" },
-      false, { "bad argument #1 to '?' (expected integer between 1 and 2147483647)" } },
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (expected integer between 1 and 2147483647)",
+              "bad argument #1 to 'cjson.decode_max_depth' (expected integer between 1 and 2147483647)"
+          }
+      } },
     { "Set encode_invalid_numbers(-2) [throw error]",
       json.encode_invalid_numbers, { -2 },
-      false, { "bad argument #1 to '?' (invalid option '-2')" } },
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (invalid option '-2')",
+              "bad argument #1 to 'cjson.encode_invalid_numbers' (invalid option '-2')"
+          }
+      } },
     { "Set decode_invalid_numbers(true, false) [throw error]",
       json.decode_invalid_numbers, { true, false },
-      false, { "bad argument #2 to '?' (found too many arguments)" } },
+      false, {
+          util.one_of {
+              "bad argument #2 to '?' (found too many arguments)",
+              "bad argument #2 to 'cjson.decode_invalid_numbers' (found too many arguments)"
+          }
+      } },
     { "Set encode_sparse_array(\"not quite on\") [throw error]",
       json.encode_sparse_array, { "not quite on" },
-      false, { "bad argument #1 to '?' (invalid option 'not quite on')" } },
-
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (invalid option 'not quite on')",
+              "bad argument #1 to 'cjson.encode_sparse_array' (invalid option 'not quite on')"
+          }
+      } },
     { "Reset Lua CJSON configuration", function () json = json.new() end },
     -- Wrap in a function to ensure the table returned by json.new() is used
     { "Check encode_sparse_array()",
@@ -400,7 +439,12 @@ local cjson_tests = {
       true, { "true" } },
     { "Encode (safe) argument validation [throw error]",
       json_safe.encode, { "arg1", "arg2" },
-      false, { "bad argument #1 to '?' (expected 1 argument)" } },
+      false, {
+          util.one_of {
+              "bad argument #1 to '?' (expected 1 argument)",
+              "bad argument #1 to 'cjson.safe.encode' (expected 1 argument)"
+          }
+      } },
     { "Decode (safe) error generation",
       json_safe.decode, { "Oops" },
       true, { nil, "Expected value but found invalid token at character 1" } },

From 5dd400b9bddd4122d774f76c75ea861a25c6cdd1 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 19:53:30 -0700
Subject: [PATCH 15/57] use different header path for luajit make builds

---
 .github/workflows/test.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04c407c8..395e380d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,6 +8,11 @@ jobs:
       fail-fast: false
       matrix:
         luaVersion: ["5.1", "5.2", "5.3", "luajit", "luajit-openresty"]
+        include:
+          - luaVersion: "luajit"
+            luaIncludeDir: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+          - luaVersion: "luajit-openresty"
+            luaIncludeDir: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
 
     runs-on: ubuntu-latest
 
@@ -22,7 +27,7 @@ jobs:
 
     - name: test
       run: |
-        LUA_DIR=.lua ./runtests.sh PREFIX=.lua
+        LUA_DIR=.lua ./runtests.sh PREFIX=.lua ${{ matrix.luaIncludeDir }}
 
     - name: build
       run: |

From 701fda3ed4dccd6dd7e535986567d4e0235c6d02 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 21 Sep 2019 19:57:39 -0700
Subject: [PATCH 16/57] attempting to fix luajit cmake build

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c17239b2..c1d670d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ if(NOT CMAKE_BUILD_TYPE)
         FORCE)
 endif()
 
-find_package(Lua51 REQUIRED)
+find_package(Lua REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
 
 if(NOT USE_INTERNAL_FPCONV)

From 206cb297178ff46b4c5e5de38744cd648dac4f22 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 09:50:09 -0700
Subject: [PATCH 17/57] cmake doesn't support finding luajit, so skip it

---
 .github/workflows/test.yml |  8 +++++---
 runtests.sh                | 24 +++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 395e380d..c0fd8ee4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,9 +10,11 @@ jobs:
         luaVersion: ["5.1", "5.2", "5.3", "luajit", "luajit-openresty"]
         include:
           - luaVersion: "luajit"
-            luaIncludeDir: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestEnv: "SKIP_CMAKE=1"
           - luaVersion: "luajit-openresty"
-            luaIncludeDir: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestEnv: "SKIP_CMAKE=1"
 
     runs-on: ubuntu-latest
 
@@ -27,7 +29,7 @@ jobs:
 
     - name: test
       run: |
-        LUA_DIR=.lua ./runtests.sh PREFIX=.lua ${{ matrix.luaIncludeDir }}
+        LUA_DIR=.lua ${{ matrix.runtestEnv }} ./runtests.sh PREFIX=.lua ${{ matrix.runtestArgs }}
 
     - name: build
       run: |
diff --git a/runtests.sh b/runtests.sh
index bfb01d90..fe606fa2 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -56,14 +56,20 @@ do_tests
 make clean
 rm -rf tests/cjson{,.so}
 
-echo "===== Testing Cmake build ====="
-mkdir build
-cd build
-cmake ..
-make
-cd ..
-cp -r lua/cjson build/cjson.so tests
-do_tests
-rm -rf build tests/cjson{,.so}
+
+if [ -z "$SKIP_CMAKE" ]; then
+    echo "===== Testing Cmake build ====="
+    mkdir build
+    cd build
+    cmake ..
+    make
+    cd ..
+    cp -r lua/cjson build/cjson.so tests
+    do_tests
+    rm -rf build tests/cjson{,.so}
+else
+    echo "===== Skipping Cmake build ====="
+fi
+
 
 # vi:ai et sw=4 ts=4:

From 760db1bf7beac29f6fbf124e76d3eb630b544ce7 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 09:57:50 -0700
Subject: [PATCH 18/57] attempt to run openresty perl tests

---
 .github/workflows/test.yml | 14 +++++++++++++-
 tests/TestLua.pm           |  5 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c0fd8ee4..4c3f64c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,10 +27,22 @@ jobs:
 
     - uses: leafo/gh-actions-luarocks@v2
 
-    - name: test
+    - name: runtests.sh
       run: |
         LUA_DIR=.lua ${{ matrix.runtestEnv }} ./runtests.sh PREFIX=.lua ${{ matrix.runtestArgs }}
 
+    - name: setup prove
+      run: |
+        make PREFIX=.lua ${{ matrix.runtestArgs }}
+        sudo apt-get install valgrind libipc-run3-perl cppcheck cpanminus
+        sudo cpanm --notest Test::Base Test::LongString
+
+    - name: prove
+      run: LUA_BIN=lua prove -Itests tests
+
+    - name: prove (valgrind)
+      run: LUA_BIN=lua TEST_LUA_USE_VALGRIND=1 prove -Itests tests
+
     - name: build
       run: |
         luarocks make
diff --git a/tests/TestLua.pm b/tests/TestLua.pm
index 64372ad1..e13bfd3f 100644
--- a/tests/TestLua.pm
+++ b/tests/TestLua.pm
@@ -32,12 +32,13 @@ sub run_test ($) {
     my ($res, $err);
 
     my @cmd;
+    my $lua_bin = $ENV{LUA_BIN} || "luajit";
 
     if ($ENV{TEST_LUA_USE_VALGRIND}) {
         warn "$name\n";
-        @cmd =  ('valgrind', '-q', '--leak-check=full', 'luajit', 'test_case.lua');
+        @cmd =  ('valgrind', '-q', '--leak-check=full', $lua_bin, 'test_case.lua');
     } else {
-        @cmd =  ('luajit', 'test_case.lua');
+        @cmd =  ($lua_bin, 'test_case.lua');
     }
 
     run3 \@cmd, undef, \$res, \$err;

From fde219d00e6be5bce6f219d0620fe27c0d81ed87 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 10:49:17 -0700
Subject: [PATCH 19/57] bring cppcheck back

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4c3f64c6..45c0c4e5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,9 +34,12 @@ jobs:
     - name: setup prove
       run: |
         make PREFIX=.lua ${{ matrix.runtestArgs }}
-        sudo apt-get install valgrind libipc-run3-perl cppcheck cpanminus
+        sudo apt-get install -q valgrind libipc-run3-perl cppcheck cpanminus
         sudo cpanm --notest Test::Base Test::LongString
 
+    - name: cppcheck
+      run: cppcheck -I .lua/include -i .lua/ -i .install/ --force --error-exitcode=1 --enable=warning .
+
     - name: prove
       run: LUA_BIN=lua prove -Itests tests
 

From c3bc1a1c171b002289946794dd187977bf3370d6 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 11:03:30 -0700
Subject: [PATCH 20/57] ignore dtoa.c for cppcheck, don't share lua headers
 (breaks due to define)

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 45c0c4e5..fc8a49ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,7 +38,7 @@ jobs:
         sudo cpanm --notest Test::Base Test::LongString
 
     - name: cppcheck
-      run: cppcheck -I .lua/include -i .lua/ -i .install/ --force --error-exitcode=1 --enable=warning .
+      run: cppcheck -i .lua/ -i .install/ -i dtoa.c --force --error-exitcode=1 --enable=warning .
 
     - name: prove
       run: LUA_BIN=lua prove -Itests tests

From dbcfb92e12e9016060d1907a2556cc61e82f467d Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 11:13:37 -0700
Subject: [PATCH 21/57] run with gcc and clang

---
 .github/workflows/test.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fc8a49ee..a2076f18 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        cc: ["gcc", "clang"]
         luaVersion: ["5.1", "5.2", "5.3", "luajit", "luajit-openresty"]
         include:
           - luaVersion: "luajit"
@@ -21,17 +22,24 @@ jobs:
     steps:
     - uses: actions/checkout@master
 
-    - uses: leafo/gh-actions-lua@v3
+    - uses: leafo/gh-actions-lua@master
+      env:
+        CC: ${{ matrix.cc }}
       with:
         luaVersion: ${{ matrix.luaVersion }}
+        luaCompileFlags: CC=${{ matrix.cc }}
 
     - uses: leafo/gh-actions-luarocks@v2
 
     - name: runtests.sh
+      env:
+        CC: ${{ matrix.cc }}
       run: |
         LUA_DIR=.lua ${{ matrix.runtestEnv }} ./runtests.sh PREFIX=.lua ${{ matrix.runtestArgs }}
 
     - name: setup prove
+      env:
+        CC: ${{ matrix.cc }}
       run: |
         make PREFIX=.lua ${{ matrix.runtestArgs }}
         sudo apt-get install -q valgrind libipc-run3-perl cppcheck cpanminus

From 461c7ef23a49062d4b1bf0e1afb3be294d007861 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 13:21:45 -0700
Subject: [PATCH 22/57] write sort_json, use it on perl tests to prevent hash
 table ordering failures

---
 tests/agentzh.t     | 13 ++++++----
 tests/sort_json.lua | 61 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 tests/sort_json.lua

diff --git a/tests/agentzh.t b/tests/agentzh.t
index 7591902b..2e7c8cec 100644
--- a/tests/agentzh.t
+++ b/tests/agentzh.t
@@ -66,8 +66,9 @@ print(cjson.encode({arr = empty_arr}))
 === TEST 6: empty_array_mt and empty tables as objects (explicit)
 --- lua
 local cjson = require "cjson"
+local sort_json = require "tests.sort_json"
 local empty_arr = setmetatable({}, cjson.empty_array_mt)
-print(cjson.encode({obj = {}, arr = empty_arr}))
+print(sort_json(cjson.encode({obj = {}, arr = empty_arr})))
 --- out
 {"arr":[],"obj":{}}
 
@@ -76,6 +77,7 @@ print(cjson.encode({obj = {}, arr = empty_arr}))
 === TEST 7: empty_array_mt and empty tables as objects (explicit)
 --- lua
 local cjson = require "cjson"
+local sort_json = require "tests.sort_json"
 cjson.encode_empty_table_as_object(true)
 local empty_arr = setmetatable({}, cjson.empty_array_mt)
 local data = {
@@ -88,15 +90,16 @@ local data = {
     }
   }
 }
-print(cjson.encode(data))
+print(sort_json(cjson.encode(data)))
 --- out
-{"foo":{"foobar":{"obj":{},"arr":[]},"obj":{}},"arr":[]}
+{"arr":[],"foo":{"foobar":{"arr":[],"obj":{}},"obj":{}}}
 
 
 
 === TEST 8: empty_array_mt on non-empty tables
 --- lua
 local cjson = require "cjson"
+local sort_json = require "tests.sort_json"
 cjson.encode_empty_table_as_object(true)
 local array = {"hello", "world", "lua"}
 setmetatable(array, cjson.empty_array_mt)
@@ -110,9 +113,9 @@ local data = {
     }
   }
 }
-print(cjson.encode(data))
+print(sort_json(cjson.encode(data)))
 --- out
-{"foo":{"foobar":{"obj":{},"arr":[]},"obj":{}},"arr":["hello","world","lua"]}
+{"arr":["hello","world","lua"],"foo":{"foobar":{"arr":[],"obj":{}},"obj":{}}}
 
 
 
diff --git a/tests/sort_json.lua b/tests/sort_json.lua
new file mode 100644
index 00000000..c95ab3c4
--- /dev/null
+++ b/tests/sort_json.lua
@@ -0,0 +1,61 @@
+-- NOTE: This will only work for simple tests. It doesn't parse strings so if
+-- you put any symbols like {?[], inside of a string literal then it will break
+-- The point of this function is to test basic structures, and not test JSON
+-- strings
+
+local function sort_callback(str)
+  local inside = str:sub(2, -2)
+
+  local parts = {}
+  local buffer = ""
+  local pos = 1
+
+  while true do
+    if pos > #inside then
+      break
+    end
+
+    local append
+
+    local parens = inside:match("^%b{}", pos)
+    if parens then
+      pos = pos + #parens
+      append = sort_callback(parens)
+    else
+      local array = inside:match("^%b[]", pos)
+      if array then
+        pos = pos + #array
+        append = array
+      else
+        local front = inside:sub(pos, pos)
+        pos = pos + 1
+
+        if front == "," then
+          table.insert(parts, buffer)
+          buffer = ""
+        else
+          append = front
+        end
+      end
+    end
+
+    if append then
+      buffer = buffer .. append
+    end
+  end
+
+  if buffer ~= "" then
+    table.insert(parts, buffer)
+  end
+
+  table.sort(parts)
+
+  return "{" .. table.concat(parts, ",") .. "}"
+end
+
+local function sort_json(str)
+  return (str:gsub("%b{}", sort_callback))
+end
+
+
+return sort_json

From f8e36f87fc7d90be0612e8e53407f56e217fe49b Mon Sep 17 00:00:00 2001
From: "Yichun Zhang (agentzh)" <yichun@openresty.com>
Date: Thu, 9 Jul 2020 22:59:52 -0700
Subject: [PATCH 23/57] added -g by default.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2361028d..55c21427 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ LUA_VERSION =       5.1
 TARGET =            cjson.so
 PREFIX =            /usr/local
 #CFLAGS =            -g -Wall -pedantic -fno-inline
-CFLAGS =            -O3 -Wall -pedantic -DNDEBUG
+CFLAGS =            -O3 -Wall -pedantic -DNDEBUG -g
 CJSON_CFLAGS =      -fpic
 CJSON_LDFLAGS =     -shared
 LUA_INCLUDE_DIR ?=   $(PREFIX)/include

From 62fe2246ccb15139476e5a03648633ed69404250 Mon Sep 17 00:00:00 2001
From: leaf <leafot@gmail.com>
Date: Fri, 8 Jan 2021 12:35:06 -0800
Subject: [PATCH 24/57] Update CI (#68)

* update luarocks action
* apt-get update
* run tests on pull request as well
---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a2076f18..95138ed9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
 name: test
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:
@@ -29,7 +29,7 @@ jobs:
         luaVersion: ${{ matrix.luaVersion }}
         luaCompileFlags: CC=${{ matrix.cc }}
 
-    - uses: leafo/gh-actions-luarocks@v2
+    - uses: leafo/gh-actions-luarocks@master
 
     - name: runtests.sh
       env:
@@ -42,6 +42,7 @@ jobs:
         CC: ${{ matrix.cc }}
       run: |
         make PREFIX=.lua ${{ matrix.runtestArgs }}
+        sudo apt-get update
         sudo apt-get install -q valgrind libipc-run3-perl cppcheck cpanminus
         sudo cpanm --notest Test::Base Test::LongString
 

From 891962b11d6d3b1b7275550b5c109e16c73ac94f Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sat, 6 Feb 2021 13:34:49 -0800
Subject: [PATCH 25/57] bump version to 2.1.0.9

---
 lua-cjson-2.1.0.6-1.rockspec => lua-cjson-2.1.0.9-1.rockspec | 4 ++--
 lua_cjson.c                                                  | 2 +-
 tests/test.lua                                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename lua-cjson-2.1.0.6-1.rockspec => lua-cjson-2.1.0.9-1.rockspec (97%)

diff --git a/lua-cjson-2.1.0.6-1.rockspec b/lua-cjson-2.1.0.9-1.rockspec
similarity index 97%
rename from lua-cjson-2.1.0.6-1.rockspec
rename to lua-cjson-2.1.0.9-1.rockspec
index d6489f24..32a230ee 100644
--- a/lua-cjson-2.1.0.6-1.rockspec
+++ b/lua-cjson-2.1.0.9-1.rockspec
@@ -1,9 +1,9 @@
 package = "lua-cjson"
-version = "2.1.0.6-1"
+version = "2.1.0.9-1"
 
 source = {
     url = "git+https://github.com/openresty/lua-cjson",
-    tag = "2.1.0.6",
+    tag = "2.1.0.9",
 }
 
 description = {
diff --git a/lua_cjson.c b/lua_cjson.c
index 45ebe78b..0c41caba 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef CJSON_VERSION
-#define CJSON_VERSION   "2.1.0.6"
+#define CJSON_VERSION   "2.1.0.9"
 #endif
 
 #ifdef _MSC_VER
diff --git a/tests/test.lua b/tests/test.lua
index aeded765..605fc91c 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -93,7 +93,7 @@ local cjson_tests = {
     -- Test API variables
     { "Check module name, version",
       function () return json._NAME, json._VERSION end, { },
-      true, { "cjson", "2.1.0.6" } },
+      true, { "cjson", "2.1.0.9" } },
 
     -- Test decoding simple types
     { "Decode string",

From 4b350c531de3d71008c77ae94e59275b8371b4dc Mon Sep 17 00:00:00 2001
From: Johnny Wang <wangjiahao@openresty.com>
Date: Thu, 8 Jul 2021 22:35:09 +0800
Subject: [PATCH 26/57] travis-ci: remove clang compiler mode from travis to
 save credits. (#72)

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9d0a9779..b07f3dc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ language: c
 
 compiler:
   - gcc
-  - clang
 
 addons:
   apt:

From 3d93d297092172eac3d52a1b3b6c1d479da5341a Mon Sep 17 00:00:00 2001
From: ali-ghazi78 <39215015+ali-ghazi78@users.noreply.github.com>
Date: Thu, 23 Sep 2021 06:06:08 +0330
Subject: [PATCH 27/57] doc: minor tweak in README.md (#71)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ace23d11..4655a9ad 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ encode_escape_forward_slash
 
 **default:** true
 
-If enabled, forward slash '/' will be encoded as '\/'.
+If enabled, forward slash '/' will be encoded as '\\/'.
 
 If disabled, forward slash '/' will be encoded as '/' (no escape is applied).
 

From 8dadbca8c7c26fc38e23f1f685c285450acb783e Mon Sep 17 00:00:00 2001
From: Johnny Wang <wangjiahao@openresty.com>
Date: Mon, 18 Oct 2021 22:42:40 +0800
Subject: [PATCH 28/57] bugfix: fixed a possible division by zero bugs found by
 cppcheck. (#75)

---
 strbuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strbuf.c b/strbuf.c
index f0f7f4b9..ed133678 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -150,7 +150,7 @@ static int calculate_new_size(strbuf_t *s, int len)
         /* Exponential sizing */
         while (newsize < reqsize)
             newsize *= -s->increment;
-    } else {
+    } else if (s->increment != 0)  {
         /* Linear sizing */
         newsize = ((newsize + s->increment - 1) / s->increment) * s->increment;
     }

From f416d2675eb36e3dd2d2b3882058233327ea3c07 Mon Sep 17 00:00:00 2001
From: Johnny Wang <wangjiahao@openresty.com>
Date: Tue, 19 Oct 2021 18:06:49 +0800
Subject: [PATCH 29/57] bugfix: fixed bugs suspected by cppcheck: shift signed
 32-bit value by 31 bits and uninitialized variable. (#76)

[dtoa.c:2453] -> [dtoa.c:2454]: (warning) Shifting signed 32-bit value by 31 bits is undefined behaviour. See condition at line 2453.
[dtoa.c:2846]: (error) Uninitialized variable: bb
[dtoa.c:2847]: (error) Uninitialized variable: bd
[dtoa.c:2848]: (error) Uninitialized variable: bs
[dtoa.c:2850]: (error) Uninitialized variable: delta
---
 dtoa.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dtoa.c b/dtoa.c
index 56398ba7..4067e5be 100644
--- a/dtoa.c
+++ b/dtoa.c
@@ -2451,10 +2451,10 @@ bigcomp
 		if ((j = ((word0(rv) & Exp_mask) >> Exp_shift) - bc->scale) <= 0) {
 			i = 1 - j;
 			if (i <= 31) {
-				if (word1(rv) & (0x1 << i))
+				if (word1(rv) & (0x1U << i))
 					goto odd;
 				}
-			else if (word0(rv) & (0x1 << (i-32)))
+			else if (word0(rv) & (0x1U << (i-32)))
 				goto odd;
 			}
 		else if (word1(rv) & 1) {
@@ -2488,7 +2488,11 @@ fpconv_strtod
 	U aadj2, adj, rv, rv0;
 	ULong y, z;
 	BCinfo bc;
-	Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
+	Bigint *bb1, *bd0;
+	Bigint *bb = NULL;
+	Bigint *bd = NULL;
+	Bigint *bs = NULL;
+	Bigint *delta = NULL;
 #ifdef Avoid_Underflow
 	ULong Lsb, Lsb1;
 #endif

From 96e6e0ce67ed070a52223c1e9518c9018b1ce376 Mon Sep 17 00:00:00 2001
From: Johnny Wang <wangjiahao@openresty.com>
Date: Fri, 10 Dec 2021 20:19:58 +0800
Subject: [PATCH 30/57] bumped version to 2.1.0.10. (#79)

---
 lua-cjson-2.1.0.9-1.rockspec => lua-cjson-2.1.0.10-1.rockspec | 4 ++--
 lua_cjson.c                                                   | 2 +-
 tests/test.lua                                                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename lua-cjson-2.1.0.9-1.rockspec => lua-cjson-2.1.0.10-1.rockspec (97%)

diff --git a/lua-cjson-2.1.0.9-1.rockspec b/lua-cjson-2.1.0.10-1.rockspec
similarity index 97%
rename from lua-cjson-2.1.0.9-1.rockspec
rename to lua-cjson-2.1.0.10-1.rockspec
index 32a230ee..2c2458a7 100644
--- a/lua-cjson-2.1.0.9-1.rockspec
+++ b/lua-cjson-2.1.0.10-1.rockspec
@@ -1,9 +1,9 @@
 package = "lua-cjson"
-version = "2.1.0.9-1"
+version = "2.1.0.10-1"
 
 source = {
     url = "git+https://github.com/openresty/lua-cjson",
-    tag = "2.1.0.9",
+    tag = "2.1.0.10",
 }
 
 description = {
diff --git a/lua_cjson.c b/lua_cjson.c
index 0c41caba..ff61c474 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef CJSON_VERSION
-#define CJSON_VERSION   "2.1.0.9"
+#define CJSON_VERSION   "2.1.0.10"
 #endif
 
 #ifdef _MSC_VER
diff --git a/tests/test.lua b/tests/test.lua
index 605fc91c..7e523a3f 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -93,7 +93,7 @@ local cjson_tests = {
     -- Test API variables
     { "Check module name, version",
       function () return json._NAME, json._VERSION end, { },
-      true, { "cjson", "2.1.0.9" } },
+      true, { "cjson", "2.1.0.10" } },
 
     -- Test decoding simple types
     { "Decode string",

From 0f3dda34a35d93b92aba39a6c7b30d1d23918812 Mon Sep 17 00:00:00 2001
From: momoterraw <andrewvmail@gmail.com>
Date: Mon, 25 Oct 2021 22:39:52 -0700
Subject: [PATCH 31/57] bugfix: windows luarocks make doesn't export
 cjson.safe.

---
 lua-cjson-2.1.0.10-1.rockspec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua-cjson-2.1.0.10-1.rockspec b/lua-cjson-2.1.0.10-1.rockspec
index 2c2458a7..61608d9c 100644
--- a/lua-cjson-2.1.0.10-1.rockspec
+++ b/lua-cjson-2.1.0.10-1.rockspec
@@ -34,6 +34,9 @@ build = {
 -- Uncomment the line below on Solaris platforms if required.
 --                "USE_INTERNAL_ISINF"
             }
+        },
+        ["cjson.safe"] = {
+            sources = { "lua_cjson.c", "strbuf.c", "fpconv.c" }
         }
     },
     install = {

From 92cebdcc374a7bb4bf59e1186076433e45cc1138 Mon Sep 17 00:00:00 2001
From: Datong Sun <dndx@idndx.com>
Date: Thu, 13 Jan 2022 08:47:48 +0800
Subject: [PATCH 32/57] bugfix: empty_array can not work on Apple because csjon
 did not compare light userdata address with masked address (#82)

Since we used `json_lightudata_mask` when creating lightuserdata, same
mask should be applied when comparing the return of `touserdata`

Fixes #81.
---
 lua_cjson.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua_cjson.c b/lua_cjson.c
index ff61c474..df1794b6 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -800,7 +800,7 @@ static void json_append_data(lua_State *l, json_config_t *cfg,
     case LUA_TLIGHTUSERDATA:
         if (lua_touserdata(l, -1) == NULL) {
             strbuf_append_mem(json, "null", 4);
-        } else if (lua_touserdata(l, -1) == &json_array) {
+        } else if (lua_touserdata(l, -1) == json_lightudata_mask(&json_array)) {
             json_append_array(l, cfg, current_depth, json, 0);
         }
         break;

From 91c3363e7dc86263a379719e5508fc0979df84d3 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Mon, 17 Oct 2022 13:06:57 -0700
Subject: [PATCH 33/57] add lua 5.4 to test suite

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 95138ed9..74fdf1f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         cc: ["gcc", "clang"]
-        luaVersion: ["5.1", "5.2", "5.3", "luajit", "luajit-openresty"]
+        luaVersion: ["5.1", "5.2", "5.3", "5.4", "luajit", "luajit-openresty"]
         include:
           - luaVersion: "luajit"
             runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"

From 6f38a95a2d44ad3bd4cc49e14224296239da7412 Mon Sep 17 00:00:00 2001
From: Johnny Wang <wangjiahao@openresty.com>
Date: Thu, 19 Jan 2023 15:33:23 +0800
Subject: [PATCH 34/57] bumped version to 2.1.0.11. (#86)

---
 lua-cjson-2.1.0.10-1.rockspec | 4 ++--
 lua_cjson.c                   | 2 +-
 tests/test.lua                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua-cjson-2.1.0.10-1.rockspec b/lua-cjson-2.1.0.10-1.rockspec
index 61608d9c..9ed4272e 100644
--- a/lua-cjson-2.1.0.10-1.rockspec
+++ b/lua-cjson-2.1.0.10-1.rockspec
@@ -1,9 +1,9 @@
 package = "lua-cjson"
-version = "2.1.0.10-1"
+version = "2.1.0.11-1"
 
 source = {
     url = "git+https://github.com/openresty/lua-cjson",
-    tag = "2.1.0.10",
+    tag = "2.1.0.11",
 }
 
 description = {
diff --git a/lua_cjson.c b/lua_cjson.c
index df1794b6..94b0b467 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef CJSON_VERSION
-#define CJSON_VERSION   "2.1.0.10"
+#define CJSON_VERSION   "2.1.0.11"
 #endif
 
 #ifdef _MSC_VER
diff --git a/tests/test.lua b/tests/test.lua
index 7e523a3f..cf7a54a2 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -93,7 +93,7 @@ local cjson_tests = {
     -- Test API variables
     { "Check module name, version",
       function () return json._NAME, json._VERSION end, { },
-      true, { "cjson", "2.1.0.10" } },
+      true, { "cjson", "2.1.0.11" } },
 
     -- Test decoding simple types
     { "Decode string",

From 1dff61d9bf390372124c13443e0131a96383f5bc Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Wed, 22 Feb 2023 09:04:28 +0800
Subject: [PATCH 35/57] optimization: add void to functions with no arguments
 to prevent compiler warning.

---
 fpconv.c | 4 ++--
 fpconv.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fpconv.c b/fpconv.c
index 3e480ece..0ef7f18c 100644
--- a/fpconv.c
+++ b/fpconv.c
@@ -55,7 +55,7 @@ static char locale_decimal_point = '.';
  * localconv() may not be thread safe (=>crash), and nl_langinfo() is
  * not supported on some platforms. Use sprintf() instead - if the
  * locale does change, at least Lua CJSON won't crash. */
-static void fpconv_update_locale()
+static void fpconv_update_locale(void)
 {
     char buf[8];
 
@@ -202,7 +202,7 @@ int fpconv_g_fmt(char *str, double num, int precision)
     return len;
 }
 
-void fpconv_init()
+void fpconv_init(void)
 {
     fpconv_update_locale();
 }
diff --git a/fpconv.h b/fpconv.h
index 7b0d0ee3..59e08675 100644
--- a/fpconv.h
+++ b/fpconv.h
@@ -7,12 +7,12 @@
 # define FPCONV_G_FMT_BUFSIZE   32
 
 #ifdef USE_INTERNAL_FPCONV
-static inline void fpconv_init()
+static inline void fpconv_init(void)
 {
     /* Do nothing - not required */
 }
 #else
-extern void fpconv_init();
+extern void fpconv_init(void);
 #endif
 
 extern int fpconv_g_fmt(char*, double, int);

From de93a78d3002ee72bb1c7e3a629d67e19623a4ae Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Wed, 22 Feb 2023 11:28:15 +0800
Subject: [PATCH 36/57] feature: Add option to skip invalid value types.

Co-authored-by: Jesper Lundgren <jesperlundgren@exosite.com>
---
 .travis.yml                                   |  4 +-
 ....rockspec => lua-cjson-2.1.0.11-1.rockspec |  0
 lua_cjson.c                                   | 59 ++++++++++++++-----
 strbuf.h                                      |  6 ++
 tests/agentzh.t                               | 26 ++++++++
 5 files changed, 79 insertions(+), 16 deletions(-)
 rename lua-cjson-2.1.0.10-1.rockspec => lua-cjson-2.1.0.11-1.rockspec (100%)

diff --git a/.travis.yml b/.travis.yml
index b07f3dc8..91f73ff9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,8 @@ install:
     - cd ..
 
 script:
-  - cppcheck -i ./luajit2 -i --force --error-exitcode=1 --enable=warning . > build.log 2>&1 || (cat build.log && exit 1)
-  - sh runtests.sh
+  - cppcheck -i ./luajit2 --force --error-exitcode=1 --enable=warning . > build.log 2>&1 || (cat build.log && exit 1)
+  - bash runtests.sh
   - make
   - prove -Itests tests
   - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
diff --git a/lua-cjson-2.1.0.10-1.rockspec b/lua-cjson-2.1.0.11-1.rockspec
similarity index 100%
rename from lua-cjson-2.1.0.10-1.rockspec
rename to lua-cjson-2.1.0.11-1.rockspec
diff --git a/lua_cjson.c b/lua_cjson.c
index 94b0b467..42672de3 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -82,6 +82,7 @@
 #define DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT 1
 #define DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT 0
 #define DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH 1
+#define DEFAULT_ENCODE_SKIP_UNSUPPORTED_VALUE_TYPES 0
 
 #ifdef DISABLE_INVALID_NUMBERS
 #undef DEFAULT_DECODE_INVALID_NUMBERS
@@ -165,6 +166,7 @@ typedef struct {
     int decode_invalid_numbers;
     int decode_max_depth;
     int decode_array_with_array_mt;
+    int encode_skip_unsupported_value_types;
 } json_config_t;
 
 typedef struct {
@@ -356,6 +358,16 @@ static int json_cfg_decode_array_with_array_mt(lua_State *l)
     return 1;
 }
 
+/* Configure how to treat invalid types */
+static int json_cfg_encode_skip_unsupported_value_types(lua_State *l)
+{
+    json_config_t *cfg = json_arg_init(l, 1);
+
+    json_enum_option(l, 1, &cfg->encode_skip_unsupported_value_types, NULL, 1);
+
+    return 1;
+}
+
 /* Configures JSON encoding buffer persistence */
 static int json_cfg_encode_keep_buffer(lua_State *l)
 {
@@ -463,6 +475,7 @@ static void json_create_config(lua_State *l)
     cfg->encode_empty_table_as_object = DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT;
     cfg->decode_array_with_array_mt = DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT;
     cfg->encode_escape_forward_slash = DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH;
+    cfg->encode_skip_unsupported_value_types = DEFAULT_ENCODE_SKIP_UNSUPPORTED_VALUE_TYPES;
 
 #if DEFAULT_ENCODE_KEEP_BUFFER > 0
     strbuf_init(&cfg->encode_buf, 0);
@@ -627,7 +640,7 @@ static void json_check_encode_depth(lua_State *l, json_config_t *cfg,
                current_depth);
 }
 
-static void json_append_data(lua_State *l, json_config_t *cfg,
+static int json_append_data(lua_State *l, json_config_t *cfg,
                              int current_depth, strbuf_t *json);
 
 /* json_append_array args:
@@ -637,19 +650,24 @@ static void json_append_data(lua_State *l, json_config_t *cfg,
 static void json_append_array(lua_State *l, json_config_t *cfg, int current_depth,
                               strbuf_t *json, int array_length)
 {
-    int comma, i;
+    int comma, i, json_pos, err;
 
     strbuf_append_char(json, '[');
 
     comma = 0;
     for (i = 1; i <= array_length; i++) {
-        if (comma)
+        json_pos = strbuf_length(json);
+        if (comma++ > 0)
             strbuf_append_char(json, ',');
-        else
-            comma = 1;
 
         lua_rawgeti(l, -1, i);
-        json_append_data(l, cfg, current_depth, json);
+        err = json_append_data(l, cfg, current_depth, json);
+        if (err) {
+            strbuf_set_length(json, json_pos);
+            if (comma == 1) {
+                comma = 0;
+            }
+        }
         lua_pop(l, 1);
     }
 
@@ -697,7 +715,7 @@ static void json_append_number(lua_State *l, json_config_t *cfg,
 static void json_append_object(lua_State *l, json_config_t *cfg,
                                int current_depth, strbuf_t *json)
 {
-    int comma, keytype;
+    int comma, keytype, json_pos, err;
 
     /* Object */
     strbuf_append_char(json, '{');
@@ -706,10 +724,9 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
     /* table, startkey */
     comma = 0;
     while (lua_next(l, -2) != 0) {
-        if (comma)
+        json_pos = strbuf_length(json);
+        if (comma++ > 0)
             strbuf_append_char(json, ',');
-        else
-            comma = 1;
 
         /* table, key, value */
         keytype = lua_type(l, -2);
@@ -727,7 +744,14 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
         }
 
         /* table, key, value */
-        json_append_data(l, cfg, current_depth, json);
+        err = json_append_data(l, cfg, current_depth, json);
+        if (err) {
+            strbuf_set_length(json, json_pos);
+            if (comma == 1) {
+                comma = 0;
+            }
+        }
+
         lua_pop(l, 1);
         /* table, key */
     }
@@ -735,8 +759,8 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
     strbuf_append_char(json, '}');
 }
 
-/* Serialise Lua data into JSON string. */
-static void json_append_data(lua_State *l, json_config_t *cfg,
+/* Serialise Lua data into JSON string. Return 1 if error an error happened, else 0 */
+static int json_append_data(lua_State *l, json_config_t *cfg,
                              int current_depth, strbuf_t *json)
 {
     int len;
@@ -807,9 +831,15 @@ static void json_append_data(lua_State *l, json_config_t *cfg,
     default:
         /* Remaining types (LUA_TFUNCTION, LUA_TUSERDATA, LUA_TTHREAD,
          * and LUA_TLIGHTUSERDATA) cannot be serialised */
-        json_encode_exception(l, cfg, json, -1, "type not supported");
+        if (cfg->encode_skip_unsupported_value_types) {
+            return 1;
+        } else {
+            json_encode_exception(l, cfg, json, -1, "type not supported");
+        }
+
         /* never returns */
     }
+    return 0;
 }
 
 static int json_encode(lua_State *l)
@@ -1479,6 +1509,7 @@ static int lua_cjson_new(lua_State *l)
         { "encode_invalid_numbers", json_cfg_encode_invalid_numbers },
         { "decode_invalid_numbers", json_cfg_decode_invalid_numbers },
         { "encode_escape_forward_slash", json_cfg_encode_escape_forward_slash },
+        { "encode_skip_unsupported_value_types", json_cfg_encode_skip_unsupported_value_types },
         { "new", lua_cjson_new },
         { NULL, NULL }
     };
diff --git a/strbuf.h b/strbuf.h
index 5df0b7be..a98ee220 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -70,6 +70,7 @@ static char *strbuf_string(strbuf_t *s, int *len);
 static void strbuf_ensure_empty_length(strbuf_t *s, int len);
 static char *strbuf_empty_ptr(strbuf_t *s);
 static void strbuf_extend_length(strbuf_t *s, int len);
+static void strbuf_set_length(strbuf_t *s, int len);
 
 /* Update */
 extern void strbuf_append_fmt(strbuf_t *s, int len, const char *fmt, ...);
@@ -108,6 +109,11 @@ static inline char *strbuf_empty_ptr(strbuf_t *s)
     return s->buf + s->length;
 }
 
+static inline void strbuf_set_length(strbuf_t *s, int len)
+{
+    s->length = len;
+}
+
 static inline void strbuf_extend_length(strbuf_t *s, int len)
 {
     s->length += len;
diff --git a/tests/agentzh.t b/tests/agentzh.t
index 2e7c8cec..552630ab 100644
--- a/tests/agentzh.t
+++ b/tests/agentzh.t
@@ -306,3 +306,29 @@ print(b)
 {"test":"http:\/\/google.com\/google"}
 {"test":"http://google.com/google"}
 {"test":"http:\/\/google.com\/google"}
+
+
+
+=== TEST 22: disable error on invalid type
+--- lua
+local cjson = require "cjson"
+local f = function (x) return 2*x end
+local res, err = pcall(cjson.encode, f)
+print(err)
+local t = {f = f, valid = "valid"}
+local res, err = pcall(cjson.encode, t)
+print(err)
+local arr = {"one", "two", f, "three"}
+local res, err = pcall(cjson.encode, arr)
+print(err)
+cjson.encode_skip_unsupported_value_types(true)
+print(cjson.encode(f))
+print(cjson.encode(t))
+print(cjson.encode(arr))
+--- out
+Cannot serialise function: type not supported
+Cannot serialise function: type not supported
+Cannot serialise function: type not supported
+
+{"valid":"valid"}
+["one","two","three"]

From 41eee7406b0f048392168515b09e7d8bdd000624 Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Wed, 22 Feb 2023 21:34:30 +0800
Subject: [PATCH 37/57] Add updated netlib dtoa.c from
 https://netlib.sandia.gov/fp/dtoa.c

Co-authored-by: Jesper Lundgren <jesperlundgren@exosite.com>
---
 .travis.yml    |   10 +-
 CMakeLists.txt |    2 +-
 dtoa.c         | 2903 +++++++++++++++++++++++++++++++++++++++---------
 dtoa_config.h  |    6 +-
 fpconv.h       |   12 +-
 runtests.sh    |   10 +
 6 files changed, 2409 insertions(+), 534 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91f73ff9..091ff98b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: Focal
 
 os: linux
 
@@ -17,6 +17,7 @@ addons:
     - libipc-run3-perl
     - lua5.1
     - lua5.1-dev
+    - cmake
 
 cache:
   apt: true
@@ -30,6 +31,7 @@ env:
       - LUAJIT=1 LUA_DIR=/usr/local LUA_INCLUDE_DIR=$LUA_DIR/include/luajit-2.1 LUA_SUFFIX=--lua-suffix=jit
 
 install:
+    - sudo ln -s /usr/bin/cmake /usr/local/bin/cmake
     - if [ -n "$LUAJIT" ]; then git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git; fi
     - if [ -n "$LUAJIT" ]; then cd ./luajit2; fi
     - if [ -n "$LUAJIT" ]; then make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1); fi
@@ -53,3 +55,9 @@ script:
   - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
   - cat build.log
   - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit $e; fi
+  - cmake -DUSE_INTERNAL_FPCONV=1 .
+  - make
+  - prove -Itests tests
+  - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
+  - cat build.log
+  - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit $e; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1d670d4..f7eaf898 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #       Windows: set LUA_DIR=c:\lua51
 
 project(lua-cjson C)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 
 option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance")
 option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON)
diff --git a/dtoa.c b/dtoa.c
index 4067e5be..8dac7b8d 100644
--- a/dtoa.c
+++ b/dtoa.c
@@ -32,6 +32,7 @@
  */
 
 /* strtod for IEEE-, VAX-, and IBM-arithmetic machines.
+ * (Note that IEEE arithmetic is disabled by gcc's -ffast-math flag.)
  *
  * This strtod returns a nearest machine number to the input decimal
  * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are
@@ -102,7 +103,6 @@
  *	something other than "long long", #define Llong to be the name,
  *	and if "unsigned Llong" does not work as an unsigned version of
  *	Llong, #define #ULLong to be the corresponding unsigned type.
- * #define KR_headers for old-style C function headers.
  * #define Bad_float_h if your system lacks a float.h or if it does not
  *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
  *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
@@ -152,6 +152,25 @@
  *	probability of wasting memory, but would otherwise be harmless.)
  *	You must also invoke freedtoa(s) to free the value s returned by
  *	dtoa.  You may do so whether or not MULTIPLE_THREADS is #defined.
+
+ *	When MULTIPLE_THREADS is #defined, this source file provides
+ *		void set_max_dtoa_threads(unsigned int n);
+ *	and expects
+ *		unsigned int dtoa_get_threadno(void);
+ *	to be available (possibly provided by
+ *		#define dtoa_get_threadno omp_get_thread_num
+ *	if OpenMP is in use or by
+ *		#define dtoa_get_threadno pthread_self
+ *	if Pthreads is in use), to return the current thread number.
+ *	If set_max_dtoa_threads(n) was called and the current thread
+ *	number is k with k < n, then calls on ACQUIRE_DTOA_LOCK(...) and
+ *	FREE_DTOA_LOCK(...) are avoided; instead each thread with thread
+ *	number < n has a separate copy of relevant data structures.
+ *	After set_max_dtoa_threads(n), a call set_max_dtoa_threads(m)
+ *	with m <= n has has no effect, but a call with m > n is honored.
+ *	Such a call invokes REALLOC (assumed to be "realloc" if REALLOC
+ *	is not #defined) to extend the size of the relevant array.
+
  * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that
  *	avoids underflows on inputs whose result does not underflow.
  *	If you #define NO_IEEE_Scale on a machine that uses IEEE-format
@@ -175,6 +194,11 @@
  *	inexact or when it is a numeric value rounded to +-infinity).
  * #define NO_ERRNO if strtod should not assign errno = ERANGE when
  *	the result overflows to +-Infinity or underflows to 0.
+ *	When errno should be assigned, under seemingly rare conditions
+ *	it may be necessary to define Set_errno(x) suitably, e.g., in
+ *	a local errno.h, such as
+ *		#include <errno.h>
+ *		#define Set_errno(x) _set_errno(x)
  * #define NO_HEX_FP to omit recognition of hexadecimal floating-point
  *	values by strtod.
  * #define NO_STRTOD_BIGCOMP (on IEEE-arithmetic systems only for now)
@@ -188,15 +212,21 @@
 #include "dtoa_config.h"
 
 #ifndef Long
-#define Long long
+#define Long int
 #endif
 #ifndef ULong
 typedef unsigned Long ULong;
 #endif
 
 #ifdef DEBUG
+#include <assert.h>
 #include "stdio.h"
 #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
+#define Debug(x) x
+int dtoa_stats[7]; /* strtod_{64,96,bigcomp},dtoa_{exact,64,96,bigcomp} */
+#else
+#define assert(x) /*nothing*/
+#define Debug(x) /*nothing*/
 #endif
 
 #include "stdlib.h"
@@ -212,16 +242,29 @@ typedef unsigned Long ULong;
 #endif
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 #ifdef MALLOC
-#ifdef KR_headers
-extern char *MALLOC();
-#else
 extern void *MALLOC(size_t);
-#endif
 #else
 #define MALLOC malloc
 #endif
 
+#ifdef REALLOC
+extern void *REALLOC(void*,size_t);
+#else
+#define REALLOC realloc
+#endif
+
+#ifndef FREE
+#define FREE free
+#endif
+
+#ifdef __cplusplus
+	}
+#endif
+
 #ifndef Omit_Private_Memory
 #ifndef PRIVATE_MEM
 #define PRIVATE_MEM 2304
@@ -251,6 +294,15 @@ static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
 
 #include "errno.h"
 
+#ifdef NO_ERRNO /*{*/
+#undef Set_errno
+#define Set_errno(x)
+#else
+#ifndef Set_errno
+#define Set_errno(x) errno = x
+#endif
+#endif /*}*/
+
 #ifdef Bad_float_h
 
 #ifdef IEEE_Arith
@@ -292,19 +344,966 @@ static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
 extern "C" {
 #endif
 
-#ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
-#define CONST const
-#endif
-#endif
-
 #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
 Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
 #endif
 
-typedef union { double d; ULong L[2]; } U;
+#undef USE_BF96
+
+#ifdef NO_LONG_LONG /*{{*/
+#undef ULLong
+#ifdef Just_16
+#undef Pack_32
+/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.
+ * This makes some inner loops simpler and sometimes saves work
+ * during multiplications, but it often seems to make things slightly
+ * slower.  Hence the default is now to store 32 bits per Long.
+ */
+#endif
+#else	/*}{ long long available */
+#ifndef Llong
+#define Llong long long
+#endif
+#ifndef ULLong
+#define ULLong unsigned Llong
+#endif
+#ifndef NO_BF96 /*{*/
+#define USE_BF96
+
+#ifdef SET_INEXACT
+#define dtoa_divmax 27
+#else
+int dtoa_divmax = 2;	/* Permit experimenting: on some systems, 64-bit integer */
+			/* division is slow enough that we may sometimes want to */
+			/* avoid using it.   We assume (but do not check) that   */
+			/* dtoa_divmax <= 27.*/
+#endif
+
+typedef struct BF96 {		/* Normalized 96-bit software floating point numbers */
+	unsigned int b0,b1,b2;	/* b0 = most significant, binary point just to its left */
+	int e;			/* number represented = b * 2^e, with .5 <= b < 1 */
+	} BF96;
+
+ static BF96 pten[667] = {
+	{ 0xeef453d6, 0x923bd65a, 0x113faa29, -1136 },
+	{ 0x9558b466, 0x1b6565f8, 0x4ac7ca59, -1132 },
+	{ 0xbaaee17f, 0xa23ebf76, 0x5d79bcf0, -1129 },
+	{ 0xe95a99df, 0x8ace6f53, 0xf4d82c2c, -1126 },
+	{ 0x91d8a02b, 0xb6c10594, 0x79071b9b, -1122 },
+	{ 0xb64ec836, 0xa47146f9, 0x9748e282, -1119 },
+	{ 0xe3e27a44, 0x4d8d98b7, 0xfd1b1b23, -1116 },
+	{ 0x8e6d8c6a, 0xb0787f72, 0xfe30f0f5, -1112 },
+	{ 0xb208ef85, 0x5c969f4f, 0xbdbd2d33, -1109 },
+	{ 0xde8b2b66, 0xb3bc4723, 0xad2c7880, -1106 },
+	{ 0x8b16fb20, 0x3055ac76, 0x4c3bcb50, -1102 },
+	{ 0xaddcb9e8, 0x3c6b1793, 0xdf4abe24, -1099 },
+	{ 0xd953e862, 0x4b85dd78, 0xd71d6dad, -1096 },
+	{ 0x87d4713d, 0x6f33aa6b, 0x8672648c, -1092 },
+	{ 0xa9c98d8c, 0xcb009506, 0x680efdaf, -1089 },
+	{ 0xd43bf0ef, 0xfdc0ba48, 0x0212bd1b, -1086 },
+	{ 0x84a57695, 0xfe98746d, 0x014bb630, -1082 },
+	{ 0xa5ced43b, 0x7e3e9188, 0x419ea3bd, -1079 },
+	{ 0xcf42894a, 0x5dce35ea, 0x52064cac, -1076 },
+	{ 0x818995ce, 0x7aa0e1b2, 0x7343efeb, -1072 },
+	{ 0xa1ebfb42, 0x19491a1f, 0x1014ebe6, -1069 },
+	{ 0xca66fa12, 0x9f9b60a6, 0xd41a26e0, -1066 },
+	{ 0xfd00b897, 0x478238d0, 0x8920b098, -1063 },
+	{ 0x9e20735e, 0x8cb16382, 0x55b46e5f, -1059 },
+	{ 0xc5a89036, 0x2fddbc62, 0xeb2189f7, -1056 },
+	{ 0xf712b443, 0xbbd52b7b, 0xa5e9ec75, -1053 },
+	{ 0x9a6bb0aa, 0x55653b2d, 0x47b233c9, -1049 },
+	{ 0xc1069cd4, 0xeabe89f8, 0x999ec0bb, -1046 },
+	{ 0xf148440a, 0x256e2c76, 0xc00670ea, -1043 },
+	{ 0x96cd2a86, 0x5764dbca, 0x38040692, -1039 },
+	{ 0xbc807527, 0xed3e12bc, 0xc6050837, -1036 },
+	{ 0xeba09271, 0xe88d976b, 0xf7864a44, -1033 },
+	{ 0x93445b87, 0x31587ea3, 0x7ab3ee6a, -1029 },
+	{ 0xb8157268, 0xfdae9e4c, 0x5960ea05, -1026 },
+	{ 0xe61acf03, 0x3d1a45df, 0x6fb92487, -1023 },
+	{ 0x8fd0c162, 0x06306bab, 0xa5d3b6d4, -1019 },
+	{ 0xb3c4f1ba, 0x87bc8696, 0x8f48a489, -1016 },
+	{ 0xe0b62e29, 0x29aba83c, 0x331acdab, -1013 },
+	{ 0x8c71dcd9, 0xba0b4925, 0x9ff0c08b, -1009 },
+	{ 0xaf8e5410, 0x288e1b6f, 0x07ecf0ae, -1006 },
+	{ 0xdb71e914, 0x32b1a24a, 0xc9e82cd9, -1003 },
+	{ 0x892731ac, 0x9faf056e, 0xbe311c08,  -999 },
+	{ 0xab70fe17, 0xc79ac6ca, 0x6dbd630a,  -996 },
+	{ 0xd64d3d9d, 0xb981787d, 0x092cbbcc,  -993 },
+	{ 0x85f04682, 0x93f0eb4e, 0x25bbf560,  -989 },
+	{ 0xa76c5823, 0x38ed2621, 0xaf2af2b8,  -986 },
+	{ 0xd1476e2c, 0x07286faa, 0x1af5af66,  -983 },
+	{ 0x82cca4db, 0x847945ca, 0x50d98d9f,  -979 },
+	{ 0xa37fce12, 0x6597973c, 0xe50ff107,  -976 },
+	{ 0xcc5fc196, 0xfefd7d0c, 0x1e53ed49,  -973 },
+	{ 0xff77b1fc, 0xbebcdc4f, 0x25e8e89c,  -970 },
+	{ 0x9faacf3d, 0xf73609b1, 0x77b19161,  -966 },
+	{ 0xc795830d, 0x75038c1d, 0xd59df5b9,  -963 },
+	{ 0xf97ae3d0, 0xd2446f25, 0x4b057328,  -960 },
+	{ 0x9becce62, 0x836ac577, 0x4ee367f9,  -956 },
+	{ 0xc2e801fb, 0x244576d5, 0x229c41f7,  -953 },
+	{ 0xf3a20279, 0xed56d48a, 0x6b435275,  -950 },
+	{ 0x9845418c, 0x345644d6, 0x830a1389,  -946 },
+	{ 0xbe5691ef, 0x416bd60c, 0x23cc986b,  -943 },
+	{ 0xedec366b, 0x11c6cb8f, 0x2cbfbe86,  -940 },
+	{ 0x94b3a202, 0xeb1c3f39, 0x7bf7d714,  -936 },
+	{ 0xb9e08a83, 0xa5e34f07, 0xdaf5ccd9,  -933 },
+	{ 0xe858ad24, 0x8f5c22c9, 0xd1b3400f,  -930 },
+	{ 0x91376c36, 0xd99995be, 0x23100809,  -926 },
+	{ 0xb5854744, 0x8ffffb2d, 0xabd40a0c,  -923 },
+	{ 0xe2e69915, 0xb3fff9f9, 0x16c90c8f,  -920 },
+	{ 0x8dd01fad, 0x907ffc3b, 0xae3da7d9,  -916 },
+	{ 0xb1442798, 0xf49ffb4a, 0x99cd11cf,  -913 },
+	{ 0xdd95317f, 0x31c7fa1d, 0x40405643,  -910 },
+	{ 0x8a7d3eef, 0x7f1cfc52, 0x482835ea,  -906 },
+	{ 0xad1c8eab, 0x5ee43b66, 0xda324365,  -903 },
+	{ 0xd863b256, 0x369d4a40, 0x90bed43e,  -900 },
+	{ 0x873e4f75, 0xe2224e68, 0x5a7744a6,  -896 },
+	{ 0xa90de353, 0x5aaae202, 0x711515d0,  -893 },
+	{ 0xd3515c28, 0x31559a83, 0x0d5a5b44,  -890 },
+	{ 0x8412d999, 0x1ed58091, 0xe858790a,  -886 },
+	{ 0xa5178fff, 0x668ae0b6, 0x626e974d,  -883 },
+	{ 0xce5d73ff, 0x402d98e3, 0xfb0a3d21,  -880 },
+	{ 0x80fa687f, 0x881c7f8e, 0x7ce66634,  -876 },
+	{ 0xa139029f, 0x6a239f72, 0x1c1fffc1,  -873 },
+	{ 0xc9874347, 0x44ac874e, 0xa327ffb2,  -870 },
+	{ 0xfbe91419, 0x15d7a922, 0x4bf1ff9f,  -867 },
+	{ 0x9d71ac8f, 0xada6c9b5, 0x6f773fc3,  -863 },
+	{ 0xc4ce17b3, 0x99107c22, 0xcb550fb4,  -860 },
+	{ 0xf6019da0, 0x7f549b2b, 0x7e2a53a1,  -857 },
+	{ 0x99c10284, 0x4f94e0fb, 0x2eda7444,  -853 },
+	{ 0xc0314325, 0x637a1939, 0xfa911155,  -850 },
+	{ 0xf03d93ee, 0xbc589f88, 0x793555ab,  -847 },
+	{ 0x96267c75, 0x35b763b5, 0x4bc1558b,  -843 },
+	{ 0xbbb01b92, 0x83253ca2, 0x9eb1aaed,  -840 },
+	{ 0xea9c2277, 0x23ee8bcb, 0x465e15a9,  -837 },
+	{ 0x92a1958a, 0x7675175f, 0x0bfacd89,  -833 },
+	{ 0xb749faed, 0x14125d36, 0xcef980ec,  -830 },
+	{ 0xe51c79a8, 0x5916f484, 0x82b7e127,  -827 },
+	{ 0x8f31cc09, 0x37ae58d2, 0xd1b2ecb8,  -823 },
+	{ 0xb2fe3f0b, 0x8599ef07, 0x861fa7e6,  -820 },
+	{ 0xdfbdcece, 0x67006ac9, 0x67a791e0,  -817 },
+	{ 0x8bd6a141, 0x006042bd, 0xe0c8bb2c,  -813 },
+	{ 0xaecc4991, 0x4078536d, 0x58fae9f7,  -810 },
+	{ 0xda7f5bf5, 0x90966848, 0xaf39a475,  -807 },
+	{ 0x888f9979, 0x7a5e012d, 0x6d8406c9,  -803 },
+	{ 0xaab37fd7, 0xd8f58178, 0xc8e5087b,  -800 },
+	{ 0xd5605fcd, 0xcf32e1d6, 0xfb1e4a9a,  -797 },
+	{ 0x855c3be0, 0xa17fcd26, 0x5cf2eea0,  -793 },
+	{ 0xa6b34ad8, 0xc9dfc06f, 0xf42faa48,  -790 },
+	{ 0xd0601d8e, 0xfc57b08b, 0xf13b94da,  -787 },
+	{ 0x823c1279, 0x5db6ce57, 0x76c53d08,  -783 },
+	{ 0xa2cb1717, 0xb52481ed, 0x54768c4b,  -780 },
+	{ 0xcb7ddcdd, 0xa26da268, 0xa9942f5d,  -777 },
+	{ 0xfe5d5415, 0x0b090b02, 0xd3f93b35,  -774 },
+	{ 0x9efa548d, 0x26e5a6e1, 0xc47bc501,  -770 },
+	{ 0xc6b8e9b0, 0x709f109a, 0x359ab641,  -767 },
+	{ 0xf867241c, 0x8cc6d4c0, 0xc30163d2,  -764 },
+	{ 0x9b407691, 0xd7fc44f8, 0x79e0de63,  -760 },
+	{ 0xc2109436, 0x4dfb5636, 0x985915fc,  -757 },
+	{ 0xf294b943, 0xe17a2bc4, 0x3e6f5b7b,  -754 },
+	{ 0x979cf3ca, 0x6cec5b5a, 0xa705992c,  -750 },
+	{ 0xbd8430bd, 0x08277231, 0x50c6ff78,  -747 },
+	{ 0xece53cec, 0x4a314ebd, 0xa4f8bf56,  -744 },
+	{ 0x940f4613, 0xae5ed136, 0x871b7795,  -740 },
+	{ 0xb9131798, 0x99f68584, 0x28e2557b,  -737 },
+	{ 0xe757dd7e, 0xc07426e5, 0x331aeada,  -734 },
+	{ 0x9096ea6f, 0x3848984f, 0x3ff0d2c8,  -730 },
+	{ 0xb4bca50b, 0x065abe63, 0x0fed077a,  -727 },
+	{ 0xe1ebce4d, 0xc7f16dfb, 0xd3e84959,  -724 },
+	{ 0x8d3360f0, 0x9cf6e4bd, 0x64712dd7,  -720 },
+	{ 0xb080392c, 0xc4349dec, 0xbd8d794d,  -717 },
+	{ 0xdca04777, 0xf541c567, 0xecf0d7a0,  -714 },
+	{ 0x89e42caa, 0xf9491b60, 0xf41686c4,  -710 },
+	{ 0xac5d37d5, 0xb79b6239, 0x311c2875,  -707 },
+	{ 0xd77485cb, 0x25823ac7, 0x7d633293,  -704 },
+	{ 0x86a8d39e, 0xf77164bc, 0xae5dff9c,  -700 },
+	{ 0xa8530886, 0xb54dbdeb, 0xd9f57f83,  -697 },
+	{ 0xd267caa8, 0x62a12d66, 0xd072df63,  -694 },
+	{ 0x8380dea9, 0x3da4bc60, 0x4247cb9e,  -690 },
+	{ 0xa4611653, 0x8d0deb78, 0x52d9be85,  -687 },
+	{ 0xcd795be8, 0x70516656, 0x67902e27,  -684 },
+	{ 0x806bd971, 0x4632dff6, 0x00ba1cd8,  -680 },
+	{ 0xa086cfcd, 0x97bf97f3, 0x80e8a40e,  -677 },
+	{ 0xc8a883c0, 0xfdaf7df0, 0x6122cd12,  -674 },
+	{ 0xfad2a4b1, 0x3d1b5d6c, 0x796b8057,  -671 },
+	{ 0x9cc3a6ee, 0xc6311a63, 0xcbe33036,  -667 },
+	{ 0xc3f490aa, 0x77bd60fc, 0xbedbfc44,  -664 },
+	{ 0xf4f1b4d5, 0x15acb93b, 0xee92fb55,  -661 },
+	{ 0x99171105, 0x2d8bf3c5, 0x751bdd15,  -657 },
+	{ 0xbf5cd546, 0x78eef0b6, 0xd262d45a,  -654 },
+	{ 0xef340a98, 0x172aace4, 0x86fb8971,  -651 },
+	{ 0x9580869f, 0x0e7aac0e, 0xd45d35e6,  -647 },
+	{ 0xbae0a846, 0xd2195712, 0x89748360,  -644 },
+	{ 0xe998d258, 0x869facd7, 0x2bd1a438,  -641 },
+	{ 0x91ff8377, 0x5423cc06, 0x7b6306a3,  -637 },
+	{ 0xb67f6455, 0x292cbf08, 0x1a3bc84c,  -634 },
+	{ 0xe41f3d6a, 0x7377eeca, 0x20caba5f,  -631 },
+	{ 0x8e938662, 0x882af53e, 0x547eb47b,  -627 },
+	{ 0xb23867fb, 0x2a35b28d, 0xe99e619a,  -624 },
+	{ 0xdec681f9, 0xf4c31f31, 0x6405fa00,  -621 },
+	{ 0x8b3c113c, 0x38f9f37e, 0xde83bc40,  -617 },
+	{ 0xae0b158b, 0x4738705e, 0x9624ab50,  -614 },
+	{ 0xd98ddaee, 0x19068c76, 0x3badd624,  -611 },
+	{ 0x87f8a8d4, 0xcfa417c9, 0xe54ca5d7,  -607 },
+	{ 0xa9f6d30a, 0x038d1dbc, 0x5e9fcf4c,  -604 },
+	{ 0xd47487cc, 0x8470652b, 0x7647c320,  -601 },
+	{ 0x84c8d4df, 0xd2c63f3b, 0x29ecd9f4,  -597 },
+	{ 0xa5fb0a17, 0xc777cf09, 0xf4681071,  -594 },
+	{ 0xcf79cc9d, 0xb955c2cc, 0x7182148d,  -591 },
+	{ 0x81ac1fe2, 0x93d599bf, 0xc6f14cd8,  -587 },
+	{ 0xa21727db, 0x38cb002f, 0xb8ada00e,  -584 },
+	{ 0xca9cf1d2, 0x06fdc03b, 0xa6d90811,  -581 },
+	{ 0xfd442e46, 0x88bd304a, 0x908f4a16,  -578 },
+	{ 0x9e4a9cec, 0x15763e2e, 0x9a598e4e,  -574 },
+	{ 0xc5dd4427, 0x1ad3cdba, 0x40eff1e1,  -571 },
+	{ 0xf7549530, 0xe188c128, 0xd12bee59,  -568 },
+	{ 0x9a94dd3e, 0x8cf578b9, 0x82bb74f8,  -564 },
+	{ 0xc13a148e, 0x3032d6e7, 0xe36a5236,  -561 },
+	{ 0xf18899b1, 0xbc3f8ca1, 0xdc44e6c3,  -558 },
+	{ 0x96f5600f, 0x15a7b7e5, 0x29ab103a,  -554 },
+	{ 0xbcb2b812, 0xdb11a5de, 0x7415d448,  -551 },
+	{ 0xebdf6617, 0x91d60f56, 0x111b495b,  -548 },
+	{ 0x936b9fce, 0xbb25c995, 0xcab10dd9,  -544 },
+	{ 0xb84687c2, 0x69ef3bfb, 0x3d5d514f,  -541 },
+	{ 0xe65829b3, 0x046b0afa, 0x0cb4a5a3,  -538 },
+	{ 0x8ff71a0f, 0xe2c2e6dc, 0x47f0e785,  -534 },
+	{ 0xb3f4e093, 0xdb73a093, 0x59ed2167,  -531 },
+	{ 0xe0f218b8, 0xd25088b8, 0x306869c1,  -528 },
+	{ 0x8c974f73, 0x83725573, 0x1e414218,  -524 },
+	{ 0xafbd2350, 0x644eeacf, 0xe5d1929e,  -521 },
+	{ 0xdbac6c24, 0x7d62a583, 0xdf45f746,  -518 },
+	{ 0x894bc396, 0xce5da772, 0x6b8bba8c,  -514 },
+	{ 0xab9eb47c, 0x81f5114f, 0x066ea92f,  -511 },
+	{ 0xd686619b, 0xa27255a2, 0xc80a537b,  -508 },
+	{ 0x8613fd01, 0x45877585, 0xbd06742c,  -504 },
+	{ 0xa798fc41, 0x96e952e7, 0x2c481138,  -501 },
+	{ 0xd17f3b51, 0xfca3a7a0, 0xf75a1586,  -498 },
+	{ 0x82ef8513, 0x3de648c4, 0x9a984d73,  -494 },
+	{ 0xa3ab6658, 0x0d5fdaf5, 0xc13e60d0,  -491 },
+	{ 0xcc963fee, 0x10b7d1b3, 0x318df905,  -488 },
+	{ 0xffbbcfe9, 0x94e5c61f, 0xfdf17746,  -485 },
+	{ 0x9fd561f1, 0xfd0f9bd3, 0xfeb6ea8b,  -481 },
+	{ 0xc7caba6e, 0x7c5382c8, 0xfe64a52e,  -478 },
+	{ 0xf9bd690a, 0x1b68637b, 0x3dfdce7a,  -475 },
+	{ 0x9c1661a6, 0x51213e2d, 0x06bea10c,  -471 },
+	{ 0xc31bfa0f, 0xe5698db8, 0x486e494f,  -468 },
+	{ 0xf3e2f893, 0xdec3f126, 0x5a89dba3,  -465 },
+	{ 0x986ddb5c, 0x6b3a76b7, 0xf8962946,  -461 },
+	{ 0xbe895233, 0x86091465, 0xf6bbb397,  -458 },
+	{ 0xee2ba6c0, 0x678b597f, 0x746aa07d,  -455 },
+	{ 0x94db4838, 0x40b717ef, 0xa8c2a44e,  -451 },
+	{ 0xba121a46, 0x50e4ddeb, 0x92f34d62,  -448 },
+	{ 0xe896a0d7, 0xe51e1566, 0x77b020ba,  -445 },
+	{ 0x915e2486, 0xef32cd60, 0x0ace1474,  -441 },
+	{ 0xb5b5ada8, 0xaaff80b8, 0x0d819992,  -438 },
+	{ 0xe3231912, 0xd5bf60e6, 0x10e1fff6,  -435 },
+	{ 0x8df5efab, 0xc5979c8f, 0xca8d3ffa,  -431 },
+	{ 0xb1736b96, 0xb6fd83b3, 0xbd308ff8,  -428 },
+	{ 0xddd0467c, 0x64bce4a0, 0xac7cb3f6,  -425 },
+	{ 0x8aa22c0d, 0xbef60ee4, 0x6bcdf07a,  -421 },
+	{ 0xad4ab711, 0x2eb3929d, 0x86c16c98,  -418 },
+	{ 0xd89d64d5, 0x7a607744, 0xe871c7bf,  -415 },
+	{ 0x87625f05, 0x6c7c4a8b, 0x11471cd7,  -411 },
+	{ 0xa93af6c6, 0xc79b5d2d, 0xd598e40d,  -408 },
+	{ 0xd389b478, 0x79823479, 0x4aff1d10,  -405 },
+	{ 0x843610cb, 0x4bf160cb, 0xcedf722a,  -401 },
+	{ 0xa54394fe, 0x1eedb8fe, 0xc2974eb4,  -398 },
+	{ 0xce947a3d, 0xa6a9273e, 0x733d2262,  -395 },
+	{ 0x811ccc66, 0x8829b887, 0x0806357d,  -391 },
+	{ 0xa163ff80, 0x2a3426a8, 0xca07c2dc,  -388 },
+	{ 0xc9bcff60, 0x34c13052, 0xfc89b393,  -385 },
+	{ 0xfc2c3f38, 0x41f17c67, 0xbbac2078,  -382 },
+	{ 0x9d9ba783, 0x2936edc0, 0xd54b944b,  -378 },
+	{ 0xc5029163, 0xf384a931, 0x0a9e795e,  -375 },
+	{ 0xf64335bc, 0xf065d37d, 0x4d4617b5,  -372 },
+	{ 0x99ea0196, 0x163fa42e, 0x504bced1,  -368 },
+	{ 0xc06481fb, 0x9bcf8d39, 0xe45ec286,  -365 },
+	{ 0xf07da27a, 0x82c37088, 0x5d767327,  -362 },
+	{ 0x964e858c, 0x91ba2655, 0x3a6a07f8,  -358 },
+	{ 0xbbe226ef, 0xb628afea, 0x890489f7,  -355 },
+	{ 0xeadab0ab, 0xa3b2dbe5, 0x2b45ac74,  -352 },
+	{ 0x92c8ae6b, 0x464fc96f, 0x3b0b8bc9,  -348 },
+	{ 0xb77ada06, 0x17e3bbcb, 0x09ce6ebb,  -345 },
+	{ 0xe5599087, 0x9ddcaabd, 0xcc420a6a,  -342 },
+	{ 0x8f57fa54, 0xc2a9eab6, 0x9fa94682,  -338 },
+	{ 0xb32df8e9, 0xf3546564, 0x47939822,  -335 },
+	{ 0xdff97724, 0x70297ebd, 0x59787e2b,  -332 },
+	{ 0x8bfbea76, 0xc619ef36, 0x57eb4edb,  -328 },
+	{ 0xaefae514, 0x77a06b03, 0xede62292,  -325 },
+	{ 0xdab99e59, 0x958885c4, 0xe95fab36,  -322 },
+	{ 0x88b402f7, 0xfd75539b, 0x11dbcb02,  -318 },
+	{ 0xaae103b5, 0xfcd2a881, 0xd652bdc2,  -315 },
+	{ 0xd59944a3, 0x7c0752a2, 0x4be76d33,  -312 },
+	{ 0x857fcae6, 0x2d8493a5, 0x6f70a440,  -308 },
+	{ 0xa6dfbd9f, 0xb8e5b88e, 0xcb4ccd50,  -305 },
+	{ 0xd097ad07, 0xa71f26b2, 0x7e2000a4,  -302 },
+	{ 0x825ecc24, 0xc873782f, 0x8ed40066,  -298 },
+	{ 0xa2f67f2d, 0xfa90563b, 0x72890080,  -295 },
+	{ 0xcbb41ef9, 0x79346bca, 0x4f2b40a0,  -292 },
+	{ 0xfea126b7, 0xd78186bc, 0xe2f610c8,  -289 },
+	{ 0x9f24b832, 0xe6b0f436, 0x0dd9ca7d,  -285 },
+	{ 0xc6ede63f, 0xa05d3143, 0x91503d1c,  -282 },
+	{ 0xf8a95fcf, 0x88747d94, 0x75a44c63,  -279 },
+	{ 0x9b69dbe1, 0xb548ce7c, 0xc986afbe,  -275 },
+	{ 0xc24452da, 0x229b021b, 0xfbe85bad,  -272 },
+	{ 0xf2d56790, 0xab41c2a2, 0xfae27299,  -269 },
+	{ 0x97c560ba, 0x6b0919a5, 0xdccd879f,  -265 },
+	{ 0xbdb6b8e9, 0x05cb600f, 0x5400e987,  -262 },
+	{ 0xed246723, 0x473e3813, 0x290123e9,  -259 },
+	{ 0x9436c076, 0x0c86e30b, 0xf9a0b672,  -255 },
+	{ 0xb9447093, 0x8fa89bce, 0xf808e40e,  -252 },
+	{ 0xe7958cb8, 0x7392c2c2, 0xb60b1d12,  -249 },
+	{ 0x90bd77f3, 0x483bb9b9, 0xb1c6f22b,  -245 },
+	{ 0xb4ecd5f0, 0x1a4aa828, 0x1e38aeb6,  -242 },
+	{ 0xe2280b6c, 0x20dd5232, 0x25c6da63,  -239 },
+	{ 0x8d590723, 0x948a535f, 0x579c487e,  -235 },
+	{ 0xb0af48ec, 0x79ace837, 0x2d835a9d,  -232 },
+	{ 0xdcdb1b27, 0x98182244, 0xf8e43145,  -229 },
+	{ 0x8a08f0f8, 0xbf0f156b, 0x1b8e9ecb,  -225 },
+	{ 0xac8b2d36, 0xeed2dac5, 0xe272467e,  -222 },
+	{ 0xd7adf884, 0xaa879177, 0x5b0ed81d,  -219 },
+	{ 0x86ccbb52, 0xea94baea, 0x98e94712,  -215 },
+	{ 0xa87fea27, 0xa539e9a5, 0x3f2398d7,  -212 },
+	{ 0xd29fe4b1, 0x8e88640e, 0x8eec7f0d,  -209 },
+	{ 0x83a3eeee, 0xf9153e89, 0x1953cf68,  -205 },
+	{ 0xa48ceaaa, 0xb75a8e2b, 0x5fa8c342,  -202 },
+	{ 0xcdb02555, 0x653131b6, 0x3792f412,  -199 },
+	{ 0x808e1755, 0x5f3ebf11, 0xe2bbd88b,  -195 },
+	{ 0xa0b19d2a, 0xb70e6ed6, 0x5b6aceae,  -192 },
+	{ 0xc8de0475, 0x64d20a8b, 0xf245825a,  -189 },
+	{ 0xfb158592, 0xbe068d2e, 0xeed6e2f0,  -186 },
+	{ 0x9ced737b, 0xb6c4183d, 0x55464dd6,  -182 },
+	{ 0xc428d05a, 0xa4751e4c, 0xaa97e14c,  -179 },
+	{ 0xf5330471, 0x4d9265df, 0xd53dd99f,  -176 },
+	{ 0x993fe2c6, 0xd07b7fab, 0xe546a803,  -172 },
+	{ 0xbf8fdb78, 0x849a5f96, 0xde985204,  -169 },
+	{ 0xef73d256, 0xa5c0f77c, 0x963e6685,  -166 },
+	{ 0x95a86376, 0x27989aad, 0xdde70013,  -162 },
+	{ 0xbb127c53, 0xb17ec159, 0x5560c018,  -159 },
+	{ 0xe9d71b68, 0x9dde71af, 0xaab8f01e,  -156 },
+	{ 0x92267121, 0x62ab070d, 0xcab39613,  -152 },
+	{ 0xb6b00d69, 0xbb55c8d1, 0x3d607b97,  -149 },
+	{ 0xe45c10c4, 0x2a2b3b05, 0x8cb89a7d,  -146 },
+	{ 0x8eb98a7a, 0x9a5b04e3, 0x77f3608e,  -142 },
+	{ 0xb267ed19, 0x40f1c61c, 0x55f038b2,  -139 },
+	{ 0xdf01e85f, 0x912e37a3, 0x6b6c46de,  -136 },
+	{ 0x8b61313b, 0xbabce2c6, 0x2323ac4b,  -132 },
+	{ 0xae397d8a, 0xa96c1b77, 0xabec975e,  -129 },
+	{ 0xd9c7dced, 0x53c72255, 0x96e7bd35,  -126 },
+	{ 0x881cea14, 0x545c7575, 0x7e50d641,  -122 },
+	{ 0xaa242499, 0x697392d2, 0xdde50bd1,  -119 },
+	{ 0xd4ad2dbf, 0xc3d07787, 0x955e4ec6,  -116 },
+	{ 0x84ec3c97, 0xda624ab4, 0xbd5af13b,  -112 },
+	{ 0xa6274bbd, 0xd0fadd61, 0xecb1ad8a,  -109 },
+	{ 0xcfb11ead, 0x453994ba, 0x67de18ed,  -106 },
+	{ 0x81ceb32c, 0x4b43fcf4, 0x80eacf94,  -102 },
+	{ 0xa2425ff7, 0x5e14fc31, 0xa1258379,   -99 },
+	{ 0xcad2f7f5, 0x359a3b3e, 0x096ee458,   -96 },
+	{ 0xfd87b5f2, 0x8300ca0d, 0x8bca9d6e,   -93 },
+	{ 0x9e74d1b7, 0x91e07e48, 0x775ea264,   -89 },
+	{ 0xc6120625, 0x76589dda, 0x95364afe,   -86 },
+	{ 0xf79687ae, 0xd3eec551, 0x3a83ddbd,   -83 },
+	{ 0x9abe14cd, 0x44753b52, 0xc4926a96,   -79 },
+	{ 0xc16d9a00, 0x95928a27, 0x75b7053c,   -76 },
+	{ 0xf1c90080, 0xbaf72cb1, 0x5324c68b,   -73 },
+	{ 0x971da050, 0x74da7bee, 0xd3f6fc16,   -69 },
+	{ 0xbce50864, 0x92111aea, 0x88f4bb1c,   -66 },
+	{ 0xec1e4a7d, 0xb69561a5, 0x2b31e9e3,   -63 },
+	{ 0x9392ee8e, 0x921d5d07, 0x3aff322e,   -59 },
+	{ 0xb877aa32, 0x36a4b449, 0x09befeb9,   -56 },
+	{ 0xe69594be, 0xc44de15b, 0x4c2ebe68,   -53 },
+	{ 0x901d7cf7, 0x3ab0acd9, 0x0f9d3701,   -49 },
+	{ 0xb424dc35, 0x095cd80f, 0x538484c1,   -46 },
+	{ 0xe12e1342, 0x4bb40e13, 0x2865a5f2,   -43 },
+	{ 0x8cbccc09, 0x6f5088cb, 0xf93f87b7,   -39 },
+	{ 0xafebff0b, 0xcb24aafe, 0xf78f69a5,   -36 },
+	{ 0xdbe6fece, 0xbdedd5be, 0xb573440e,   -33 },
+	{ 0x89705f41, 0x36b4a597, 0x31680a88,   -29 },
+	{ 0xabcc7711, 0x8461cefc, 0xfdc20d2b,   -26 },
+	{ 0xd6bf94d5, 0xe57a42bc, 0x3d329076,   -23 },
+	{ 0x8637bd05, 0xaf6c69b5, 0xa63f9a49,   -19 },
+	{ 0xa7c5ac47, 0x1b478423, 0x0fcf80dc,   -16 },
+	{ 0xd1b71758, 0xe219652b, 0xd3c36113,   -13 },
+	{ 0x83126e97, 0x8d4fdf3b, 0x645a1cac,    -9 },
+	{ 0xa3d70a3d, 0x70a3d70a, 0x3d70a3d7,    -6 },
+	{ 0xcccccccc, 0xcccccccc, 0xcccccccc,    -3 },
+	{ 0x80000000, 0x00000000, 0x00000000,    1 },
+	{ 0xa0000000, 0x00000000, 0x00000000,    4 },
+	{ 0xc8000000, 0x00000000, 0x00000000,    7 },
+	{ 0xfa000000, 0x00000000, 0x00000000,   10 },
+	{ 0x9c400000, 0x00000000, 0x00000000,   14 },
+	{ 0xc3500000, 0x00000000, 0x00000000,   17 },
+	{ 0xf4240000, 0x00000000, 0x00000000,   20 },
+	{ 0x98968000, 0x00000000, 0x00000000,   24 },
+	{ 0xbebc2000, 0x00000000, 0x00000000,   27 },
+	{ 0xee6b2800, 0x00000000, 0x00000000,   30 },
+	{ 0x9502f900, 0x00000000, 0x00000000,   34 },
+	{ 0xba43b740, 0x00000000, 0x00000000,   37 },
+	{ 0xe8d4a510, 0x00000000, 0x00000000,   40 },
+	{ 0x9184e72a, 0x00000000, 0x00000000,   44 },
+	{ 0xb5e620f4, 0x80000000, 0x00000000,   47 },
+	{ 0xe35fa931, 0xa0000000, 0x00000000,   50 },
+	{ 0x8e1bc9bf, 0x04000000, 0x00000000,   54 },
+	{ 0xb1a2bc2e, 0xc5000000, 0x00000000,   57 },
+	{ 0xde0b6b3a, 0x76400000, 0x00000000,   60 },
+	{ 0x8ac72304, 0x89e80000, 0x00000000,   64 },
+	{ 0xad78ebc5, 0xac620000, 0x00000000,   67 },
+	{ 0xd8d726b7, 0x177a8000, 0x00000000,   70 },
+	{ 0x87867832, 0x6eac9000, 0x00000000,   74 },
+	{ 0xa968163f, 0x0a57b400, 0x00000000,   77 },
+	{ 0xd3c21bce, 0xcceda100, 0x00000000,   80 },
+	{ 0x84595161, 0x401484a0, 0x00000000,   84 },
+	{ 0xa56fa5b9, 0x9019a5c8, 0x00000000,   87 },
+	{ 0xcecb8f27, 0xf4200f3a, 0x00000000,   90 },
+	{ 0x813f3978, 0xf8940984, 0x40000000,   94 },
+	{ 0xa18f07d7, 0x36b90be5, 0x50000000,   97 },
+	{ 0xc9f2c9cd, 0x04674ede, 0xa4000000,  100 },
+	{ 0xfc6f7c40, 0x45812296, 0x4d000000,  103 },
+	{ 0x9dc5ada8, 0x2b70b59d, 0xf0200000,  107 },
+	{ 0xc5371912, 0x364ce305, 0x6c280000,  110 },
+	{ 0xf684df56, 0xc3e01bc6, 0xc7320000,  113 },
+	{ 0x9a130b96, 0x3a6c115c, 0x3c7f4000,  117 },
+	{ 0xc097ce7b, 0xc90715b3, 0x4b9f1000,  120 },
+	{ 0xf0bdc21a, 0xbb48db20, 0x1e86d400,  123 },
+	{ 0x96769950, 0xb50d88f4, 0x13144480,  127 },
+	{ 0xbc143fa4, 0xe250eb31, 0x17d955a0,  130 },
+	{ 0xeb194f8e, 0x1ae525fd, 0x5dcfab08,  133 },
+	{ 0x92efd1b8, 0xd0cf37be, 0x5aa1cae5,  137 },
+	{ 0xb7abc627, 0x050305ad, 0xf14a3d9e,  140 },
+	{ 0xe596b7b0, 0xc643c719, 0x6d9ccd05,  143 },
+	{ 0x8f7e32ce, 0x7bea5c6f, 0xe4820023,  147 },
+	{ 0xb35dbf82, 0x1ae4f38b, 0xdda2802c,  150 },
+	{ 0xe0352f62, 0xa19e306e, 0xd50b2037,  153 },
+	{ 0x8c213d9d, 0xa502de45, 0x4526f422,  157 },
+	{ 0xaf298d05, 0x0e4395d6, 0x9670b12b,  160 },
+	{ 0xdaf3f046, 0x51d47b4c, 0x3c0cdd76,  163 },
+	{ 0x88d8762b, 0xf324cd0f, 0xa5880a69,  167 },
+	{ 0xab0e93b6, 0xefee0053, 0x8eea0d04,  170 },
+	{ 0xd5d238a4, 0xabe98068, 0x72a49045,  173 },
+	{ 0x85a36366, 0xeb71f041, 0x47a6da2b,  177 },
+	{ 0xa70c3c40, 0xa64e6c51, 0x999090b6,  180 },
+	{ 0xd0cf4b50, 0xcfe20765, 0xfff4b4e3,  183 },
+	{ 0x82818f12, 0x81ed449f, 0xbff8f10e,  187 },
+	{ 0xa321f2d7, 0x226895c7, 0xaff72d52,  190 },
+	{ 0xcbea6f8c, 0xeb02bb39, 0x9bf4f8a6,  193 },
+	{ 0xfee50b70, 0x25c36a08, 0x02f236d0,  196 },
+	{ 0x9f4f2726, 0x179a2245, 0x01d76242,  200 },
+	{ 0xc722f0ef, 0x9d80aad6, 0x424d3ad2,  203 },
+	{ 0xf8ebad2b, 0x84e0d58b, 0xd2e08987,  206 },
+	{ 0x9b934c3b, 0x330c8577, 0x63cc55f4,  210 },
+	{ 0xc2781f49, 0xffcfa6d5, 0x3cbf6b71,  213 },
+	{ 0xf316271c, 0x7fc3908a, 0x8bef464e,  216 },
+	{ 0x97edd871, 0xcfda3a56, 0x97758bf0,  220 },
+	{ 0xbde94e8e, 0x43d0c8ec, 0x3d52eeed,  223 },
+	{ 0xed63a231, 0xd4c4fb27, 0x4ca7aaa8,  226 },
+	{ 0x945e455f, 0x24fb1cf8, 0x8fe8caa9,  230 },
+	{ 0xb975d6b6, 0xee39e436, 0xb3e2fd53,  233 },
+	{ 0xe7d34c64, 0xa9c85d44, 0x60dbbca8,  236 },
+	{ 0x90e40fbe, 0xea1d3a4a, 0xbc8955e9,  240 },
+	{ 0xb51d13ae, 0xa4a488dd, 0x6babab63,  243 },
+	{ 0xe264589a, 0x4dcdab14, 0xc696963c,  246 },
+	{ 0x8d7eb760, 0x70a08aec, 0xfc1e1de5,  250 },
+	{ 0xb0de6538, 0x8cc8ada8, 0x3b25a55f,  253 },
+	{ 0xdd15fe86, 0xaffad912, 0x49ef0eb7,  256 },
+	{ 0x8a2dbf14, 0x2dfcc7ab, 0x6e356932,  260 },
+	{ 0xacb92ed9, 0x397bf996, 0x49c2c37f,  263 },
+	{ 0xd7e77a8f, 0x87daf7fb, 0xdc33745e,  266 },
+	{ 0x86f0ac99, 0xb4e8dafd, 0x69a028bb,  270 },
+	{ 0xa8acd7c0, 0x222311bc, 0xc40832ea,  273 },
+	{ 0xd2d80db0, 0x2aabd62b, 0xf50a3fa4,  276 },
+	{ 0x83c7088e, 0x1aab65db, 0x792667c6,  280 },
+	{ 0xa4b8cab1, 0xa1563f52, 0x577001b8,  283 },
+	{ 0xcde6fd5e, 0x09abcf26, 0xed4c0226,  286 },
+	{ 0x80b05e5a, 0xc60b6178, 0x544f8158,  290 },
+	{ 0xa0dc75f1, 0x778e39d6, 0x696361ae,  293 },
+	{ 0xc913936d, 0xd571c84c, 0x03bc3a19,  296 },
+	{ 0xfb587849, 0x4ace3a5f, 0x04ab48a0,  299 },
+	{ 0x9d174b2d, 0xcec0e47b, 0x62eb0d64,  303 },
+	{ 0xc45d1df9, 0x42711d9a, 0x3ba5d0bd,  306 },
+	{ 0xf5746577, 0x930d6500, 0xca8f44ec,  309 },
+	{ 0x9968bf6a, 0xbbe85f20, 0x7e998b13,  313 },
+	{ 0xbfc2ef45, 0x6ae276e8, 0x9e3fedd8,  316 },
+	{ 0xefb3ab16, 0xc59b14a2, 0xc5cfe94e,  319 },
+	{ 0x95d04aee, 0x3b80ece5, 0xbba1f1d1,  323 },
+	{ 0xbb445da9, 0xca61281f, 0x2a8a6e45,  326 },
+	{ 0xea157514, 0x3cf97226, 0xf52d09d7,  329 },
+	{ 0x924d692c, 0xa61be758, 0x593c2626,  333 },
+	{ 0xb6e0c377, 0xcfa2e12e, 0x6f8b2fb0,  336 },
+	{ 0xe498f455, 0xc38b997a, 0x0b6dfb9c,  339 },
+	{ 0x8edf98b5, 0x9a373fec, 0x4724bd41,  343 },
+	{ 0xb2977ee3, 0x00c50fe7, 0x58edec91,  346 },
+	{ 0xdf3d5e9b, 0xc0f653e1, 0x2f2967b6,  349 },
+	{ 0x8b865b21, 0x5899f46c, 0xbd79e0d2,  353 },
+	{ 0xae67f1e9, 0xaec07187, 0xecd85906,  356 },
+	{ 0xda01ee64, 0x1a708de9, 0xe80e6f48,  359 },
+	{ 0x884134fe, 0x908658b2, 0x3109058d,  363 },
+	{ 0xaa51823e, 0x34a7eede, 0xbd4b46f0,  366 },
+	{ 0xd4e5e2cd, 0xc1d1ea96, 0x6c9e18ac,  369 },
+	{ 0x850fadc0, 0x9923329e, 0x03e2cf6b,  373 },
+	{ 0xa6539930, 0xbf6bff45, 0x84db8346,  376 },
+	{ 0xcfe87f7c, 0xef46ff16, 0xe6126418,  379 },
+	{ 0x81f14fae, 0x158c5f6e, 0x4fcb7e8f,  383 },
+	{ 0xa26da399, 0x9aef7749, 0xe3be5e33,  386 },
+	{ 0xcb090c80, 0x01ab551c, 0x5cadf5bf,  389 },
+	{ 0xfdcb4fa0, 0x02162a63, 0x73d9732f,  392 },
+	{ 0x9e9f11c4, 0x014dda7e, 0x2867e7fd,  396 },
+	{ 0xc646d635, 0x01a1511d, 0xb281e1fd,  399 },
+	{ 0xf7d88bc2, 0x4209a565, 0x1f225a7c,  402 },
+	{ 0x9ae75759, 0x6946075f, 0x3375788d,  406 },
+	{ 0xc1a12d2f, 0xc3978937, 0x0052d6b1,  409 },
+	{ 0xf209787b, 0xb47d6b84, 0xc0678c5d,  412 },
+	{ 0x9745eb4d, 0x50ce6332, 0xf840b7ba,  416 },
+	{ 0xbd176620, 0xa501fbff, 0xb650e5a9,  419 },
+	{ 0xec5d3fa8, 0xce427aff, 0xa3e51f13,  422 },
+	{ 0x93ba47c9, 0x80e98cdf, 0xc66f336c,  426 },
+	{ 0xb8a8d9bb, 0xe123f017, 0xb80b0047,  429 },
+	{ 0xe6d3102a, 0xd96cec1d, 0xa60dc059,  432 },
+	{ 0x9043ea1a, 0xc7e41392, 0x87c89837,  436 },
+	{ 0xb454e4a1, 0x79dd1877, 0x29babe45,  439 },
+	{ 0xe16a1dc9, 0xd8545e94, 0xf4296dd6,  442 },
+	{ 0x8ce2529e, 0x2734bb1d, 0x1899e4a6,  446 },
+	{ 0xb01ae745, 0xb101e9e4, 0x5ec05dcf,  449 },
+	{ 0xdc21a117, 0x1d42645d, 0x76707543,  452 },
+	{ 0x899504ae, 0x72497eba, 0x6a06494a,  456 },
+	{ 0xabfa45da, 0x0edbde69, 0x0487db9d,  459 },
+	{ 0xd6f8d750, 0x9292d603, 0x45a9d284,  462 },
+	{ 0x865b8692, 0x5b9bc5c2, 0x0b8a2392,  466 },
+	{ 0xa7f26836, 0xf282b732, 0x8e6cac77,  469 },
+	{ 0xd1ef0244, 0xaf2364ff, 0x3207d795,  472 },
+	{ 0x8335616a, 0xed761f1f, 0x7f44e6bd,  476 },
+	{ 0xa402b9c5, 0xa8d3a6e7, 0x5f16206c,  479 },
+	{ 0xcd036837, 0x130890a1, 0x36dba887,  482 },
+	{ 0x80222122, 0x6be55a64, 0xc2494954,  486 },
+	{ 0xa02aa96b, 0x06deb0fd, 0xf2db9baa,  489 },
+	{ 0xc83553c5, 0xc8965d3d, 0x6f928294,  492 },
+	{ 0xfa42a8b7, 0x3abbf48c, 0xcb772339,  495 },
+	{ 0x9c69a972, 0x84b578d7, 0xff2a7604,  499 },
+	{ 0xc38413cf, 0x25e2d70d, 0xfef51385,  502 },
+	{ 0xf46518c2, 0xef5b8cd1, 0x7eb25866,  505 },
+	{ 0x98bf2f79, 0xd5993802, 0xef2f773f,  509 },
+	{ 0xbeeefb58, 0x4aff8603, 0xaafb550f,  512 },
+	{ 0xeeaaba2e, 0x5dbf6784, 0x95ba2a53,  515 },
+	{ 0x952ab45c, 0xfa97a0b2, 0xdd945a74,  519 },
+	{ 0xba756174, 0x393d88df, 0x94f97111,  522 },
+	{ 0xe912b9d1, 0x478ceb17, 0x7a37cd56,  525 },
+	{ 0x91abb422, 0xccb812ee, 0xac62e055,  529 },
+	{ 0xb616a12b, 0x7fe617aa, 0x577b986b,  532 },
+	{ 0xe39c4976, 0x5fdf9d94, 0xed5a7e85,  535 },
+	{ 0x8e41ade9, 0xfbebc27d, 0x14588f13,  539 },
+	{ 0xb1d21964, 0x7ae6b31c, 0x596eb2d8,  542 },
+	{ 0xde469fbd, 0x99a05fe3, 0x6fca5f8e,  545 },
+	{ 0x8aec23d6, 0x80043bee, 0x25de7bb9,  549 },
+	{ 0xada72ccc, 0x20054ae9, 0xaf561aa7,  552 },
+	{ 0xd910f7ff, 0x28069da4, 0x1b2ba151,  555 },
+	{ 0x87aa9aff, 0x79042286, 0x90fb44d2,  559 },
+	{ 0xa99541bf, 0x57452b28, 0x353a1607,  562 },
+	{ 0xd3fa922f, 0x2d1675f2, 0x42889b89,  565 },
+	{ 0x847c9b5d, 0x7c2e09b7, 0x69956135,  569 },
+	{ 0xa59bc234, 0xdb398c25, 0x43fab983,  572 },
+	{ 0xcf02b2c2, 0x1207ef2e, 0x94f967e4,  575 },
+	{ 0x8161afb9, 0x4b44f57d, 0x1d1be0ee,  579 },
+	{ 0xa1ba1ba7, 0x9e1632dc, 0x6462d92a,  582 },
+	{ 0xca28a291, 0x859bbf93, 0x7d7b8f75,  585 },
+	{ 0xfcb2cb35, 0xe702af78, 0x5cda7352,  588 },
+	{ 0x9defbf01, 0xb061adab, 0x3a088813,  592 },
+	{ 0xc56baec2, 0x1c7a1916, 0x088aaa18,  595 },
+	{ 0xf6c69a72, 0xa3989f5b, 0x8aad549e,  598 },
+	{ 0x9a3c2087, 0xa63f6399, 0x36ac54e2,  602 },
+	{ 0xc0cb28a9, 0x8fcf3c7f, 0x84576a1b,  605 },
+	{ 0xf0fdf2d3, 0xf3c30b9f, 0x656d44a2,  608 },
+	{ 0x969eb7c4, 0x7859e743, 0x9f644ae5,  612 },
+	{ 0xbc4665b5, 0x96706114, 0x873d5d9f,  615 },
+	{ 0xeb57ff22, 0xfc0c7959, 0xa90cb506,  618 },
+	{ 0x9316ff75, 0xdd87cbd8, 0x09a7f124,  622 },
+	{ 0xb7dcbf53, 0x54e9bece, 0x0c11ed6d,  625 },
+	{ 0xe5d3ef28, 0x2a242e81, 0x8f1668c8,  628 },
+	{ 0x8fa47579, 0x1a569d10, 0xf96e017d,  632 },
+	{ 0xb38d92d7, 0x60ec4455, 0x37c981dc,  635 },
+	{ 0xe070f78d, 0x3927556a, 0x85bbe253,  638 },
+	{ 0x8c469ab8, 0x43b89562, 0x93956d74,  642 },
+	{ 0xaf584166, 0x54a6babb, 0x387ac8d1,  645 },
+	{ 0xdb2e51bf, 0xe9d0696a, 0x06997b05,  648 },
+	{ 0x88fcf317, 0xf22241e2, 0x441fece3,  652 },
+	{ 0xab3c2fdd, 0xeeaad25a, 0xd527e81c,  655 },
+	{ 0xd60b3bd5, 0x6a5586f1, 0x8a71e223,  658 },
+	{ 0x85c70565, 0x62757456, 0xf6872d56,  662 },
+	{ 0xa738c6be, 0xbb12d16c, 0xb428f8ac,  665 },
+	{ 0xd106f86e, 0x69d785c7, 0xe13336d7,  668 },
+	{ 0x82a45b45, 0x0226b39c, 0xecc00246,  672 },
+	{ 0xa34d7216, 0x42b06084, 0x27f002d7,  675 },
+	{ 0xcc20ce9b, 0xd35c78a5, 0x31ec038d,  678 },
+	{ 0xff290242, 0xc83396ce, 0x7e670471,  681 },
+	{ 0x9f79a169, 0xbd203e41, 0x0f0062c6,  685 },
+	{ 0xc75809c4, 0x2c684dd1, 0x52c07b78,  688 },
+	{ 0xf92e0c35, 0x37826145, 0xa7709a56,  691 },
+	{ 0x9bbcc7a1, 0x42b17ccb, 0x88a66076,  695 },
+	{ 0xc2abf989, 0x935ddbfe, 0x6acff893,  698 },
+	{ 0xf356f7eb, 0xf83552fe, 0x0583f6b8,  701 },
+	{ 0x98165af3, 0x7b2153de, 0xc3727a33,  705 },
+	{ 0xbe1bf1b0, 0x59e9a8d6, 0x744f18c0,  708 },
+	{ 0xeda2ee1c, 0x7064130c, 0x1162def0,  711 },
+	{ 0x9485d4d1, 0xc63e8be7, 0x8addcb56,  715 },
+	{ 0xb9a74a06, 0x37ce2ee1, 0x6d953e2b,  718 },
+	{ 0xe8111c87, 0xc5c1ba99, 0xc8fa8db6,  721 },
+	{ 0x910ab1d4, 0xdb9914a0, 0x1d9c9892,  725 },
+	{ 0xb54d5e4a, 0x127f59c8, 0x2503beb6,  728 },
+	{ 0xe2a0b5dc, 0x971f303a, 0x2e44ae64,  731 },
+	{ 0x8da471a9, 0xde737e24, 0x5ceaecfe,  735 },
+	{ 0xb10d8e14, 0x56105dad, 0x7425a83e,  738 },
+	{ 0xdd50f199, 0x6b947518, 0xd12f124e,  741 },
+	{ 0x8a5296ff, 0xe33cc92f, 0x82bd6b70,  745 },
+	{ 0xace73cbf, 0xdc0bfb7b, 0x636cc64d,  748 },
+	{ 0xd8210bef, 0xd30efa5a, 0x3c47f7e0,  751 },
+	{ 0x8714a775, 0xe3e95c78, 0x65acfaec,  755 },
+	{ 0xa8d9d153, 0x5ce3b396, 0x7f1839a7,  758 },
+	{ 0xd31045a8, 0x341ca07c, 0x1ede4811,  761 },
+	{ 0x83ea2b89, 0x2091e44d, 0x934aed0a,  765 },
+	{ 0xa4e4b66b, 0x68b65d60, 0xf81da84d,  768 },
+	{ 0xce1de406, 0x42e3f4b9, 0x36251260,  771 },
+	{ 0x80d2ae83, 0xe9ce78f3, 0xc1d72b7c,  775 },
+	{ 0xa1075a24, 0xe4421730, 0xb24cf65b,  778 },
+	{ 0xc94930ae, 0x1d529cfc, 0xdee033f2,  781 },
+	{ 0xfb9b7cd9, 0xa4a7443c, 0x169840ef,  784 },
+	{ 0x9d412e08, 0x06e88aa5, 0x8e1f2895,  788 },
+	{ 0xc491798a, 0x08a2ad4e, 0xf1a6f2ba,  791 },
+	{ 0xf5b5d7ec, 0x8acb58a2, 0xae10af69,  794 },
+	{ 0x9991a6f3, 0xd6bf1765, 0xacca6da1,  798 },
+	{ 0xbff610b0, 0xcc6edd3f, 0x17fd090a,  801 },
+	{ 0xeff394dc, 0xff8a948e, 0xddfc4b4c,  804 },
+	{ 0x95f83d0a, 0x1fb69cd9, 0x4abdaf10,  808 },
+	{ 0xbb764c4c, 0xa7a4440f, 0x9d6d1ad4,  811 },
+	{ 0xea53df5f, 0xd18d5513, 0x84c86189,  814 },
+	{ 0x92746b9b, 0xe2f8552c, 0x32fd3cf5,  818 },
+	{ 0xb7118682, 0xdbb66a77, 0x3fbc8c33,  821 },
+	{ 0xe4d5e823, 0x92a40515, 0x0fabaf3f,  824 },
+	{ 0x8f05b116, 0x3ba6832d, 0x29cb4d87,  828 },
+	{ 0xb2c71d5b, 0xca9023f8, 0x743e20e9,  831 },
+	{ 0xdf78e4b2, 0xbd342cf6, 0x914da924,  834 },
+	{ 0x8bab8eef, 0xb6409c1a, 0x1ad089b6,  838 },
+	{ 0xae9672ab, 0xa3d0c320, 0xa184ac24,  841 },
+	{ 0xda3c0f56, 0x8cc4f3e8, 0xc9e5d72d,  844 },
+	{ 0x88658996, 0x17fb1871, 0x7e2fa67c,  848 },
+	{ 0xaa7eebfb, 0x9df9de8d, 0xddbb901b,  851 },
+	{ 0xd51ea6fa, 0x85785631, 0x552a7422,  854 },
+	{ 0x8533285c, 0x936b35de, 0xd53a8895,  858 },
+	{ 0xa67ff273, 0xb8460356, 0x8a892aba,  861 },
+	{ 0xd01fef10, 0xa657842c, 0x2d2b7569,  864 },
+	{ 0x8213f56a, 0x67f6b29b, 0x9c3b2962,  868 },
+	{ 0xa298f2c5, 0x01f45f42, 0x8349f3ba,  871 },
+	{ 0xcb3f2f76, 0x42717713, 0x241c70a9,  874 },
+	{ 0xfe0efb53, 0xd30dd4d7, 0xed238cd3,  877 },
+	{ 0x9ec95d14, 0x63e8a506, 0xf4363804,  881 },
+	{ 0xc67bb459, 0x7ce2ce48, 0xb143c605,  884 },
+	{ 0xf81aa16f, 0xdc1b81da, 0xdd94b786,  887 },
+	{ 0x9b10a4e5, 0xe9913128, 0xca7cf2b4,  891 },
+	{ 0xc1d4ce1f, 0x63f57d72, 0xfd1c2f61,  894 },
+	{ 0xf24a01a7, 0x3cf2dccf, 0xbc633b39,  897 },
+	{ 0x976e4108, 0x8617ca01, 0xd5be0503,  901 },
+	{ 0xbd49d14a, 0xa79dbc82, 0x4b2d8644,  904 },
+	{ 0xec9c459d, 0x51852ba2, 0xddf8e7d6,  907 },
+	{ 0x93e1ab82, 0x52f33b45, 0xcabb90e5,  911 },
+	{ 0xb8da1662, 0xe7b00a17, 0x3d6a751f,  914 },
+	{ 0xe7109bfb, 0xa19c0c9d, 0x0cc51267,  917 },
+	{ 0x906a617d, 0x450187e2, 0x27fb2b80,  921 },
+	{ 0xb484f9dc, 0x9641e9da, 0xb1f9f660,  924 },
+	{ 0xe1a63853, 0xbbd26451, 0x5e7873f8,  927 },
+	{ 0x8d07e334, 0x55637eb2, 0xdb0b487b,  931 },
+	{ 0xb049dc01, 0x6abc5e5f, 0x91ce1a9a,  934 },
+	{ 0xdc5c5301, 0xc56b75f7, 0x7641a140,  937 },
+	{ 0x89b9b3e1, 0x1b6329ba, 0xa9e904c8,  941 },
+	{ 0xac2820d9, 0x623bf429, 0x546345fa,  944 },
+	{ 0xd732290f, 0xbacaf133, 0xa97c1779,  947 },
+	{ 0x867f59a9, 0xd4bed6c0, 0x49ed8eab,  951 },
+	{ 0xa81f3014, 0x49ee8c70, 0x5c68f256,  954 },
+	{ 0xd226fc19, 0x5c6a2f8c, 0x73832eec,  957 },
+	{ 0x83585d8f, 0xd9c25db7, 0xc831fd53,  961 },
+	{ 0xa42e74f3, 0xd032f525, 0xba3e7ca8,  964 },
+	{ 0xcd3a1230, 0xc43fb26f, 0x28ce1bd2,  967 },
+	{ 0x80444b5e, 0x7aa7cf85, 0x7980d163,  971 },
+	{ 0xa0555e36, 0x1951c366, 0xd7e105bc,  974 },
+	{ 0xc86ab5c3, 0x9fa63440, 0x8dd9472b,  977 },
+	{ 0xfa856334, 0x878fc150, 0xb14f98f6,  980 },
+	{ 0x9c935e00, 0xd4b9d8d2, 0x6ed1bf9a,  984 },
+	{ 0xc3b83581, 0x09e84f07, 0x0a862f80,  987 },
+	{ 0xf4a642e1, 0x4c6262c8, 0xcd27bb61,  990 },
+	{ 0x98e7e9cc, 0xcfbd7dbd, 0x8038d51c,  994 },
+	{ 0xbf21e440, 0x03acdd2c, 0xe0470a63,  997 },
+	{ 0xeeea5d50, 0x04981478, 0x1858ccfc, 1000 },
+	{ 0x95527a52, 0x02df0ccb, 0x0f37801e, 1004 },
+	{ 0xbaa718e6, 0x8396cffd, 0xd3056025, 1007 },
+	{ 0xe950df20, 0x247c83fd, 0x47c6b82e, 1010 },
+	{ 0x91d28b74, 0x16cdd27e, 0x4cdc331d, 1014 },
+	{ 0xb6472e51, 0x1c81471d, 0xe0133fe4, 1017 },
+	{ 0xe3d8f9e5, 0x63a198e5, 0x58180fdd, 1020 },
+	{ 0x8e679c2f, 0x5e44ff8f, 0x570f09ea, 1024 },
+	{ 0xb201833b, 0x35d63f73, 0x2cd2cc65, 1027 },
+	{ 0xde81e40a, 0x034bcf4f, 0xf8077f7e, 1030 },
+	{ 0x8b112e86, 0x420f6191, 0xfb04afaf, 1034 },
+	{ 0xadd57a27, 0xd29339f6, 0x79c5db9a, 1037 },
+	{ 0xd94ad8b1, 0xc7380874, 0x18375281, 1040 },
+	{ 0x87cec76f, 0x1c830548, 0x8f229391, 1044 },
+	{ 0xa9c2794a, 0xe3a3c69a, 0xb2eb3875, 1047 },
+	{ 0xd433179d, 0x9c8cb841, 0x5fa60692, 1050 },
+	{ 0x849feec2, 0x81d7f328, 0xdbc7c41b, 1054 },
+	{ 0xa5c7ea73, 0x224deff3, 0x12b9b522, 1057 },
+	{ 0xcf39e50f, 0xeae16bef, 0xd768226b, 1060 },
+	{ 0x81842f29, 0xf2cce375, 0xe6a11583, 1064 },
+	{ 0xa1e53af4, 0x6f801c53, 0x60495ae3, 1067 },
+	{ 0xca5e89b1, 0x8b602368, 0x385bb19c, 1070 },
+	{ 0xfcf62c1d, 0xee382c42, 0x46729e03, 1073 },
+	{ 0x9e19db92, 0xb4e31ba9, 0x6c07a2c2, 1077 }
+	};
+ static short int Lhint[2098] = {
+	   /*18,*/19,    19,    19,    19,    20,    20,    20,    21,    21,
+	   21,    22,    22,    22,    23,    23,    23,    23,    24,    24,
+	   24,    25,    25,    25,    26,    26,    26,    26,    27,    27,
+	   27,    28,    28,    28,    29,    29,    29,    29,    30,    30,
+	   30,    31,    31,    31,    32,    32,    32,    32,    33,    33,
+	   33,    34,    34,    34,    35,    35,    35,    35,    36,    36,
+	   36,    37,    37,    37,    38,    38,    38,    38,    39,    39,
+	   39,    40,    40,    40,    41,    41,    41,    41,    42,    42,
+	   42,    43,    43,    43,    44,    44,    44,    44,    45,    45,
+	   45,    46,    46,    46,    47,    47,    47,    47,    48,    48,
+	   48,    49,    49,    49,    50,    50,    50,    51,    51,    51,
+	   51,    52,    52,    52,    53,    53,    53,    54,    54,    54,
+	   54,    55,    55,    55,    56,    56,    56,    57,    57,    57,
+	   57,    58,    58,    58,    59,    59,    59,    60,    60,    60,
+	   60,    61,    61,    61,    62,    62,    62,    63,    63,    63,
+	   63,    64,    64,    64,    65,    65,    65,    66,    66,    66,
+	   66,    67,    67,    67,    68,    68,    68,    69,    69,    69,
+	   69,    70,    70,    70,    71,    71,    71,    72,    72,    72,
+	   72,    73,    73,    73,    74,    74,    74,    75,    75,    75,
+	   75,    76,    76,    76,    77,    77,    77,    78,    78,    78,
+	   78,    79,    79,    79,    80,    80,    80,    81,    81,    81,
+	   82,    82,    82,    82,    83,    83,    83,    84,    84,    84,
+	   85,    85,    85,    85,    86,    86,    86,    87,    87,    87,
+	   88,    88,    88,    88,    89,    89,    89,    90,    90,    90,
+	   91,    91,    91,    91,    92,    92,    92,    93,    93,    93,
+	   94,    94,    94,    94,    95,    95,    95,    96,    96,    96,
+	   97,    97,    97,    97,    98,    98,    98,    99,    99,    99,
+	  100,   100,   100,   100,   101,   101,   101,   102,   102,   102,
+	  103,   103,   103,   103,   104,   104,   104,   105,   105,   105,
+	  106,   106,   106,   106,   107,   107,   107,   108,   108,   108,
+	  109,   109,   109,   110,   110,   110,   110,   111,   111,   111,
+	  112,   112,   112,   113,   113,   113,   113,   114,   114,   114,
+	  115,   115,   115,   116,   116,   116,   116,   117,   117,   117,
+	  118,   118,   118,   119,   119,   119,   119,   120,   120,   120,
+	  121,   121,   121,   122,   122,   122,   122,   123,   123,   123,
+	  124,   124,   124,   125,   125,   125,   125,   126,   126,   126,
+	  127,   127,   127,   128,   128,   128,   128,   129,   129,   129,
+	  130,   130,   130,   131,   131,   131,   131,   132,   132,   132,
+	  133,   133,   133,   134,   134,   134,   134,   135,   135,   135,
+	  136,   136,   136,   137,   137,   137,   137,   138,   138,   138,
+	  139,   139,   139,   140,   140,   140,   141,   141,   141,   141,
+	  142,   142,   142,   143,   143,   143,   144,   144,   144,   144,
+	  145,   145,   145,   146,   146,   146,   147,   147,   147,   147,
+	  148,   148,   148,   149,   149,   149,   150,   150,   150,   150,
+	  151,   151,   151,   152,   152,   152,   153,   153,   153,   153,
+	  154,   154,   154,   155,   155,   155,   156,   156,   156,   156,
+	  157,   157,   157,   158,   158,   158,   159,   159,   159,   159,
+	  160,   160,   160,   161,   161,   161,   162,   162,   162,   162,
+	  163,   163,   163,   164,   164,   164,   165,   165,   165,   165,
+	  166,   166,   166,   167,   167,   167,   168,   168,   168,   169,
+	  169,   169,   169,   170,   170,   170,   171,   171,   171,   172,
+	  172,   172,   172,   173,   173,   173,   174,   174,   174,   175,
+	  175,   175,   175,   176,   176,   176,   177,   177,   177,   178,
+	  178,   178,   178,   179,   179,   179,   180,   180,   180,   181,
+	  181,   181,   181,   182,   182,   182,   183,   183,   183,   184,
+	  184,   184,   184,   185,   185,   185,   186,   186,   186,   187,
+	  187,   187,   187,   188,   188,   188,   189,   189,   189,   190,
+	  190,   190,   190,   191,   191,   191,   192,   192,   192,   193,
+	  193,   193,   193,   194,   194,   194,   195,   195,   195,   196,
+	  196,   196,   197,   197,   197,   197,   198,   198,   198,   199,
+	  199,   199,   200,   200,   200,   200,   201,   201,   201,   202,
+	  202,   202,   203,   203,   203,   203,   204,   204,   204,   205,
+	  205,   205,   206,   206,   206,   206,   207,   207,   207,   208,
+	  208,   208,   209,   209,   209,   209,   210,   210,   210,   211,
+	  211,   211,   212,   212,   212,   212,   213,   213,   213,   214,
+	  214,   214,   215,   215,   215,   215,   216,   216,   216,   217,
+	  217,   217,   218,   218,   218,   218,   219,   219,   219,   220,
+	  220,   220,   221,   221,   221,   221,   222,   222,   222,   223,
+	  223,   223,   224,   224,   224,   224,   225,   225,   225,   226,
+	  226,   226,   227,   227,   227,   228,   228,   228,   228,   229,
+	  229,   229,   230,   230,   230,   231,   231,   231,   231,   232,
+	  232,   232,   233,   233,   233,   234,   234,   234,   234,   235,
+	  235,   235,   236,   236,   236,   237,   237,   237,   237,   238,
+	  238,   238,   239,   239,   239,   240,   240,   240,   240,   241,
+	  241,   241,   242,   242,   242,   243,   243,   243,   243,   244,
+	  244,   244,   245,   245,   245,   246,   246,   246,   246,   247,
+	  247,   247,   248,   248,   248,   249,   249,   249,   249,   250,
+	  250,   250,   251,   251,   251,   252,   252,   252,   252,   253,
+	  253,   253,   254,   254,   254,   255,   255,   255,   256,   256,
+	  256,   256,   257,   257,   257,   258,   258,   258,   259,   259,
+	  259,   259,   260,   260,   260,   261,   261,   261,   262,   262,
+	  262,   262,   263,   263,   263,   264,   264,   264,   265,   265,
+	  265,   265,   266,   266,   266,   267,   267,   267,   268,   268,
+	  268,   268,   269,   269,   269,   270,   270,   270,   271,   271,
+	  271,   271,   272,   272,   272,   273,   273,   273,   274,   274,
+	  274,   274,   275,   275,   275,   276,   276,   276,   277,   277,
+	  277,   277,   278,   278,   278,   279,   279,   279,   280,   280,
+	  280,   280,   281,   281,   281,   282,   282,   282,   283,   283,
+	  283,   283,   284,   284,   284,   285,   285,   285,   286,   286,
+	  286,   287,   287,   287,   287,   288,   288,   288,   289,   289,
+	  289,   290,   290,   290,   290,   291,   291,   291,   292,   292,
+	  292,   293,   293,   293,   293,   294,   294,   294,   295,   295,
+	  295,   296,   296,   296,   296,   297,   297,   297,   298,   298,
+	  298,   299,   299,   299,   299,   300,   300,   300,   301,   301,
+	  301,   302,   302,   302,   302,   303,   303,   303,   304,   304,
+	  304,   305,   305,   305,   305,   306,   306,   306,   307,   307,
+	  307,   308,   308,   308,   308,   309,   309,   309,   310,   310,
+	  310,   311,   311,   311,   311,   312,   312,   312,   313,   313,
+	  313,   314,   314,   314,   315,   315,   315,   315,   316,   316,
+	  316,   317,   317,   317,   318,   318,   318,   318,   319,   319,
+	  319,   320,   320,   320,   321,   321,   321,   321,   322,   322,
+	  322,   323,   323,   323,   324,   324,   324,   324,   325,   325,
+	  325,   326,   326,   326,   327,   327,   327,   327,   328,   328,
+	  328,   329,   329,   329,   330,   330,   330,   330,   331,   331,
+	  331,   332,   332,   332,   333,   333,   333,   333,   334,   334,
+	  334,   335,   335,   335,   336,   336,   336,   336,   337,   337,
+	  337,   338,   338,   338,   339,   339,   339,   339,   340,   340,
+	  340,   341,   341,   341,   342,   342,   342,   342,   343,   343,
+	  343,   344,   344,   344,   345,   345,   345,   346,   346,   346,
+	  346,   347,   347,   347,   348,   348,   348,   349,   349,   349,
+	  349,   350,   350,   350,   351,   351,   351,   352,   352,   352,
+	  352,   353,   353,   353,   354,   354,   354,   355,   355,   355,
+	  355,   356,   356,   356,   357,   357,   357,   358,   358,   358,
+	  358,   359,   359,   359,   360,   360,   360,   361,   361,   361,
+	  361,   362,   362,   362,   363,   363,   363,   364,   364,   364,
+	  364,   365,   365,   365,   366,   366,   366,   367,   367,   367,
+	  367,   368,   368,   368,   369,   369,   369,   370,   370,   370,
+	  370,   371,   371,   371,   372,   372,   372,   373,   373,   373,
+	  374,   374,   374,   374,   375,   375,   375,   376,   376,   376,
+	  377,   377,   377,   377,   378,   378,   378,   379,   379,   379,
+	  380,   380,   380,   380,   381,   381,   381,   382,   382,   382,
+	  383,   383,   383,   383,   384,   384,   384,   385,   385,   385,
+	  386,   386,   386,   386,   387,   387,   387,   388,   388,   388,
+	  389,   389,   389,   389,   390,   390,   390,   391,   391,   391,
+	  392,   392,   392,   392,   393,   393,   393,   394,   394,   394,
+	  395,   395,   395,   395,   396,   396,   396,   397,   397,   397,
+	  398,   398,   398,   398,   399,   399,   399,   400,   400,   400,
+	  401,   401,   401,   402,   402,   402,   402,   403,   403,   403,
+	  404,   404,   404,   405,   405,   405,   405,   406,   406,   406,
+	  407,   407,   407,   408,   408,   408,   408,   409,   409,   409,
+	  410,   410,   410,   411,   411,   411,   411,   412,   412,   412,
+	  413,   413,   413,   414,   414,   414,   414,   415,   415,   415,
+	  416,   416,   416,   417,   417,   417,   417,   418,   418,   418,
+	  419,   419,   419,   420,   420,   420,   420,   421,   421,   421,
+	  422,   422,   422,   423,   423,   423,   423,   424,   424,   424,
+	  425,   425,   425,   426,   426,   426,   426,   427,   427,   427,
+	  428,   428,   428,   429,   429,   429,   429,   430,   430,   430,
+	  431,   431,   431,   432,   432,   432,   433,   433,   433,   433,
+	  434,   434,   434,   435,   435,   435,   436,   436,   436,   436,
+	  437,   437,   437,   438,   438,   438,   439,   439,   439,   439,
+	  440,   440,   440,   441,   441,   441,   442,   442,   442,   442,
+	  443,   443,   443,   444,   444,   444,   445,   445,   445,   445,
+	  446,   446,   446,   447,   447,   447,   448,   448,   448,   448,
+	  449,   449,   449,   450,   450,   450,   451,   451,   451,   451,
+	  452,   452,   452,   453,   453,   453,   454,   454,   454,   454,
+	  455,   455,   455,   456,   456,   456,   457,   457,   457,   457,
+	  458,   458,   458,   459,   459,   459,   460,   460,   460,   461,
+	  461,   461,   461,   462,   462,   462,   463,   463,   463,   464,
+	  464,   464,   464,   465,   465,   465,   466,   466,   466,   467,
+	  467,   467,   467,   468,   468,   468,   469,   469,   469,   470,
+	  470,   470,   470,   471,   471,   471,   472,   472,   472,   473,
+	  473,   473,   473,   474,   474,   474,   475,   475,   475,   476,
+	  476,   476,   476,   477,   477,   477,   478,   478,   478,   479,
+	  479,   479,   479,   480,   480,   480,   481,   481,   481,   482,
+	  482,   482,   482,   483,   483,   483,   484,   484,   484,   485,
+	  485,   485,   485,   486,   486,   486,   487,   487,   487,   488,
+	  488,   488,   488,   489,   489,   489,   490,   490,   490,   491,
+	  491,   491,   492,   492,   492,   492,   493,   493,   493,   494,
+	  494,   494,   495,   495,   495,   495,   496,   496,   496,   497,
+	  497,   497,   498,   498,   498,   498,   499,   499,   499,   500,
+	  500,   500,   501,   501,   501,   501,   502,   502,   502,   503,
+	  503,   503,   504,   504,   504,   504,   505,   505,   505,   506,
+	  506,   506,   507,   507,   507,   507,   508,   508,   508,   509,
+	  509,   509,   510,   510,   510,   510,   511,   511,   511,   512,
+	  512,   512,   513,   513,   513,   513,   514,   514,   514,   515,
+	  515,   515,   516,   516,   516,   516,   517,   517,   517,   518,
+	  518,   518,   519,   519,   519,   520,   520,   520,   520,   521,
+	  521,   521,   522,   522,   522,   523,   523,   523,   523,   524,
+	  524,   524,   525,   525,   525,   526,   526,   526,   526,   527,
+	  527,   527,   528,   528,   528,   529,   529,   529,   529,   530,
+	  530,   530,   531,   531,   531,   532,   532,   532,   532,   533,
+	  533,   533,   534,   534,   534,   535,   535,   535,   535,   536,
+	  536,   536,   537,   537,   537,   538,   538,   538,   538,   539,
+	  539,   539,   540,   540,   540,   541,   541,   541,   541,   542,
+	  542,   542,   543,   543,   543,   544,   544,   544,   544,   545,
+	  545,   545,   546,   546,   546,   547,   547,   547,   548,   548,
+	  548,   548,   549,   549,   549,   550,   550,   550,   551,   551,
+	  551,   551,   552,   552,   552,   553,   553,   553,   554,   554,
+	  554,   554,   555,   555,   555,   556,   556,   556,   557,   557,
+	  557,   557,   558,   558,   558,   559,   559,   559,   560,   560,
+	  560,   560,   561,   561,   561,   562,   562,   562,   563,   563,
+	  563,   563,   564,   564,   564,   565,   565,   565,   566,   566,
+	  566,   566,   567,   567,   567,   568,   568,   568,   569,   569,
+	  569,   569,   570,   570,   570,   571,   571,   571,   572,   572,
+	  572,   572,   573,   573,   573,   574,   574,   574,   575,   575,
+	  575,   575,   576,   576,   576,   577,   577,   577,   578,   578,
+	  578,   579,   579,   579,   579,   580,   580,   580,   581,   581,
+	  581,   582,   582,   582,   582,   583,   583,   583,   584,   584,
+	  584,   585,   585,   585,   585,   586,   586,   586,   587,   587,
+	  587,   588,   588,   588,   588,   589,   589,   589,   590,   590,
+	  590,   591,   591,   591,   591,   592,   592,   592,   593,   593,
+	  593,   594,   594,   594,   594,   595,   595,   595,   596,   596,
+	  596,   597,   597,   597,   597,   598,   598,   598,   599,   599,
+	  599,   600,   600,   600,   600,   601,   601,   601,   602,   602,
+	  602,   603,   603,   603,   603,   604,   604,   604,   605,   605,
+	  605,   606,   606,   606,   607,   607,   607,   607,   608,   608,
+	  608,   609,   609,   609,   610,   610,   610,   610,   611,   611,
+	  611,   612,   612,   612,   613,   613,   613,   613,   614,   614,
+	  614,   615,   615,   615,   616,   616,   616,   616,   617,   617,
+	  617,   618,   618,   618,   619,   619,   619,   619,   620,   620,
+	  620,   621,   621,   621,   622,   622,   622,   622,   623,   623,
+	  623,   624,   624,   624,   625,   625,   625,   625,   626,   626,
+	  626,   627,   627,   627,   628,   628,   628,   628,   629,   629,
+	  629,   630,   630,   630,   631,   631,   631,   631,   632,   632,
+	  632,   633,   633,   633,   634,   634,   634,   634,   635,   635,
+	  635,   636,   636,   636,   637,   637,   637,   638,   638,   638,
+	  638,   639,   639,   639,   640,   640,   640,   641,   641,   641,
+	  641,   642,   642,   642,   643,   643,   643,   644,   644,   644,
+	  644,   645,   645,   645,   646,   646,   646,   647,   647,   647,
+	  647,   648,   648,   648,   649,   649,   649,   650,   650 };
+ static ULLong pfive[27] = {
+		5ll,
+		25ll,
+		125ll,
+		625ll,
+		3125ll,
+		15625ll,
+		78125ll,
+		390625ll,
+		1953125ll,
+		9765625ll,
+		48828125ll,
+		244140625ll,
+		1220703125ll,
+		6103515625ll,
+		30517578125ll,
+		152587890625ll,
+		762939453125ll,
+		3814697265625ll,
+		19073486328125ll,
+		95367431640625ll,
+		476837158203125ll,
+		2384185791015625ll,
+		11920928955078125ll,
+		59604644775390625ll,
+		298023223876953125ll,
+		1490116119384765625ll,
+		7450580596923828125ll
+		};
+
+ static int pfivebits[25] = {3, 5, 7, 10, 12, 14, 17, 19, 21, 24, 26, 28, 31,
+			     33, 35, 38, 40, 42, 45, 47, 49, 52, 54, 56, 59};
+#endif /*}*/
+#endif /*}} NO_LONG_LONG */
+
+typedef union { double d; ULong L[2];
+#ifdef USE_BF96
+	ULLong LL;
+#endif
+	} U;
 
 #ifdef IEEE_8087
 #define word0(x) (x)->L[1]
@@ -314,6 +1313,7 @@ typedef union { double d; ULong L[2]; } U;
 #define word1(x) (x)->L[1]
 #endif
 #define dval(x) (x)->d
+#define LLval(x) (x)->LL
 
 #ifndef STRTOD_DIGLIM
 #define STRTOD_DIGLIM 40
@@ -471,11 +1471,7 @@ extern int strtod_diglim;
 #ifdef RND_PRODQUOT
 #define rounded_product(a,b) a = rnd_prod(a, b)
 #define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
 extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
 #else
 #define rounded_product(a,b) a *= b
 #define rounded_quotient(a,b) a /= b
@@ -492,34 +1488,17 @@ typedef struct BCinfo BCinfo;
  struct
 BCinfo { int dp0, dp1, dplen, dsign, e0, inexact, nd, nd0, rounding, scale, uflchk; };
 
-#ifdef KR_headers
-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
-#else
 #define FFFFFFFF 0xffffffffUL
-#endif
-
-#ifdef NO_LONG_LONG
-#undef ULLong
-#ifdef Just_16
-#undef Pack_32
-/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.
- * This makes some inner loops simpler and sometimes saves work
- * during multiplications, but it often seems to make things slightly
- * slower.  Hence the default is now to store 32 bits per Long.
- */
-#endif
-#else	/* long long available */
-#ifndef Llong
-#define Llong long long
-#endif
-#ifndef ULLong
-#define ULLong unsigned Llong
-#endif
-#endif /* NO_LONG_LONG */
 
-#ifndef MULTIPLE_THREADS
-#define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
-#define FREE_DTOA_LOCK(n)	/*nothing*/
+#ifdef MULTIPLE_THREADS
+#define MTa , PTI
+#define MTb , &TI
+#define MTd , ThInfo **PTI
+static unsigned int maxthreads = 0;
+#else
+#define MTa /*nothing*/
+#define MTb /*nothing*/
+#define MTd /*nothing*/
 #endif
 
 #define Kmax 7
@@ -538,24 +1517,77 @@ Bigint {
 	};
 
  typedef struct Bigint Bigint;
+ typedef struct
+ThInfo {
+	Bigint *Freelist[Kmax+1];
+	Bigint *P5s;
+	} ThInfo;
 
- static Bigint *freelist[Kmax+1];
+ static ThInfo TI0;
 
- static Bigint *
-Balloc
-#ifdef KR_headers
-	(k) int k;
+#ifdef MULTIPLE_THREADS
+ static ThInfo *TI1;
+ static int TI0_used;
+
+ void
+set_max_dtoa_threads(unsigned int n)
+{
+	size_t L;
+
+	if (n > maxthreads) {
+		L = n*sizeof(ThInfo);
+		if (TI1) {
+			TI1 = (ThInfo*)REALLOC(TI1, L);
+			memset(TI1 + maxthreads, 0, (n-maxthreads)*sizeof(ThInfo));
+			}
+		else {
+			TI1 = (ThInfo*)MALLOC(L);
+			if (TI0_used) {
+				memcpy(TI1, &TI0, sizeof(ThInfo));
+				if (n > 1)
+					memset(TI1 + 1, 0, L - sizeof(ThInfo));
+				memset(&TI0, 0, sizeof(ThInfo));
+				}
+			else
+				memset(TI1, 0, L);
+			}
+		maxthreads = n;
+		}
+	}
+
+ static ThInfo*
+get_TI(void)
+{
+	unsigned int thno = dtoa_get_threadno();
+	if (thno < maxthreads)
+		return TI1 + thno;
+	if (thno == 0)
+		TI0_used = 1;
+	return &TI0;
+	}
+#define freelist TI->Freelist
+#define p5s TI->P5s
 #else
-	(int k)
+#define freelist TI0.Freelist
+#define p5s TI0.P5s
 #endif
+
+ static Bigint *
+Balloc(int k MTd)
 {
 	int x;
 	Bigint *rv;
 #ifndef Omit_Private_Memory
 	unsigned int len;
 #endif
+#ifdef MULTIPLE_THREADS
+	ThInfo *TI;
 
-	ACQUIRE_DTOA_LOCK(0);
+	if (!(TI = *PTI))
+		*PTI = TI = get_TI();
+	if (TI == &TI0)
+		ACQUIRE_DTOA_LOCK(0);
+#endif
 	/* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */
 	/* but this case seems very unlikely. */
 	if (k <= Kmax && (rv = freelist[k]))
@@ -567,7 +1599,11 @@ Balloc
 #else
 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
 			/sizeof(double);
-		if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
+		if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem
+#ifdef MULTIPLE_THREADS
+			&& TI == TI1
+#endif
+			) {
 			rv = (Bigint*)pmem_next;
 			pmem_next += len;
 			}
@@ -577,31 +1613,36 @@ Balloc
 		rv->k = k;
 		rv->maxwds = x;
 		}
-	FREE_DTOA_LOCK(0);
+#ifdef MULTIPLE_THREADS
+	if (TI == &TI0)
+		FREE_DTOA_LOCK(0);
+#endif
 	rv->sign = rv->wds = 0;
 	return rv;
 	}
 
  static void
-Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
-	(Bigint *v)
-#endif
+Bfree(Bigint *v MTd)
 {
+#ifdef MULTIPLE_THREADS
+	ThInfo *TI;
+#endif
 	if (v) {
 		if (v->k > Kmax)
-#ifdef FREE
 			FREE((void*)v);
-#else
-			free((void*)v);
-#endif
 		else {
-			ACQUIRE_DTOA_LOCK(0);
+#ifdef MULTIPLE_THREADS
+			if (!(TI = *PTI))
+				*PTI = TI = get_TI();
+			if (TI == &TI0)
+				ACQUIRE_DTOA_LOCK(0);
+#endif
 			v->next = freelist[v->k];
 			freelist[v->k] = v;
-			FREE_DTOA_LOCK(0);
+#ifdef MULTIPLE_THREADS
+			if (TI == &TI0)
+				FREE_DTOA_LOCK(0);
+#endif
 			}
 		}
 	}
@@ -610,12 +1651,7 @@ Bfree
 y->wds*sizeof(Long) + 2*sizeof(int))
 
  static Bigint *
-multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
-	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
+multadd(Bigint *b, int m, int a MTd)	/* multiply by m and add a */
 {
 	int i, wds;
 #ifdef ULLong
@@ -655,9 +1691,9 @@ multadd
 		while(++i < wds);
 	if (carry) {
 		if (wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
+			b1 = Balloc(b->k+1 MTa);
 			Bcopy(b1, b);
-			Bfree(b);
+			Bfree(b MTa);
 			b = b1;
 			}
 		b->x[wds++] = carry;
@@ -667,12 +1703,7 @@ multadd
 	}
 
  static Bigint *
-s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9, dplen) CONST char *s; int nd0, nd, dplen; ULong y9;
-#else
-	(const char *s, int nd0, int nd, ULong y9, int dplen)
-#endif
+s2b(const char *s, int nd0, int nd, ULong y9, int dplen MTd)
 {
 	Bigint *b;
 	int i, k;
@@ -681,11 +1712,11 @@ s2b
 	x = (nd + 8) / 9;
 	for(k = 0, y = 1; x > y; y <<= 1, k++) ;
 #ifdef Pack_32
-	b = Balloc(k);
+	b = Balloc(k MTa);
 	b->x[0] = y9;
 	b->wds = 1;
 #else
-	b = Balloc(k+1);
+	b = Balloc(k+1 MTa);
 	b->x[0] = y9 & 0xffff;
 	b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
 #endif
@@ -693,24 +1724,19 @@ s2b
 	i = 9;
 	if (9 < nd0) {
 		s += 9;
-		do b = multadd(b, 10, *s++ - '0');
+		do b = multadd(b, 10, *s++ - '0' MTa);
 			while(++i < nd0);
 		s += dplen;
 		}
 	else
 		s += dplen + 9;
 	for(; i < nd; i++)
-		b = multadd(b, 10, *s++ - '0');
+		b = multadd(b, 10, *s++ - '0' MTa);
 	return b;
 	}
 
  static int
-hi0bits
-#ifdef KR_headers
-	(x) ULong x;
-#else
-	(ULong x)
-#endif
+hi0bits(ULong x)
 {
 	int k = 0;
 
@@ -739,12 +1765,7 @@ hi0bits
 	}
 
  static int
-lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
-	(ULong *y)
-#endif
+lo0bits(ULong *y)
 {
 	int k;
 	ULong x = *y;
@@ -787,28 +1808,18 @@ lo0bits
 	}
 
  static Bigint *
-i2b
-#ifdef KR_headers
-	(i) int i;
-#else
-	(int i)
-#endif
+i2b(int i MTd)
 {
 	Bigint *b;
 
-	b = Balloc(1);
+	b = Balloc(1 MTa);
 	b->x[0] = i;
 	b->wds = 1;
 	return b;
 	}
 
  static Bigint *
-mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
+mult(Bigint *a, Bigint *b MTd)
 {
 	Bigint *c;
 	int k, wa, wb, wc;
@@ -834,7 +1845,7 @@ mult
 	wc = wa + wb;
 	if (wc > a->maxwds)
 		k++;
-	c = Balloc(k);
+	c = Balloc(k MTa);
 	for(x = c->x, xa = x + wc; x < xa; x++)
 		*x = 0;
 	xa = a->x;
@@ -912,55 +1923,63 @@ mult
 	return c;
 	}
 
- static Bigint *p5s;
-
  static Bigint *
-pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
+pow5mult(Bigint *b, int k MTd)
 {
 	Bigint *b1, *p5, *p51;
+#ifdef MULTIPLE_THREADS
+	ThInfo *TI;
+#endif
 	int i;
 	static int p05[3] = { 5, 25, 125 };
 
 	if ((i = k & 3))
-		b = multadd(b, p05[i-1], 0);
+		b = multadd(b, p05[i-1], 0 MTa);
 
 	if (!(k >>= 2))
 		return b;
+#ifdef  MULTIPLE_THREADS
+	if (!(TI = *PTI))
+		*PTI = TI = get_TI();
+#endif
 	if (!(p5 = p5s)) {
 		/* first time */
 #ifdef MULTIPLE_THREADS
-		ACQUIRE_DTOA_LOCK(1);
+		if (!(TI = *PTI))
+			*PTI = TI = get_TI();
+		if (TI == &TI0)
+			ACQUIRE_DTOA_LOCK(1);
 		if (!(p5 = p5s)) {
-			p5 = p5s = i2b(625);
+			p5 = p5s = i2b(625 MTa);
 			p5->next = 0;
 			}
-		FREE_DTOA_LOCK(1);
+		if (TI == &TI0)
+			FREE_DTOA_LOCK(1);
 #else
-		p5 = p5s = i2b(625);
+		p5 = p5s = i2b(625 MTa);
 		p5->next = 0;
 #endif
 		}
 	for(;;) {
 		if (k & 1) {
-			b1 = mult(b, p5);
-			Bfree(b);
+			b1 = mult(b, p5 MTa);
+			Bfree(b MTa);
 			b = b1;
 			}
 		if (!(k >>= 1))
 			break;
 		if (!(p51 = p5->next)) {
 #ifdef MULTIPLE_THREADS
-			ACQUIRE_DTOA_LOCK(1);
+			if (!TI && !(TI = *PTI))
+				*PTI = TI = get_TI();
+			if (TI == &TI0)
+				ACQUIRE_DTOA_LOCK(1);
 			if (!(p51 = p5->next)) {
-				p51 = p5->next = mult(p5,p5);
+				p51 = p5->next = mult(p5,p5 MTa);
 				p51->next = 0;
 				}
-			FREE_DTOA_LOCK(1);
+			if (TI == &TI0)
+				FREE_DTOA_LOCK(1);
 #else
 			p51 = p5->next = mult(p5,p5);
 			p51->next = 0;
@@ -972,12 +1991,7 @@ pow5mult
 	}
 
  static Bigint *
-lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
+lshift(Bigint *b, int k MTd)
 {
 	int i, k1, n, n1;
 	Bigint *b1;
@@ -992,7 +2006,7 @@ lshift
 	n1 = n + b->wds + 1;
 	for(i = b->maxwds; n1 > i; i <<= 1)
 		k1++;
-	b1 = Balloc(k1);
+	b1 = Balloc(k1 MTa);
 	x1 = b1->x;
 	for(i = 0; i < n; i++)
 		*x1++ = 0;
@@ -1027,17 +2041,12 @@ lshift
 		*x1++ = *x++;
 		while(x < xe);
 	b1->wds = n1 - 1;
-	Bfree(b);
+	Bfree(b MTa);
 	return b1;
 	}
 
  static int
-cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
+cmp(Bigint *a, Bigint *b)
 {
 	ULong *xa, *xa0, *xb, *xb0;
 	int i, j;
@@ -1066,12 +2075,7 @@ cmp
 	}
 
  static Bigint *
-diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
+diff(Bigint *a, Bigint *b MTd)
 {
 	Bigint *c;
 	int i, wa, wb;
@@ -1087,7 +2091,7 @@ diff
 
 	i = cmp(a,b);
 	if (!i) {
-		c = Balloc(0);
+		c = Balloc(0 MTa);
 		c->wds = 1;
 		c->x[0] = 0;
 		return c;
@@ -1100,7 +2104,7 @@ diff
 		}
 	else
 		i = 0;
-	c = Balloc(a->k);
+	c = Balloc(a->k MTa);
 	c->sign = i;
 	wa = a->wds;
 	xa = a->x;
@@ -1160,12 +2164,7 @@ diff
 	}
 
  static double
-ulp
-#ifdef KR_headers
-	(x) U *x;
-#else
-	(U *x)
-#endif
+ulp(U *x)
 {
 	Long L;
 	U u;
@@ -1202,12 +2201,7 @@ ulp
 	}
 
  static double
-b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
-	(Bigint *a, int *e)
-#endif
+b2d(Bigint *a, int *e)
 {
 	ULong *xa, *xa0, w, y, z;
 	int k;
@@ -1272,12 +2266,7 @@ b2d
 	}
 
  static Bigint *
-d2b
-#ifdef KR_headers
-	(d, e, bits) U *d; int *e, *bits;
-#else
-	(U *d, int *e, int *bits)
-#endif
+d2b(U *d, int *e, int *bits MTd)
 {
 	Bigint *b;
 	int de, k;
@@ -1295,9 +2284,9 @@ d2b
 #endif
 
 #ifdef Pack_32
-	b = Balloc(1);
+	b = Balloc(1 MTa);
 #else
-	b = Balloc(2);
+	b = Balloc(2 MTa);
 #endif
 	x = b->x;
 
@@ -1406,12 +2395,7 @@ d2b
 #undef d1
 
  static double
-ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
+ratio(Bigint *a, Bigint *b)
 {
 	U da, db;
 	int k, ka, kb;
@@ -1446,7 +2430,7 @@ ratio
 	return dval(&da) / dval(&db);
 	}
 
- static CONST double
+ static const double
 tens[] = {
 		1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
 		1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
@@ -1456,10 +2440,10 @@ tens[] = {
 #endif
 		};
 
- static CONST double
+ static const double
 #ifdef IEEE_Arith
 bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
+static const double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
 #ifdef Avoid_Underflow
 		9007199254740992.*9007199254740992.e-256
 		/* = 2^106 * 1e-256 */
@@ -1474,11 +2458,11 @@ static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
 #else
 #ifdef IBM
 bigtens[] = { 1e16, 1e32, 1e64 };
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64 };
+static const double tinytens[] = { 1e-16, 1e-32, 1e-64 };
 #define n_bigtens 3
 #else
 bigtens[] = { 1e16, 1e32 };
-static CONST double tinytens[] = { 1e-16, 1e-32 };
+static const double tinytens[] = { 1e-16, 1e-32 };
 #define n_bigtens 2
 #endif
 #endif
@@ -1497,14 +2481,11 @@ static CONST double tinytens[] = { 1e-16, 1e-32 };
 #endif
 
 #ifdef Need_Hexdig /*{*/
+#if 0
 static unsigned char hexdig[256];
 
  static void
-#ifdef KR_headers
-htinit(h, s, inc) unsigned char *h; unsigned char *s; int inc;
-#else
 htinit(unsigned char *h, unsigned char *s, int inc)
-#endif
 {
 	int i, j;
 	for(i = 0; (j = s[i]) !=0; i++)
@@ -1512,17 +2493,34 @@ htinit(unsigned char *h, unsigned char *s, int inc)
 	}
 
  static void
-#ifdef KR_headers
-hexdig_init()
-#else
-hexdig_init(void)
-#endif
+hexdig_init(void)	/* Use of hexdig_init omitted 20121220 to avoid a */
+			/* race condition when multiple threads are used. */
 {
 #define USC (unsigned char *)
 	htinit(hexdig, USC "0123456789", 0x10);
 	htinit(hexdig, USC "abcdef", 0x10 + 10);
 	htinit(hexdig, USC "ABCDEF", 0x10 + 10);
 	}
+#else
+static unsigned char hexdig[256] = {
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	16,17,18,19,20,21,22,23,24,25,0,0,0,0,0,0,
+	0,26,27,28,29,30,31,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,26,27,28,29,30,31,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+	};
+#endif
 #endif /* } Need_Hexdig */
 
 #ifdef INFNAN_CHECK
@@ -1536,15 +2534,10 @@ hexdig_init(void)
 #endif
 
  static int
-match
-#ifdef KR_headers
-	(sp, t) char **sp, *t;
-#else
-	(const char **sp, const char *t)
-#endif
+match(const char **sp, const char *t)
 {
 	int c, d;
-	CONST char *s = *sp;
+	const char *s = *sp;
 
 	while((d = *t++)) {
 		if ((c = *++s) >= 'A' && c <= 'Z')
@@ -1558,29 +2551,23 @@ match
 
 #ifndef No_Hex_NaN
  static void
-hexnan
-#ifdef KR_headers
-	(rvp, sp) U *rvp; CONST char **sp;
-#else
-	(U *rvp, const char **sp)
-#endif
+hexnan(U *rvp, const char **sp)
 {
 	ULong c, x[2];
-	CONST char *s;
+	const char *s;
 	int c1, havedig, udx0, xshift;
 
-	if (!hexdig['0'])
-		hexdig_init();
+	/**** if (!hexdig['0']) hexdig_init(); ****/
 	x[0] = x[1] = 0;
 	havedig = xshift = 0;
 	udx0 = 1;
 	s = *sp;
 	/* allow optional initial 0x or 0X */
-	while((c = *(CONST unsigned char*)(s+1)) && c <= ' ')
+	while((c = *(const unsigned char*)(s+1)) && c <= ' ')
 		++s;
 	if (s[1] == '0' && (s[2] == 'x' || s[2] == 'X'))
 		s += 2;
-	while((c = *(CONST unsigned char*)++s)) {
+	while((c = *(const unsigned char*)++s)) {
 		if ((c1 = hexdig[c]))
 			c  = c1 & 0xf;
 		else if (c <= ' ') {
@@ -1638,11 +2625,7 @@ hexnan
 
 #if !defined(NO_HEX_FP) || defined(Honor_FLT_ROUNDS) /*{*/
  static Bigint *
-#ifdef KR_headers
-increment(b) Bigint *b;
-#else
-increment(Bigint *b)
-#endif
+increment(Bigint *b MTd)
 {
 	ULong *x, *xe;
 	Bigint *b1;
@@ -1658,9 +2641,9 @@ increment(Bigint *b)
 		} while(x < xe);
 	{
 		if (b->wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
+			b1 = Balloc(b->k+1 MTa);
 			Bcopy(b1,b);
-			Bfree(b);
+			Bfree(b MTa);
 			b = b1;
 			}
 		b->x[b->wds++] = 1;
@@ -1673,11 +2656,7 @@ increment(Bigint *b)
 #ifndef NO_HEX_FP /*{*/
 
  static void
-#ifdef KR_headers
-rshift(b, k) Bigint *b; int k;
-#else
 rshift(Bigint *b, int k)
-#endif
 {
 	ULong *x, *x1, *xe, y;
 	int n;
@@ -1706,11 +2685,7 @@ rshift(Bigint *b, int k)
 	}
 
  static ULong
-#ifdef KR_headers
-any_on(b, k) Bigint *b; int k;
-#else
 any_on(Bigint *b, int k)
-#endif
 {
 	int n, nwds;
 	ULong *x, *x0, x1, x2;
@@ -1743,15 +2718,10 @@ enum {	/* rounding values: same as FLT_ROUNDS */
 	};
 
  void
-#ifdef KR_headers
-gethex(sp, rvp, rounding, sign)
-	CONST char **sp; U *rvp; int rounding, sign;
-#else
-gethex( CONST char **sp, U *rvp, int rounding, int sign)
-#endif
+gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 {
 	Bigint *b;
-	CONST unsigned char *decpt, *s0, *s, *s1;
+	const unsigned char *decpt, *s0, *s, *s1;
 	Long e, e1;
 	ULong L, lostbits, *x;
 	int big, denorm, esign, havedig, k, n, nbits, up, zret;
@@ -1783,8 +2753,8 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 	if (!(s0 = decimalpoint_cache)) {
 		s0 = (unsigned char*)localeconv()->decimal_point;
 		if ((decimalpoint_cache = (unsigned char*)
-				MALLOC(strlen((CONST char*)s0) + 1))) {
-			strcpy((char*)decimalpoint_cache, (CONST char*)s0);
+				MALLOC(strlen((const char*)s0) + 1))) {
+			strcpy((char*)decimalpoint_cache, (const char*)s0);
 			s0 = decimalpoint_cache;
 			}
 		}
@@ -1792,10 +2762,9 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 #endif
 #endif
 
-	if (!hexdig['0'])
-		hexdig_init();
+	/**** if (!hexdig['0']) hexdig_init(); ****/
 	havedig = 0;
-	s0 = *(CONST unsigned char **)sp + 2;
+	s0 = *(const unsigned char **)sp + 2;
 	while(s0[havedig] == '0')
 		havedig++;
 	s0 += havedig;
@@ -1893,10 +2862,10 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 #endif
 			goto retz;
 #ifdef IEEE_Arith
+ ret_tinyf:
+			Bfree(b MTa);
  ret_tiny:
-#ifndef NO_ERRNO
-			errno = ERANGE;
-#endif
+			Set_errno(ERANGE);
 			word0(rvp) = 0;
 			word1(rvp) = 1;
 			return;
@@ -1922,7 +2891,7 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 	n = s1 - s0 - 1;
 	for(k = 0; n > (1 << (kshift-2)) - 1; n >>= 1)
 		k++;
-	b = Balloc(k);
+	b = Balloc(k MTa);
 	x = b->x;
 	n = 0;
 	L = 0;
@@ -1969,16 +2938,27 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 		}
 	else if (n < nbits) {
 		n = nbits - n;
-		b = lshift(b, n);
+		b = lshift(b, n MTa);
 		e -= n;
 		x = b->x;
 		}
-	if (e > Emax) {
+	if (e > emax) {
  ovfl:
-		Bfree(b);
+		Bfree(b MTa);
  ovfl1:
-#ifndef NO_ERRNO
-		errno = ERANGE;
+		Set_errno(ERANGE);
+#ifdef Honor_FLT_ROUNDS
+		switch (rounding) {
+		  case Round_zero:
+			goto ret_big;
+		  case Round_down:
+			if (!sign)
+				goto ret_big;
+			break;
+		  case Round_up:
+			if (sign)
+				goto ret_big;
+		  }
 #endif
 		word0(rvp) = Exp_mask;
 		word1(rvp) = 0;
@@ -1992,23 +2972,21 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 #ifdef IEEE_Arith /*{*/
 			switch (rounding) {
 			  case Round_near:
-				if (n == nbits && (n < 2 || any_on(b,n-1)))
-					goto ret_tiny;
+				if (n == nbits && (n < 2 || lostbits || any_on(b,n-1)))
+					goto ret_tinyf;
 				break;
 			  case Round_up:
 				if (!sign)
-					goto ret_tiny;
+					goto ret_tinyf;
 				break;
 			  case Round_down:
 				if (sign)
-					goto ret_tiny;
+					goto ret_tinyf;
 			  }
 #endif /* } IEEE_Arith */
-			Bfree(b);
+			Bfree(b MTa);
  retz:
-#ifndef NO_ERRNO
-			errno = ERANGE;
-#endif
+			Set_errno(ERANGE);
  retz1:
 			rvp->d = 0.;
 			return;
@@ -2042,7 +3020,7 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 		  }
 		if (up) {
 			k = b->wds;
-			b = increment(b);
+			b = increment(b MTa);
 			x = b->x;
 			if (denorm) {
 #if 0
@@ -2099,16 +3077,12 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
 	word0(rvp) = ((b->x[1] & ~0x800000) >> 16) | ((e + 129 + 55) << 7) | (b->x[1] << 16);
 	word1(rvp) = (b->x[0] >> 16) | (b->x[0] << 16);
 #endif
-	Bfree(b);
+	Bfree(b MTa);
 	}
 #endif /*!NO_HEX_FP}*/
 
  static int
-#ifdef KR_headers
-dshift(b, p2) Bigint *b; int p2;
-#else
 dshift(Bigint *b, int p2)
-#endif
 {
 	int rv = hi0bits(b->x[b->wds-1]) - 4;
 	if (p2 > 0)
@@ -2117,12 +3091,7 @@ dshift(Bigint *b, int p2)
 	}
 
  static int
-quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
-	(Bigint *b, Bigint *S)
-#endif
+quorem(Bigint *b, Bigint *S)
 {
 	int n;
 	ULong *bx, *bxe, q, *sx, *sxe;
@@ -2242,12 +3211,7 @@ quorem
 
 #if defined(Avoid_Underflow) || !defined(NO_STRTOD_BIGCOMP) /*{*/
  static double
-sulp
-#ifdef KR_headers
-	(x, bc) U *x; BCinfo *bc;
-#else
-	(U *x, BCinfo *bc)
-#endif
+sulp(U *x, BCinfo *bc)
 {
 	U u;
 	double rv;
@@ -2264,13 +3228,7 @@ sulp
 
 #ifndef NO_STRTOD_BIGCOMP
  static void
-bigcomp
-#ifdef KR_headers
-	(rv, s0, bc)
-	U *rv; CONST char *s0; BCinfo *bc;
-#else
-	(U *rv, const char *s0, BCinfo *bc)
-#endif
+bigcomp(U *rv, const char *s0, BCinfo *bc MTd)
 {
 	Bigint *b, *d;
 	int b2, bbits, d2, dd, dig, dsign, i, j, nd, nd0, p2, p5, speccase;
@@ -2283,7 +3241,7 @@ bigcomp
 #ifndef Sudden_Underflow
 	if (rv->d == 0.) {	/* special case: value near underflow-to-zero */
 				/* threshold was rounded to zero */
-		b = i2b(1);
+		b = i2b(1 MTa);
 		p2 = Emin - P + 1;
 		bbits = 1;
 #ifdef Avoid_Underflow
@@ -2304,7 +3262,7 @@ bigcomp
 		}
 	else
 #endif
-		b = d2b(rv, &p2, &bbits);
+		b = d2b(rv, &p2, &bbits MTa);
 #ifdef Avoid_Underflow
 	p2 -= bc->scale;
 #endif
@@ -2313,8 +3271,8 @@ bigcomp
 	i = P - bbits;
 	if (i > (j = P - Emin - 1 + p2)) {
 #ifdef Sudden_Underflow
-		Bfree(b);
-		b = i2b(1);
+		Bfree(b MTa);
+		b = i2b(1 MTa);
 		p2 = Emin;
 		i = P - 1;
 #ifdef Avoid_Underflow
@@ -2330,28 +3288,28 @@ bigcomp
 #ifdef Honor_FLT_ROUNDS
 	if (bc->rounding != 1) {
 		if (i > 0)
-			b = lshift(b, i);
+			b = lshift(b, i MTa);
 		if (dsign)
-			b = increment(b);
+			b = increment(b MTa);
 		}
 	else
 #endif
 		{
-		b = lshift(b, ++i);
+		b = lshift(b, ++i MTa);
 		b->x[0] |= 1;
 		}
 #ifndef Sudden_Underflow
  have_i:
 #endif
 	p2 -= p5 + i;
-	d = i2b(1);
+	d = i2b(1 MTa);
 	/* Arrange for convenient computation of quotients:
 	 * shift left if necessary so divisor has 4 leading 0 bits.
 	 */
 	if (p5 > 0)
-		d = pow5mult(d, p5);
+		d = pow5mult(d, p5 MTa);
 	else if (p5 < 0)
-		b = pow5mult(b, -p5);
+		b = pow5mult(b, -p5 MTa);
 	if (p2 > 0) {
 		b2 = p2;
 		d2 = 0;
@@ -2362,15 +3320,15 @@ bigcomp
 		}
 	i = dshift(d, d2);
 	if ((b2 += i) > 0)
-		b = lshift(b, b2);
+		b = lshift(b, b2 MTa);
 	if ((d2 += i) > 0)
-		d = lshift(d, d2);
+		d = lshift(d, d2 MTa);
 
 	/* Now b/d = exactly half-way between the two floating-point values */
 	/* on either side of the input string.  Compute first digit of b/d. */
 
 	if (!(dig = quorem(b,d))) {
-		b = multadd(b, 10, 0);	/* very unlikely */
+		b = multadd(b, 10, 0 MTa);	/* very unlikely */
 		dig = quorem(b,d);
 		}
 
@@ -2384,7 +3342,7 @@ bigcomp
 				dd = 1;
 			goto ret;
 			}
-		b = multadd(b, 10, 0);
+		b = multadd(b, 10, 0 MTa);
 		dig = quorem(b,d);
 		}
 	for(j = bc->dp1; i++ < nd;) {
@@ -2395,14 +3353,14 @@ bigcomp
 				dd = 1;
 			goto ret;
 			}
-		b = multadd(b, 10, 0);
+		b = multadd(b, 10, 0 MTa);
 		dig = quorem(b,d);
 		}
-	if (b->x[0] || b->wds > 1)
+	if (dig > 0 || b->x[0] || b->wds > 1)
 		dd = -1;
  ret:
-	Bfree(b);
-	Bfree(d);
+	Bfree(b MTa);
+	Bfree(d MTa);
 #ifdef Honor_FLT_ROUNDS
 	if (bc->rounding != 1) {
 		if (dd < 0) {
@@ -2451,10 +3409,10 @@ bigcomp
 		if ((j = ((word0(rv) & Exp_mask) >> Exp_shift) - bc->scale) <= 0) {
 			i = 1 - j;
 			if (i <= 31) {
-				if (word1(rv) & (0x1U << i))
+				if (word1(rv) & (0x1 << i))
 					goto odd;
 				}
-			else if (word0(rv) & (0x1U << (i-32)))
+			else if (word0(rv) & (0x1 << (i-32)))
 				goto odd;
 			}
 		else if (word1(rv) & 1) {
@@ -2473,26 +3431,22 @@ bigcomp
 #endif /* NO_STRTOD_BIGCOMP */
 
  double
-fpconv_strtod
-#ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
-#else
-	(const char *s00, char **se)
-#endif
+fpconv_strtod(const char *s00, char **se)
 {
 	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1;
 	int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign;
-	CONST char *s, *s0, *s1;
+	const char *s, *s0, *s1;
 	double aadj, aadj1;
 	Long L;
 	U aadj2, adj, rv, rv0;
 	ULong y, z;
 	BCinfo bc;
-	Bigint *bb1, *bd0;
-	Bigint *bb = NULL;
-	Bigint *bd = NULL;
-	Bigint *bs = NULL;
-	Bigint *delta = NULL;
+	Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
+#ifdef USE_BF96
+	ULLong bhi, blo, brv, t00, t01, t02, t10, t11, terv, tg, tlo, yz;
+	const BF96 *p10;
+	int bexact, erv;
+#endif
 #ifdef Avoid_Underflow
 	ULong Lsb, Lsb1;
 #endif
@@ -2502,6 +3456,9 @@ fpconv_strtod
 #ifndef NO_STRTOD_BIGCOMP
 	int req_bigcomp = 0;
 #endif
+#ifdef MULTIPLE_THREADS
+	ThInfo *TI = 0;
+#endif
 #ifdef Honor_FLT_ROUNDS /*{*/
 #ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
 	bc.rounding = Flt_Rounds;
@@ -2515,7 +3472,7 @@ fpconv_strtod
 #endif /*}}*/
 #endif /*}*/
 #ifdef USE_LOCALE
-	CONST char *s2;
+	const char *s2;
 #endif
 
 	sign = nz0 = nz1 = nz = bc.dplen = bc.uflchk = 0;
@@ -2547,9 +3504,9 @@ fpconv_strtod
 		  case 'x':
 		  case 'X':
 #ifdef Honor_FLT_ROUNDS
-			gethex(&s, &rv, bc.rounding, sign);
+			gethex(&s, &rv, bc.rounding, sign MTb);
 #else
-			gethex(&s, &rv, 1, sign);
+			gethex(&s, &rv, 1, sign MTb);
 #endif
 			goto ret;
 		  }
@@ -2560,12 +3517,20 @@ fpconv_strtod
 			goto ret;
 		}
 	s0 = s;
+	nd = nf = 0;
+#ifdef USE_BF96
+	yz = 0;
+	for(; (c = *s) >= '0' && c <= '9'; nd++, s++)
+		if (nd < 19)
+			yz = 10*yz + c - '0';
+#else
 	y = z = 0;
-	for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
+	for(; (c = *s) >= '0' && c <= '9'; nd++, s++)
 		if (nd < 9)
 			y = 10*y + c - '0';
-		else if (nd < 16)
+		else if (nd < DBL_DIG + 2)
 			z = 10*z + c - '0';
+#endif
 	nd0 = nd;
 	bc.dp0 = bc.dp1 = s - s0;
 	for(s1 = s; s1 > s0 && *--s1 == '0'; )
@@ -2611,15 +3576,26 @@ fpconv_strtod
 			nz++;
 			if (c -= '0') {
 				nf += nz;
-				for(i = 1; i < nz; i++)
+				i = 1;
+#ifdef USE_BF96
+				for(; i < nz; ++i) {
+					if (++nd <= 19)
+						yz *= 10;
+					}
+				if (++nd <= 19)
+					yz = 10*yz + c;
+#else
+				for(; i < nz; ++i) {
 					if (nd++ < 9)
 						y *= 10;
-					else if (nd <= DBL_DIG + 1)
+					else if (nd <= DBL_DIG + 2)
 						z *= 10;
+					}
 				if (nd++ < 9)
 					y = 10*y + c;
-				else if (nd <= DBL_DIG + 1)
+				else if (nd <= DBL_DIG + 2)
 					z = 10*z + c;
+#endif
 				nz = nz1 = 0;
 				}
 			}
@@ -2664,7 +3640,7 @@ fpconv_strtod
 		}
 	if (!nd) {
 		if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
+#ifdef INFNAN_CHECK /*{*/
 			/* Check for Nan and Infinity */
 			if (!bc.dplen)
 			 switch(c) {
@@ -2691,7 +3667,7 @@ fpconv_strtod
 					goto ret;
 					}
 			  }
-#endif /* INFNAN_CHECK */
+#endif /*} INFNAN_CHECK */
  ret0:
 			s = s00;
 			sign = 0;
@@ -2707,7 +3683,8 @@ fpconv_strtod
 
 	if (!nd0)
 		nd0 = nd;
-	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
+#ifndef USE_BF96
+	k = nd < DBL_DIG + 2 ? nd : DBL_DIG + 2;
 	dval(&rv) = y;
 	if (k > 9) {
 #ifdef SET_INEXACT
@@ -2716,6 +3693,7 @@ fpconv_strtod
 #endif
 		dval(&rv) = tens[k - 9] * dval(&rv) + z;
 		}
+#endif
 	bd0 = 0;
 	if (nd <= DBL_DIG
 #ifndef RND_PRODQUOT
@@ -2724,11 +3702,18 @@ fpconv_strtod
 #endif
 #endif
 			) {
+#ifdef USE_BF96
+		dval(&rv) = yz;
+#endif
 		if (!e)
 			goto ret;
 #ifndef ROUND_BIASED_without_Round_Up
 		if (e > 0) {
 			if (e <= Ten_pmax) {
+#ifdef SET_INEXACT
+				bc.inexact = 0;
+				oldinexact = 1;
+#endif
 #ifdef VAX
 				goto vax_ovfl_check;
 #else
@@ -2748,6 +3733,10 @@ fpconv_strtod
 				/* A fancier test would sometimes let us do
 				 * this for larger i values.
 				 */
+#ifdef SET_INEXACT
+				bc.inexact = 0;
+				oldinexact = 1;
+#endif
 #ifdef Honor_FLT_ROUNDS
 				/* round correctly FLT_ROUNDS = 2 or 3 */
 				if (sign) {
@@ -2776,6 +3765,10 @@ fpconv_strtod
 			}
 #ifndef Inaccurate_Divide
 		else if (e >= -Ten_pmax) {
+#ifdef SET_INEXACT
+				bc.inexact = 0;
+				oldinexact = 1;
+#endif
 #ifdef Honor_FLT_ROUNDS
 			/* round correctly FLT_ROUNDS = 2 or 3 */
 			if (sign) {
@@ -2789,16 +3782,18 @@ fpconv_strtod
 #endif
 #endif /* ROUND_BIASED_without_Round_Up */
 		}
-	e1 += nd - k;
+#ifdef USE_BF96
+	k = nd < 19 ? nd : 19;
+#endif
+	e1 += nd - k;	/* scale factor = 10^e1 */
 
 #ifdef IEEE_Arith
 #ifdef SET_INEXACT
 	bc.inexact = 1;
+#ifndef USE_BF96
 	if (k <= DBL_DIG)
-		oldinexact = get_inexact();
 #endif
-#ifdef Avoid_Underflow
-	bc.scale = 0;
+		oldinexact = get_inexact();
 #endif
 #ifdef Honor_FLT_ROUNDS
 	if (bc.rounding >= 2) {
@@ -2811,29 +3806,338 @@ fpconv_strtod
 #endif
 #endif /*IEEE_Arith*/
 
-	/* Get starting approximation = rv * 10**e1 */
-
-	if (e1 > 0) {
-		if ((i = e1 & 15))
-			dval(&rv) *= tens[i];
-		if (e1 &= ~15) {
-			if (e1 > DBL_MAX_10_EXP) {
- ovfl:
-				/* Can't trust HUGE_VAL */
-#ifdef IEEE_Arith
+#ifdef USE_BF96 /*{*/
+	Debug(++dtoa_stats[0]);
+	i = e1 + 342;
+	if (i < 0)
+		goto undfl;
+	if (i > 650)
+		goto ovfl;
+	p10 = &pten[i];
+	brv = yz;
+	/* shift brv left, with i =  number of bits shifted */
+	i = 0;
+	if (!(brv & 0xffffffff00000000ull)) {
+		i = 32;
+		brv <<= 32;
+		}
+	if (!(brv & 0xffff000000000000ull)) {
+		i += 16;
+		brv <<= 16;
+		}
+	if (!(brv & 0xff00000000000000ull)) {
+		i += 8;
+		brv <<= 8;
+		}
+	if (!(brv & 0xf000000000000000ull)) {
+		i += 4;
+		brv <<= 4;
+		}
+	if (!(brv & 0xc000000000000000ull)) {
+		i += 2;
+		brv <<= 2;
+		}
+	if (!(brv & 0x8000000000000000ull)) {
+		i += 1;
+		brv <<= 1;
+		}
+	erv = (64 + 0x3fe) + p10->e - i;
+	if (erv <= 0 && nd > 19)
+		goto many_digits; /* denormal: may need to look at all digits */
+	bhi = brv >> 32;
+	blo = brv & 0xffffffffull;
+	/* Unsigned 32-bit ints lie in [0,2^32-1] and */
+	/* unsigned 64-bit ints lie in [0, 2^64-1].  The product of two unsigned */
+	/* 32-bit ints is <= 2^64 - 2*2^32-1 + 1 = 2^64 - 1 - 2*(2^32 - 1), so */
+	/* we can add two unsigned 32-bit ints to the product of two such ints, */
+	/* and 64 bits suffice to contain the result. */
+	t01 = bhi * p10->b1;
+	t10 = blo * p10->b0 + (t01 & 0xffffffffull);
+	t00 = bhi * p10->b0 + (t01 >> 32) + (t10 >> 32);
+	if (t00 & 0x8000000000000000ull) {
+		if ((t00 & 0x3ff) && (~t00 & 0x3fe)) { /* unambiguous result? */
+			if (nd > 19 && ((t00 + (1<<i) + 2) & 0x400) ^ (t00 & 0x400))
+				goto many_digits;
+			if (erv <= 0)
+				goto denormal;
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 0: goto noround;
+			  case 2: goto roundup;
+			  }
+#endif
+			if (t00 & 0x400 && t00 & 0xbff)
+				goto roundup;
+			goto noround;
+			}
+		}
+	else {
+		if ((t00 & 0x1ff) && (~t00 & 0x1fe)) { /* unambiguous result? */
+			if (nd > 19 && ((t00 + (1<<i) + 2) & 0x200) ^ (t00 & 0x200))
+				goto many_digits;
+			if (erv <= 1)
+				goto denormal1;
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 0: goto noround1;
+			  case 2: goto roundup1;
+			  }
+#endif
+			if (t00 & 0x200)
+				goto roundup1;
+			goto noround1;
+			}
+		}
+	/* 3 multiplies did not suffice; try a 96-bit approximation */
+	Debug(++dtoa_stats[1]);
+	t02 = bhi * p10->b2;
+	t11 = blo * p10->b1 + (t02 & 0xffffffffull);
+	bexact = 1;
+	if (e1 < 0 || e1 > 41 || (t10 | t11) & 0xffffffffull || nd > 19)
+		bexact = 0;
+	tlo = (t10 & 0xffffffffull) + (t02 >> 32) + (t11 >> 32);
+	if (!bexact && (tlo + 0x10) >> 32 > tlo >> 32)
+		goto many_digits;
+	t00 += tlo >> 32;
+	if (t00 & 0x8000000000000000ull) {
+		if (erv <= 0) { /* denormal result */
+			if (nd >= 20 || !((tlo & 0xfffffff0) | (t00 & 0x3ff)))
+				goto many_digits;
+ denormal:
+			if (erv <= -52) {
 #ifdef Honor_FLT_ROUNDS
 				switch(bc.rounding) {
-				  case 0: /* toward 0 */
-				  case 3: /* toward -infinity */
-					word0(&rv) = Big0;
-					word1(&rv) = Big1;
-					break;
-				  default:
-					word0(&rv) = Exp_mask;
-					word1(&rv) = 0;
+				  case 0: goto undfl;
+				  case 2: goto tiniest;
 				  }
-#else /*Honor_FLT_ROUNDS*/
-				word0(&rv) = Exp_mask;
+#endif
+				if (erv < -52 || !(t00 & 0x7fffffffffffffffull))
+					goto undfl;
+				goto tiniest;
+				}
+			tg = 1ull << (11 - erv);
+			t00 &= ~(tg - 1); /* clear low bits */
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 0: goto noround_den;
+			  case 2: goto roundup_den;
+			  }
+#endif
+			if (t00 & tg) {
+#ifdef Honor_FLT_ROUNDS
+ roundup_den:
+#endif
+				t00 += tg << 1;
+				if (!(t00 & 0x8000000000000000ull)) {
+					if (++erv > 0)
+						goto smallest_normal;
+					t00 = 0x8000000000000000ull;
+					}
+				}
+#ifdef Honor_FLT_ROUNDS
+ noround_den:
+#endif
+			LLval(&rv) = t00 >> (12 - erv);
+			Set_errno(ERANGE);
+			goto ret;
+			}
+		if (bexact) {
+#ifdef SET_INEXACT
+			if (!(t00 & 0x7ff) && !(tlo & 0xffffffffull)) {
+				bc.inexact = 0;
+				goto noround;
+				}
+#endif
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 2:
+				if (t00 & 0x7ff)
+					goto roundup;
+			  case 0: goto noround;
+			  }
+#endif
+			if (t00 & 0x400 && (tlo & 0xffffffff) | (t00 & 0xbff))
+				goto roundup;
+			goto noround;
+			}
+		if ((tlo & 0xfffffff0) | (t00 & 0x3ff)
+		 && (nd <= 19 ||  ((t00 + (1ull << i)) & 0xfffffffffffffc00ull)
+				== (t00 & 0xfffffffffffffc00ull))) {
+			/* Unambiguous result. */
+			/* If nd > 19, then incrementing the 19th digit */
+			/* does not affect rv. */
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 0: goto noround;
+			  case 2: goto roundup;
+			  }
+#endif
+			if (t00 & 0x400) { /* round up */
+ roundup:
+				t00 += 0x800;
+				if (!(t00 & 0x8000000000000000ull)) {
+					/* rounded up to a power of 2 */
+					if (erv >= 0x7fe)
+						goto ovfl;
+					terv = erv + 1;
+					LLval(&rv) = terv << 52;
+					goto ret;
+					}
+				}
+ noround:
+			if (erv >= 0x7ff)
+				goto ovfl;
+			terv = erv;
+			LLval(&rv) = (terv << 52) | ((t00 & 0x7ffffffffffff800ull) >> 11);
+			goto ret;
+			}
+		}
+	else {
+		if (erv <= 1) { /* denormal result */
+			if (nd >= 20 || !((tlo & 0xfffffff0) | (t00 & 0x1ff)))
+				goto many_digits;
+ denormal1:
+			if (erv <= -51) {
+#ifdef Honor_FLT_ROUNDS
+				switch(bc.rounding) {
+				  case 0: goto undfl;
+				  case 2: goto tiniest;
+				  }
+#endif
+				if (erv < -51 || !(t00 & 0x3fffffffffffffffull))
+					goto undfl;
+ tiniest:
+				LLval(&rv) = 1;
+				Set_errno(ERANGE);
+				goto ret;
+				}
+			tg = 1ull << (11 - erv);
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 0: goto noround1_den;
+			  case 2: goto roundup1_den;
+			  }
+#endif
+			if (t00 & tg) {
+#ifdef Honor_FLT_ROUNDS
+ roundup1_den:
+#endif
+				if (0x8000000000000000ull & (t00 += (tg<<1)) && erv == 1) {
+
+ smallest_normal:
+					LLval(&rv) = 0x0010000000000000ull;
+					goto ret;
+					}
+				}
+#ifdef Honor_FLT_ROUNDS
+ noround1_den:
+#endif
+			if (erv <= -52)
+				goto undfl;
+			LLval(&rv) = t00 >> (12 - erv);
+			Set_errno(ERANGE);
+			goto ret;
+			}
+		if (bexact) {
+#ifdef SET_INEXACT
+			if (!(t00 & 0x3ff) && !(tlo & 0xffffffffull)) {
+				bc.inexact = 0;
+				goto noround1;
+				}
+#endif
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 2:
+				if (t00 & 0x3ff)
+					goto roundup1;
+			  case 0: goto noround1;
+			  }
+#endif
+			if (t00 & 0x200 && (t00 & 0x5ff || tlo))
+				goto roundup1;
+			goto noround1;
+			}
+		if ((tlo & 0xfffffff0) | (t00 & 0x1ff)
+		 && (nd <= 19 ||  ((t00 + (1ull << i)) & 0x7ffffffffffffe00ull)
+				== (t00 & 0x7ffffffffffffe00ull))) {
+			/* Unambiguous result. */
+#ifdef Honor_FLT_ROUNDS
+			switch(bc.rounding) {
+			  case 0: goto noround1;
+			  case 2: goto roundup1;
+			  }
+#endif
+			if (t00 & 0x200) { /* round up */
+ roundup1:
+				t00 += 0x400;
+				if (!(t00 & 0x4000000000000000ull)) {
+					/* rounded up to a power of 2 */
+					if (erv >= 0x7ff)
+						goto ovfl;
+					terv = erv;
+					LLval(&rv) = terv << 52;
+					goto ret;
+					}
+				}
+ noround1:
+			if (erv >= 0x800)
+				goto ovfl;
+			terv = erv - 1;
+			LLval(&rv) = (terv << 52) | ((t00 & 0x3ffffffffffffc00ull) >> 10);
+			goto ret;
+			}
+		}
+ many_digits:
+	Debug(++dtoa_stats[2]);
+	if (nd > 17) {
+		if (nd > 18) {
+			yz /= 100;
+			e1 += 2;
+			}
+		else {
+			yz /= 10;
+			e1 += 1;
+			}
+		y = yz / 100000000;
+		}
+	else if (nd > 9) {
+		i = nd - 9;
+		y = (yz >> i) / pfive[i-1];
+		}
+	else
+		y = yz;
+	dval(&rv) = yz;
+#endif /*}*/
+
+#ifdef IEEE_Arith
+#ifdef Avoid_Underflow
+	bc.scale = 0;
+#endif
+#endif /*IEEE_Arith*/
+
+	/* Get starting approximation = rv * 10**e1 */
+
+	if (e1 > 0) {
+		if ((i = e1 & 15))
+			dval(&rv) *= tens[i];
+		if (e1 &= ~15) {
+			if (e1 > DBL_MAX_10_EXP) {
+ ovfl:
+				/* Can't trust HUGE_VAL */
+#ifdef IEEE_Arith
+#ifdef Honor_FLT_ROUNDS
+				switch(bc.rounding) {
+				  case 0: /* toward 0 */
+				  case 3: /* toward -infinity */
+					word0(&rv) = Big0;
+					word1(&rv) = Big1;
+					break;
+				  default:
+					word0(&rv) = Exp_mask;
+					word1(&rv) = 0;
+				  }
+#else /*Honor_FLT_ROUNDS*/
+				word0(&rv) = Exp_mask;
 				word1(&rv) = 0;
 #endif /*Honor_FLT_ROUNDS*/
 #ifdef SET_INEXACT
@@ -2847,15 +4151,13 @@ fpconv_strtod
 #endif /*IEEE_Arith*/
  range_err:
 				if (bd0) {
-					Bfree(bb);
-					Bfree(bd);
-					Bfree(bs);
-					Bfree(bd0);
-					Bfree(delta);
+					Bfree(bb MTb);
+					Bfree(bd MTb);
+					Bfree(bs MTb);
+					Bfree(bd0 MTb);
+					Bfree(delta MTb);
 					}
-#ifndef NO_ERRNO
-				errno = ERANGE;
-#endif
+				Set_errno(ERANGE);
 				goto ret;
 				}
 			e1 >>= 4;
@@ -2920,6 +4222,10 @@ fpconv_strtod
 				if (!dval(&rv)) {
  undfl:
 					dval(&rv) = 0.;
+#ifdef Honor_FLT_ROUNDS
+					if (bc.rounding == 2)
+						word1(&rv) = 1;
+#endif
 					goto range_err;
 					}
 #ifndef Avoid_Underflow
@@ -2969,13 +4275,13 @@ fpconv_strtod
 			}
 		}
 #endif
-	bd0 = s2b(s0, nd0, nd, y, bc.dplen);
+	bd0 = s2b(s0, nd0, nd, y, bc.dplen MTb);
 
 	for(;;) {
-		bd = Balloc(bd0->k);
+		bd = Balloc(bd0->k MTb);
 		Bcopy(bd, bd0);
-		bb = d2b(&rv, &bbe, &bbbits);	/* rv = bb * 2^bbe */
-		bs = i2b(1);
+		bb = d2b(&rv, &bbe, &bbbits MTb);	/* rv = bb * 2^bbe */
+		bs = i2b(1 MTb);
 
 		if (e >= 0) {
 			bb2 = bb5 = 0;
@@ -3040,20 +4346,20 @@ fpconv_strtod
 			bs2 -= i;
 			}
 		if (bb5 > 0) {
-			bs = pow5mult(bs, bb5);
-			bb1 = mult(bs, bb);
-			Bfree(bb);
+			bs = pow5mult(bs, bb5 MTb);
+			bb1 = mult(bs, bb MTb);
+			Bfree(bb MTb);
 			bb = bb1;
 			}
 		if (bb2 > 0)
-			bb = lshift(bb, bb2);
+			bb = lshift(bb, bb2 MTb);
 		if (bd5 > 0)
-			bd = pow5mult(bd, bd5);
+			bd = pow5mult(bd, bd5 MTb);
 		if (bd2 > 0)
-			bd = lshift(bd, bd2);
+			bd = lshift(bd, bd2 MTb);
 		if (bs2 > 0)
-			bs = lshift(bs, bs2);
-		delta = diff(bb, bd);
+			bs = lshift(bs, bs2 MTb);
+		delta = diff(bb, bd MTb);
 		bc.dsign = delta->sign;
 		delta->sign = 0;
 		i = cmp(delta, bs);
@@ -3104,7 +4410,7 @@ fpconv_strtod
 						if (y)
 #endif
 						  {
-						  delta = lshift(delta,Log2P);
+						  delta = lshift(delta,Log2P MTb);
 						  if (cmp(delta, bs) <= 0)
 							adj.d = -0.5;
 						  }
@@ -3196,7 +4502,7 @@ fpconv_strtod
 #endif
 				break;
 				}
-			delta = lshift(delta,Log2P);
+			delta = lshift(delta,Log2P MTb);
 			if (cmp(delta, bs) > 0)
 				goto drop_down;
 			break;
@@ -3406,8 +4712,7 @@ fpconv_strtod
 					goto undfl;
 #else
 					{
-					if (bc.nd > nd)
-						bc.dsign = 1;
+					req_bigcomp = 1;
 					break;
 					}
 #endif
@@ -3487,21 +4792,21 @@ fpconv_strtod
 		}
 #endif
  cont:
-		Bfree(bb);
-		Bfree(bd);
-		Bfree(bs);
-		Bfree(delta);
-		}
-	Bfree(bb);
-	Bfree(bd);
-	Bfree(bs);
-	Bfree(bd0);
-	Bfree(delta);
+		Bfree(bb MTb);
+		Bfree(bd MTb);
+		Bfree(bs MTb);
+		Bfree(delta MTb);
+		}
+	Bfree(bb MTb);
+	Bfree(bd MTb);
+	Bfree(bs MTb);
+	Bfree(bd0 MTb);
+	Bfree(delta MTb);
 #ifndef NO_STRTOD_BIGCOMP
 	if (req_bigcomp) {
 		bd0 = 0;
 		bc.e0 += nz1;
-		bigcomp(&rv, s0, &bc);
+		bigcomp(&rv, s0, &bc MTb);
 		y = word0(&rv) & Exp_mask;
 		if (y == Exp_mask)
 			goto ovfl;
@@ -3509,17 +4814,6 @@ fpconv_strtod
 			goto undfl;
 		}
 #endif
-#ifdef SET_INEXACT
-	if (bc.inexact) {
-		if (!oldinexact) {
-			word0(&rv0) = Exp_1 + (70 << Exp_shift);
-			word1(&rv0) = 0;
-			dval(&rv0) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
 #ifdef Avoid_Underflow
 	if (bc.scale) {
 		word0(&rv0) = Exp_1 - 2*P*Exp_msk1;
@@ -3532,18 +4826,27 @@ fpconv_strtod
 #else
 		if (word0(&rv) == 0 && word1(&rv) == 0)
 #endif
-			errno = ERANGE;
+			Set_errno(ERANGE);
 #endif
 		}
 #endif /* Avoid_Underflow */
+ ret:
 #ifdef SET_INEXACT
-	if (bc.inexact && !(word0(&rv) & Exp_mask)) {
-		/* set underflow bit */
-		dval(&rv0) = 1e-300;
-		dval(&rv0) *= dval(&rv0);
+	if (bc.inexact) {
+		if (!(word0(&rv) & Exp_mask)) {
+			/* set underflow and inexact bits */
+			dval(&rv0) = 1e-300;
+			dval(&rv0) *= dval(&rv0);
+			}
+		else if (!oldinexact) {
+			word0(&rv0) = Exp_1 + (70 << Exp_shift);
+			word1(&rv0) = 0;
+			dval(&rv0) += 1.;
+			}
 		}
+	else if (!oldinexact)
+		clear_inexact();
 #endif
- ret:
 	if (se)
 		*se = (char *)s;
 	return sign ? -dval(&rv) : dval(&rv);
@@ -3554,11 +4857,7 @@ fpconv_strtod
 #endif
 
  static char *
-#ifdef KR_headers
-rv_alloc(i) int i;
-#else
-rv_alloc(int i)
-#endif
+rv_alloc(int i MTd)
 {
 	int j, k, *r;
 
@@ -3567,7 +4866,7 @@ rv_alloc(int i)
 		sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= i;
 		j <<= 1)
 			k++;
-	r = (int*)Balloc(k);
+	r = (int*)Balloc(k MTa);
 	*r = k;
 	return
 #ifndef MULTIPLE_THREADS
@@ -3577,16 +4876,21 @@ rv_alloc(int i)
 	}
 
  static char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) char *s, **rve; int n;
-#else
-nrv_alloc(const char *s, char **rve, int n)
-#endif
+nrv_alloc(const char *s, char *s0, size_t s0len, char **rve, int n MTd)
 {
 	char *rv, *t;
 
-	t = rv = rv_alloc(n);
-	while((*t = *s++)) t++;
+	if (!s0)
+		s0 = rv_alloc(n MTa);
+	else if (s0len <= n) {
+		rv = 0;
+		t = rv + n;
+		goto rve_chk;
+		}
+	t = rv = s0;
+	while((*t = *s++))
+		++t;
+ rve_chk:
 	if (rve)
 		*rve = t;
 	return rv;
@@ -3599,15 +4903,14 @@ nrv_alloc(const char *s, char **rve, int n)
  */
 
  void
-#ifdef KR_headers
-freedtoa(s) char *s;
-#else
 freedtoa(char *s)
-#endif
 {
+#ifdef MULTIPLE_THREADS
+	ThInfo *TI = 0;
+#endif
 	Bigint *b = (Bigint *)((int *)s - 1);
 	b->maxwds = 1 << (b->k = *(int*)b);
-	Bfree(b);
+	Bfree(b MTb);
 #ifndef MULTIPLE_THREADS
 	if (s == dtoa_result)
 		dtoa_result = 0;
@@ -3649,13 +4952,7 @@ freedtoa(char *s)
  */
 
  char *
-dtoa
-#ifdef KR_headers
-	(dd, mode, ndigits, decpt, sign, rve)
-	double dd; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
+dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char *buf, size_t blen)
 {
  /*	Arguments ndigits, decpt, sign are similar to those
 	of ecvt and fcvt; trailing zeros are suppressed from
@@ -3687,30 +4984,52 @@ dtoa
 
 		Values of mode other than 0-9 are treated as mode 0.
 
-		Sufficient space is allocated to the return value
-		to hold the suppressed trailing zeros.
+	When not NULL, buf is an output buffer of length blen, which must
+	be large enough to accommodate suppressed trailing zeros and a trailing
+	null byte.  If blen is too small, rv = NULL is returned, in which case
+	if rve is not NULL, a subsequent call with blen >= (*rve - rv) + 1
+	should succeed in returning buf.
+
+	When buf is NULL, sufficient space is allocated for the return value,
+	which, when done using, the caller should pass to freedtoa().
+
+	USE_BF is automatically defined when neither NO_LONG_LONG nor NO_BF96
+	is defined.
 	*/
 
-	int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
-		j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
-		spec_case, try_quick;
-	Long L;
-#ifndef Sudden_Underflow
+#ifdef MULTIPLE_THREADS
+	ThInfo *TI = 0;
+#endif
+	int bbits, b2, b5, be, dig, i, ilim, ilim1,
+		j, j1, k, leftright, m2, m5, s2, s5, spec_case;
+#if !defined(Sudden_Underflow) || defined(USE_BF96)
 	int denorm;
-	ULong x;
 #endif
 	Bigint *b, *b1, *delta, *mlo, *mhi, *S;
-	U d2, eps, u;
+	U u;
+	char *s;
+#ifdef SET_INEXACT
+	int inexact, oldinexact;
+#endif
+#ifdef USE_BF96 /*{{*/
+	BF96 *p10;
+	ULLong dbhi, dbits, dblo, den, hb, rb, rblo, res, res0, res3, reslo, sres,
+		sulp, tv0, tv1, tv2, tv3, ulp, ulplo, ulpmask, ures, ureslo, zb;
+	int eulp, k1, n2, ulpadj, ulpshift;
+#else /*}{*/
+#ifndef Sudden_Underflow
+	ULong x;
+#endif
+	Long L;
+	U d2, eps;
 	double ds;
-	char *s, *s0;
+	int ieps, ilim0, k0, k_check, try_quick;
 #ifndef No_leftright
 #ifdef IEEE_Arith
 	U eps1;
 #endif
 #endif
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
+#endif /*}}*/
 #ifdef Honor_FLT_ROUNDS /*{*/
 	int Rounding;
 #ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
@@ -3725,13 +5044,6 @@ dtoa
 #endif /*}}*/
 #endif /*}*/
 
-#ifndef MULTIPLE_THREADS
-	if (dtoa_result) {
-		freedtoa(dtoa_result);
-		dtoa_result = 0;
-		}
-#endif
-
 	u.d = dd;
 	if (word0(&u) & Sign_bit) {
 		/* set sign for everything, including 0's and NaNs */
@@ -3752,9 +5064,9 @@ dtoa
 		*decpt = 9999;
 #ifdef IEEE_Arith
 		if (!word1(&u) && !(word0(&u) & 0xfffff))
-			return nrv_alloc("Infinity", rve, 8);
+			return nrv_alloc("Infinity", buf, blen, rve, 8 MTb);
 #endif
-		return nrv_alloc("NaN", rve, 3);
+		return nrv_alloc("NaN", buf, blen, rve, 3 MTb);
 		}
 #endif
 #ifdef IBM
@@ -3762,11 +5074,14 @@ dtoa
 #endif
 	if (!dval(&u)) {
 		*decpt = 1;
-		return nrv_alloc("0", rve, 1);
+		return nrv_alloc("0", buf, blen, rve, 1 MTb);
 		}
 
 #ifdef SET_INEXACT
-	try_quick = oldinexact = get_inexact();
+#ifndef USE_BF96
+	try_quick =
+#endif
+	oldinexact = get_inexact();
 	inexact = 1;
 #endif
 #ifdef Honor_FLT_ROUNDS
@@ -3778,8 +5093,58 @@ dtoa
 				Rounding = 0;
 		}
 #endif
+#ifdef USE_BF96 /*{{*/
+	dbits = (u.LL & 0xfffffffffffffull) << 11;	/* fraction bits */
+	if ((be = u.LL >> 52)) /* biased exponent; nonzero ==> normal */ {
+		dbits |= 0x8000000000000000ull;
+		denorm = ulpadj = 0;
+		}
+	else {
+		denorm = 1;
+		ulpadj = be + 1;
+		dbits <<= 1;
+		if (!(dbits & 0xffffffff00000000ull)) {
+			dbits <<= 32;
+			be -= 32;
+			}
+		if (!(dbits & 0xffff000000000000ull)) {
+			dbits <<= 16;
+			be -= 16;
+			}
+		if (!(dbits & 0xff00000000000000ull)) {
+			dbits <<= 8;
+			be -= 8;
+			}
+		if (!(dbits & 0xf000000000000000ull)) {
+			dbits <<= 4;
+			be -= 4;
+			}
+		if (!(dbits & 0xc000000000000000ull)) {
+			dbits <<= 2;
+			be -= 2;
+			}
+		if (!(dbits & 0x8000000000000000ull)) {
+			dbits <<= 1;
+			be -= 1;
+			}
+		assert(be >= -51);
+		ulpadj -= be;
+		}
+	j = Lhint[be + 51];
+	p10 = &pten[j];
+	dbhi = dbits >> 32;
+	dblo = dbits & 0xffffffffull;
+	i = be - 0x3fe;
+	if (i < p10->e
+	|| (i == p10->e && (dbhi < p10->b0 || (dbhi == p10->b0 && dblo < p10->b1))))
+		--j;
+	k = j - 342;
+
+	/* now 10^k <= dd < 10^(k+1) */
 
-	b = d2b(&u, &be, &bbits);
+#else /*}{*/
+
+	b = d2b(&u, &be, &bbits MTb);
 #ifdef Sudden_Underflow
 	i = (int)(word0(&u) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
 #else
@@ -3864,20 +5229,23 @@ dtoa
 		b5 = -k;
 		s5 = 0;
 		}
+#endif /*}}*/
 	if (mode < 0 || mode > 9)
 		mode = 0;
 
+#ifndef USE_BF96
 #ifndef SET_INEXACT
 #ifdef Check_FLT_ROUNDS
 	try_quick = Rounding == 1;
-#else
-	try_quick = 1;
 #endif
 #endif /*SET_INEXACT*/
+#endif
 
 	if (mode > 5) {
 		mode -= 4;
+#ifndef USE_BF96
 		try_quick = 0;
+#endif
 		}
 	leftright = 1;
 	ilim = ilim1 = -1;	/* Values for cases 0 and 1; done here to */
@@ -3906,20 +5274,490 @@ dtoa
 			if (i <= 0)
 				i = 1;
 		}
-	s = s0 = rv_alloc(i);
+	if (!buf) {
+		buf = rv_alloc(i MTb);
+		blen = sizeof(Bigint) + ((1 << ((int*)buf)[-1]) - 1)*sizeof(ULong) - sizeof(int);
+		}
+	else if (blen <= i) {
+		buf = 0;
+		if (rve)
+			*rve = buf + i;
+		return buf;
+		}
+	s = buf;
+
+	/* Check for special case that d is a normalized power of 2. */
+
+	spec_case = 0;
+	if (mode < 2 || (leftright
+#ifdef Honor_FLT_ROUNDS
+			&& Rounding == 1
+#endif
+				)) {
+		if (!word1(&u) && !(word0(&u) & Bndry_mask)
+#ifndef Sudden_Underflow
+		 && word0(&u) & (Exp_mask & ~Exp_msk1)
+#endif
+				) {
+			/* The special case */
+			spec_case = 1;
+			}
+		}
+
+#ifdef USE_BF96 /*{*/
+	b = 0;
+	if (ilim < 0 && (mode == 3 || mode == 5)) {
+		S = mhi = 0;
+		goto no_digits;
+		}
+	i = 1;
+	j = 52 + 0x3ff - be;
+	ulpshift = 0;
+	ulplo = 0;
+	/* Can we do an exact computation with 64-bit integer arithmetic? */
+	if (k < 0) {
+		if (k < -25)
+			goto toobig;
+		res = dbits >> 11;
+		n2 = pfivebits[k1 = -(k + 1)] + 53;
+		j1 = j;
+		if (n2 > 61) {
+			ulpshift = n2 - 61;
+			if (res & (ulpmask = (1ull << ulpshift) - 1))
+				goto toobig;
+			j -= ulpshift;
+			res >>= ulpshift;
+			}
+		/* Yes. */
+		res *= ulp = pfive[k1];
+		if (ulpshift) {
+			ulplo = ulp;
+			ulp >>= ulpshift;
+			}
+		j += k;
+		if (ilim == 0) {
+			S = mhi = 0;
+			if (res > (5ull << j))
+				goto one_digit;
+			goto no_digits;
+			}
+		goto no_div;
+		}
+	if (ilim == 0 && j + k >= 0) {
+		S = mhi = 0;
+		if ((dbits >> 11) > (pfive[k-1] << j))
+			goto one_digit;
+		goto no_digits;
+		}
+	if (k <= dtoa_divmax && j + k >= 0) {
+		/* Another "yes" case -- we will use exact integer arithmetic. */
+ use_exact:
+		Debug(++dtoa_stats[3]);
+		res = dbits >> 11;	/* residual */
+		ulp = 1;
+		if (k <= 0)
+			goto no_div;
+		j1 = j + k + 1;
+		den = pfive[k-i] << (j1 - i);
+		for(;;) {
+			dig = res / den;
+			*s++ = '0' + dig;
+			if (!(res -= dig*den)) {
+#ifdef SET_INEXACT
+				inexact = 0;
+				oldinexact = 1;
+#endif
+				goto retc;
+				}
+			if (ilim < 0) {
+				ures = den - res;
+				if (2*res <= ulp
+				&& (spec_case ? 4*res <= ulp : (2*res < ulp || dig & 1)))
+					goto ulp_reached;
+				if (2*ures < ulp)
+					goto Roundup;
+				}
+			else if (i == ilim) {
+				switch(Rounding) {
+				  case 0: goto retc;
+				  case 2: goto Roundup;
+				  }
+				ures = 2*res;
+				if (ures > den
+				|| (ures == den && dig & 1)
+				|| (spec_case && res <= ulp && 2*res >= ulp))
+					goto Roundup;
+				goto retc;
+				}
+			if (j1 < ++i) {
+				res *= 10;
+				ulp *= 10;
+				}
+			else {
+				if (i > k)
+					break;
+				den = pfive[k-i] << (j1 - i);
+				}
+			}
+ no_div:
+		for(;;) {
+			dig = den = res >> j;
+			*s++ = '0' + dig;
+			if (!(res -= den << j)) {
+#ifdef SET_INEXACT
+				inexact = 0;
+				oldinexact = 1;
+#endif
+				goto retc;
+				}
+			if (ilim < 0) {
+				ures = (1ull << j) - res;
+				if (2*res <= ulp
+				&& (spec_case ? 4*res <= ulp : (2*res < ulp || dig & 1))) {
+ ulp_reached:
+					if (ures < res
+					|| (ures == res && dig & 1))
+						goto Roundup;
+					goto retc;
+					}
+				if (2*ures < ulp)
+					goto Roundup;
+				}
+			--j;
+			if (i == ilim) {
+#ifdef Honor_FLT_ROUNDS
+				switch(Rounding) {
+				  case 0: goto retc;
+				  case 2: goto Roundup;
+				  }
+#endif
+				hb = 1ull << j;
+				if (res & hb && (dig & 1 || res & (hb-1)))
+					goto Roundup;
+				if (spec_case && res <= ulp && 2*res >= ulp) {
+ Roundup:
+					while(*--s == '9')
+						if (s == buf) {
+							++k;
+							*s++ = '1';
+							goto ret1;
+							}
+					++*s++;
+					goto ret1;
+					}
+				goto retc;
+				}
+			++i;
+			res *= 5;
+			if (ulpshift) {
+				ulplo = 5*(ulplo & ulpmask);
+				ulp = 5*ulp + (ulplo >> ulpshift);
+				}
+			else
+				ulp *= 5;
+			}
+		}
+ toobig:
+	if (ilim > 28)
+		goto Fast_failed1;
+	/* Scale by 10^-k */
+	p10 = &pten[342-k];
+	tv0 = p10->b2 * dblo; /* rarely matters, but does, e.g., for 9.862818194192001e18 */
+	tv1 = p10->b1 * dblo + (tv0 >> 32);
+	tv2 = p10->b2 * dbhi + (tv1 & 0xffffffffull);
+	tv3 = p10->b0 * dblo + (tv1>>32) + (tv2>>32);
+	res3 = p10->b1 * dbhi + (tv3 & 0xffffffffull);
+	res = p10->b0 * dbhi + (tv3>>32) + (res3>>32);
+	be += p10->e - 0x3fe;
+	eulp = j1 = be - 54 + ulpadj;
+	if (!(res & 0x8000000000000000ull)) {
+		--be;
+		res3 <<= 1;
+		res = (res << 1) | ((res3 & 0x100000000ull) >> 32);
+		}
+	res0 = res; /* save for Fast_failed */
+#if !defined(SET_INEXACT) && !defined(NO_DTOA_64) /*{*/
+	if (ilim > 19)
+		goto Fast_failed;
+	Debug(++dtoa_stats[4]);
+	assert(be >= 0 && be <= 4); /* be = 0 is rare, but possible, e.g., for 1e20 */
+	res >>= 4 - be;
+	ulp = p10->b0;	/* ulp */
+	ulp = (ulp << 29) | (p10->b1 >> 3);
+	/* scaled ulp = ulp * 2^(eulp - 60) */
+	/* We maintain 61 bits of the scaled ulp. */
+	if (ilim == 0) {
+		if (!(res & 0x7fffffffffffffeull)
+		 || !((~res) & 0x7fffffffffffffeull))
+			goto Fast_failed1;
+		S = mhi = 0;
+		if (res >= 0x5000000000000000ull)
+			goto one_digit;
+		goto no_digits;
+		}
+	rb = 1;	/* upper bound on rounding error */
+	for(;;++i) {
+		dig = res >> 60;
+		*s++ = '0' + dig;
+		res &= 0xfffffffffffffffull;
+		if (ilim < 0) {
+			ures = 0x1000000000000000ull - res;
+			if (eulp > 0) {
+				assert(eulp <= 4);
+				sulp = ulp << (eulp - 1);
+				if (res <= ures) {
+					if (res + rb > ures - rb)
+						goto Fast_failed;
+					if (res < sulp)
+						goto retc;
+					}
+				else {
+					if (res - rb <= ures + rb)
+						goto Fast_failed;
+					if (ures < sulp)
+						goto Roundup;
+					}
+				}
+			else {
+				zb = -(1ull << (eulp + 63));
+				if (!(zb & res)) {
+					sres = res << (1 - eulp);
+					if (sres < ulp && (!spec_case || 2*sres < ulp)) {
+						if ((res+rb) << (1 - eulp) >= ulp)
+							goto Fast_failed;
+						if (ures < res) {
+							if (ures + rb >= res - rb)
+								goto Fast_failed;
+							goto Roundup;
+							}
+						if (ures - rb < res + rb)
+							goto Fast_failed;
+						goto retc;
+						}
+					}
+				if (!(zb & ures) && ures << -eulp < ulp) {
+					if (ures << (1 - eulp) < ulp)
+						goto  Roundup;
+					goto Fast_failed;
+					}
+				}
+			}
+		else if (i == ilim) {
+			ures = 0x1000000000000000ull - res;
+			if (ures < res) {
+				if (ures <= rb || res - rb <= ures + rb) {
+					if (j + k >= 0 && k >= 0 && k <= 27)
+						goto use_exact1;
+					goto Fast_failed;
+					}
+#ifdef Honor_FLT_ROUNDS
+				if (Rounding == 0)
+					goto retc;
+#endif
+				goto Roundup;
+				}
+			if (res <= rb || ures - rb <= res + rb) {
+				if (j + k >= 0 && k >= 0 && k <= 27) {
+ use_exact1:
+					s = buf;
+					i = 1;
+					goto use_exact;
+					}
+				goto Fast_failed;
+				}
+#ifdef Honor_FLT_ROUNDS
+			if (Rounding == 2)
+				goto Roundup;
+#endif
+			goto retc;
+			}
+		rb *= 10;
+		if (rb >= 0x1000000000000000ull)
+			goto Fast_failed;
+		res *= 10;
+		ulp *= 5;
+		if (ulp & 0x8000000000000000ull) {
+			eulp += 4;
+			ulp >>= 3;
+			}
+		else {
+			eulp += 3;
+			ulp >>= 2;
+			}
+		}
+#endif /*}*/
+#ifndef NO_BF96
+ Fast_failed:
+#endif
+	Debug(++dtoa_stats[5]);
+	s = buf;
+	i = 4 - be;
+	res = res0 >> i;
+	reslo = 0xffffffffull & res3;
+	if (i)
+		reslo = (res0 << (64 - i)) >> 32 | (reslo >> i);
+	rb = 0;
+	rblo = 4; /* roundoff bound */
+	ulp = p10->b0;	/* ulp */
+	ulp = (ulp << 29) | (p10->b1 >> 3);
+	eulp = j1;
+	for(i = 1;;++i) {
+		dig = res >> 60;
+		*s++ = '0' + dig;
+		res &= 0xfffffffffffffffull;
+#ifdef SET_INEXACT
+		if (!res && !reslo) {
+			if (!(res3 & 0xffffffffull)) {
+				inexact = 0;
+				oldinexact = 1;
+				}
+			goto retc;
+			}
+#endif
+		if (ilim < 0) {
+			ures = 0x1000000000000000ull - res;
+			ureslo = 0;
+			if (reslo) {
+				ureslo = 0x100000000ull - reslo;
+				--ures;
+				}
+			if (eulp > 0) {
+				assert(eulp <= 4);
+				sulp = (ulp << (eulp - 1)) - rb;
+				if (res <= ures) {
+					if (res < sulp) {
+						if (res+rb < ures-rb)
+							goto retc;
+						}
+					}
+				else if (ures < sulp) {
+					if (res-rb > ures+rb)
+						goto Roundup;
+					}
+				goto Fast_failed1;
+				}
+			else {
+				zb = -(1ull << (eulp + 60));
+				if (!(zb & (res + rb))) {
+					sres = (res - rb) << (1 - eulp);
+					if (sres < ulp && (!spec_case || 2*sres < ulp)) {
+						sres = res << (1 - eulp);
+						if ((j = eulp + 31) > 0)
+							sres += (rblo + reslo) >> j;
+						else
+							sres += (rblo + reslo) << -j;
+						if (sres + (rb << (1 - eulp)) >= ulp)
+							goto Fast_failed1;
+						if (sres >= ulp)
+							goto more96;
+						if (ures < res
+						|| (ures == res && ureslo < reslo)) {
+							if (ures + rb >= res - rb)
+								goto Fast_failed1;
+							goto Roundup;
+							}
+						if (ures - rb <= res + rb)
+							goto Fast_failed1;
+						goto retc;
+						}
+					}
+				if (!(zb & ures) && (ures-rb) << (1 - eulp) < ulp) {
+					if ((ures + rb) << (1 - eulp) < ulp)
+						goto Roundup;
+					goto Fast_failed1;
+					}
+				}
+			}
+		else if (i == ilim) {
+			ures = 0x1000000000000000ull - res;
+			sres = ureslo = 0;
+			if (reslo) {
+				ureslo = 0x100000000ull - reslo;
+				--ures;
+				sres = (reslo + rblo) >> 31;
+				}
+			sres += 2*rb;
+			if (ures <= res) {
+				if (ures <=sres || res - ures <= sres)
+					goto Fast_failed1;
+#ifdef Honor_FLT_ROUNDS
+				if (Rounding == 0)
+					goto retc;
+#endif
+				goto Roundup;
+				}
+			if (res <= sres || ures - res <= sres)
+				goto Fast_failed1;
+#ifdef Honor_FLT_ROUNDS
+			if (Rounding == 2)
+				goto Roundup;
+#endif
+			goto retc;
+			}
+ more96:
+		rblo *= 10;
+		rb = 10*rb + (rblo >> 32);
+		rblo &= 0xffffffffull;
+		if (rb >= 0x1000000000000000ull)
+			goto Fast_failed1;
+		reslo *= 10;
+		res = 10*res + (reslo >> 32);
+		reslo &= 0xffffffffull;
+		ulp *= 5;
+		if (ulp & 0x8000000000000000ull) {
+			eulp += 4;
+			ulp >>= 3;
+			}
+		else {
+			eulp += 3;
+			ulp >>= 2;
+			}
+		}
+ Fast_failed1:
+	Debug(++dtoa_stats[6]);
+	S = mhi = mlo = 0;
+#ifdef USE_BF96
+	b = d2b(&u, &be, &bbits MTb);
+#endif
+	s = buf;
+	i = (int)(word0(&u) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
+	i -= Bias;
+	if (ulpadj)
+		i -= ulpadj - 1;
+	j = bbits - i - 1;
+	if (j >= 0) {
+		b2 = 0;
+		s2 = j;
+		}
+	else {
+		b2 = -j;
+		s2 = 0;
+		}
+	if (k >= 0) {
+		b5 = 0;
+		s5 = k;
+		s2 += k;
+		}
+	else {
+		b2 -= k;
+		b5 = -k;
+		s5 = 0;
+		}
+#endif /*}*/
 
 #ifdef Honor_FLT_ROUNDS
 	if (mode > 1 && Rounding != 1)
 		leftright = 0;
 #endif
 
+#ifndef USE_BF96 /*{*/
 	if (ilim >= 0 && ilim <= Quick_max && try_quick) {
 
 		/* Try to get by with floating-point arithmetic. */
 
 		i = 0;
 		dval(&d2) = dval(&u);
-		k0 = k;
+		j1 = -(k0 = k);
 		ilim0 = ilim;
 		ieps = 2; /* conservative */
 		if (k > 0) {
@@ -3938,7 +5776,7 @@ dtoa
 					}
 			dval(&u) /= ds;
 			}
-		else if ((j1 = -k)) {
+		else if (j1 > 0) {
 			dval(&u) *= tens[j1 & 0xf];
 			for(j = j1 >> 4; j; j >>= 1, i++)
 				if (j & 1) {
@@ -3972,7 +5810,7 @@ dtoa
 			 */
 			dval(&eps) = 0.5/tens[ilim-1] - dval(&eps);
 #ifdef IEEE_Arith
-			if (k0 < 0 && j1 >= 307) {
+			if (j1 >= 307) {
 				eps1.d = 1.01e256; /* 1.01 allows roundoff in the next few lines */
 				word0(&eps1) -= Exp_msk1 * (Bias+P-1);
 				dval(&eps1) *= tens[j1 & 0xf];
@@ -3981,6 +5819,12 @@ dtoa
 						dval(&eps1) *= bigtens[i];
 				if (eps.d < eps1.d)
 					eps.d = eps1.d;
+				if (10. - u.d < 10.*eps.d && eps.d < 1.) {
+					/* eps.d < 1. excludes trouble with the tiniest denormal */
+					*s++ = '1';
+					++k;
+					goto ret1;
+					}
 				}
 #endif
 			for(i = 0;;) {
@@ -3990,7 +5834,7 @@ dtoa
 				if (1. - dval(&u) < dval(&eps))
 					goto bump_up;
 				if (dval(&u) < dval(&eps))
-					goto ret1;
+					goto retc;
 				if (++i >= ilim)
 					break;
 				dval(&eps) *= 10.;
@@ -4009,11 +5853,8 @@ dtoa
 				if (i == ilim) {
 					if (dval(&u) > 0.5 + dval(&eps))
 						goto bump_up;
-					else if (dval(&u) < 0.5 - dval(&eps)) {
-						while(*--s == '0');
-						s++;
-						goto ret1;
-						}
+					else if (dval(&u) < 0.5 - dval(&eps))
+						goto retc;
 					break;
 					}
 				}
@@ -4021,7 +5862,7 @@ dtoa
 			}
 #endif
  fast_failed:
-		s = s0;
+		s = buf;
 		dval(&u) = dval(&d2);
 		k = k0;
 		ilim = ilim0;
@@ -4059,7 +5900,7 @@ dtoa
 #ifdef Honor_FLT_ROUNDS
 				if (mode > 1)
 				switch(Rounding) {
-				  case 0: goto ret1;
+				  case 0: goto retc;
 				  case 2: goto bump_up;
 				  }
 #endif
@@ -4072,7 +5913,7 @@ dtoa
 					{
  bump_up:
 					while(*--s == '9')
-						if (s == s0) {
+						if (s == buf) {
 							k++;
 							*s = '0';
 							break;
@@ -4082,9 +5923,10 @@ dtoa
 				break;
 				}
 			}
-		goto ret1;
+		goto retc;
 		}
 
+#endif /*}*/
 	m2 = b2;
 	m5 = b5;
 	mhi = mlo = 0;
@@ -4100,7 +5942,7 @@ dtoa
 #endif
 		b2 += i;
 		s2 += i;
-		mhi = i2b(1);
+		mhi = i2b(1 MTb);
 		}
 	if (m2 > 0 && s2 > 0) {
 		i = m2 < s2 ? m2 : s2;
@@ -4111,39 +5953,24 @@ dtoa
 	if (b5 > 0) {
 		if (leftright) {
 			if (m5 > 0) {
-				mhi = pow5mult(mhi, m5);
-				b1 = mult(mhi, b);
-				Bfree(b);
+				mhi = pow5mult(mhi, m5 MTb);
+				b1 = mult(mhi, b MTb);
+				Bfree(b MTb);
 				b = b1;
 				}
 			if ((j = b5 - m5))
-				b = pow5mult(b, j);
+				b = pow5mult(b, j MTb);
 			}
 		else
-			b = pow5mult(b, b5);
+			b = pow5mult(b, b5 MTb);
 		}
-	S = i2b(1);
+	S = i2b(1 MTb);
 	if (s5 > 0)
-		S = pow5mult(S, s5);
-
-	/* Check for special case that d is a normalized power of 2. */
+		S = pow5mult(S, s5 MTb);
 
-	spec_case = 0;
-	if ((mode < 2 || leftright)
-#ifdef Honor_FLT_ROUNDS
-			&& Rounding == 1
-#endif
-				) {
-		if (!word1(&u) && !(word0(&u) & Bndry_mask)
-#ifndef Sudden_Underflow
-		 && word0(&u) & (Exp_mask & ~Exp_msk1)
-#endif
-				) {
-			/* The special case */
-			b2 += Log2P;
-			s2 += Log2P;
-			spec_case = 1;
-			}
+	if (spec_case) {
+		b2 += Log2P;
+		s2 += Log2P;
 		}
 
 	/* Arrange for convenient computation of quotients:
@@ -4158,20 +5985,22 @@ dtoa
 	m2 += i;
 	s2 += i;
 	if (b2 > 0)
-		b = lshift(b, b2);
+		b = lshift(b, b2 MTb);
 	if (s2 > 0)
-		S = lshift(S, s2);
+		S = lshift(S, s2 MTb);
+#ifndef USE_BF96
 	if (k_check) {
 		if (cmp(b,S) < 0) {
 			k--;
-			b = multadd(b, 10, 0);	/* we botched the k estimate */
+			b = multadd(b, 10, 0 MTb);	/* we botched the k estimate */
 			if (leftright)
-				mhi = multadd(mhi, 10, 0);
+				mhi = multadd(mhi, 10, 0 MTb);
 			ilim = ilim1;
 			}
 		}
+#endif
 	if (ilim <= 0 && (mode == 3 || mode == 5)) {
-		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
+		if (ilim < 0 || cmp(b,S = multadd(S,5,0 MTb)) <= 0) {
 			/* no digits, fcvt style */
  no_digits:
 			k = -1 - ndigits;
@@ -4179,12 +6008,12 @@ dtoa
 			}
  one_digit:
 		*s++ = '1';
-		k++;
+		++k;
 		goto ret;
 		}
 	if (leftright) {
 		if (m2 > 0)
-			mhi = lshift(mhi, m2);
+			mhi = lshift(mhi, m2 MTb);
 
 		/* Compute mlo -- check for special case
 		 * that d is a normalized power of 2.
@@ -4192,9 +6021,9 @@ dtoa
 
 		mlo = mhi;
 		if (spec_case) {
-			mhi = Balloc(mhi->k);
+			mhi = Balloc(mhi->k MTb);
 			Bcopy(mhi, mlo);
-			mhi = lshift(mhi, Log2P);
+			mhi = lshift(mhi, Log2P MTb);
 			}
 
 		for(i = 1;;i++) {
@@ -4203,13 +6032,13 @@ dtoa
 			 * that will round to d?
 			 */
 			j = cmp(b, mlo);
-			delta = diff(S, mhi);
+			delta = diff(S, mhi MTb);
 			j1 = delta->sign ? 1 : cmp(b, delta);
-			Bfree(delta);
+			Bfree(delta MTb);
 #ifndef ROUND_BIASED
 			if (j1 == 0 && mode != 1 && !(word1(&u) & 1)
 #ifdef Honor_FLT_ROUNDS
-				&& Rounding >= 1
+				&& (mode <= 1 || Rounding >= 1)
 #endif
 								   ) {
 				if (dig == '9')
@@ -4243,7 +6072,7 @@ dtoa
 				  }
 #endif /*Honor_FLT_ROUNDS*/
 				if (j1 > 0) {
-					b = lshift(b, 1);
+					b = lshift(b, 1 MTb);
 					j1 = cmp(b, S);
 #ifdef ROUND_BIASED
 					if (j1 >= 0 /*)*/
@@ -4259,7 +6088,7 @@ dtoa
 				}
 			if (j1 > 0) {
 #ifdef Honor_FLT_ROUNDS
-				if (!Rounding)
+				if (!Rounding && mode > 1)
 					goto accept_dig;
 #endif
 				if (dig == '9') { /* possible if i == 1 */
@@ -4276,18 +6105,19 @@ dtoa
 			*s++ = dig;
 			if (i == ilim)
 				break;
-			b = multadd(b, 10, 0);
+			b = multadd(b, 10, 0 MTb);
 			if (mlo == mhi)
-				mlo = mhi = multadd(mhi, 10, 0);
+				mlo = mhi = multadd(mhi, 10, 0 MTb);
 			else {
-				mlo = multadd(mlo, 10, 0);
-				mhi = multadd(mhi, 10, 0);
+				mlo = multadd(mlo, 10, 0 MTb);
+				mhi = multadd(mhi, 10, 0 MTb);
 				}
 			}
 		}
 	else
 		for(i = 1;; i++) {
-			*s++ = dig = quorem(b,S) + '0';
+			dig = quorem(b,S) + '0';
+			*s++ = dig;
 			if (!b->x[0] && b->wds <= 1) {
 #ifdef SET_INEXACT
 				inexact = 0;
@@ -4296,18 +6126,19 @@ dtoa
 				}
 			if (i >= ilim)
 				break;
-			b = multadd(b, 10, 0);
+			b = multadd(b, 10, 0 MTb);
 			}
 
 	/* Round off last digit */
 
 #ifdef Honor_FLT_ROUNDS
-	switch(Rounding) {
-	  case 0: goto trimzeros;
-	  case 2: goto roundoff;
-	  }
+	if (mode > 1)
+		switch(Rounding) {
+		  case 0: goto ret;
+		  case 2: goto roundoff;
+		  }
 #endif
-	b = lshift(b, 1);
+	b = lshift(b, 1 MTb);
 	j = cmp(b, S);
 #ifdef ROUND_BIASED
 	if (j >= 0)
@@ -4317,28 +6148,30 @@ dtoa
 		{
  roundoff:
 		while(*--s == '9')
-			if (s == s0) {
+			if (s == buf) {
 				k++;
 				*s++ = '1';
 				goto ret;
 				}
 		++*s++;
 		}
-	else {
-#ifdef Honor_FLT_ROUNDS
- trimzeros:
-#endif
-		while(*--s == '0');
-		s++;
-		}
  ret:
-	Bfree(S);
+	Bfree(S MTb);
 	if (mhi) {
 		if (mlo && mlo != mhi)
-			Bfree(mlo);
-		Bfree(mhi);
+			Bfree(mlo MTb);
+		Bfree(mhi MTb);
 		}
+ retc:
+	while(s > buf && s[-1] == '0')
+		--s;
  ret1:
+	if (b)
+		Bfree(b MTb);
+	*s = 0;
+	*decpt = k + 1;
+	if (rve)
+		*rve = s;
 #ifdef SET_INEXACT
 	if (inexact) {
 		if (!oldinexact) {
@@ -4350,13 +6183,23 @@ dtoa
 	else if (!oldinexact)
 		clear_inexact();
 #endif
-	Bfree(b);
-	*s = 0;
-	*decpt = k + 1;
-	if (rve)
-		*rve = s;
-	return s0;
+	return buf;
+	}
+
+ char *
+dtoa(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
+{
+	/*	Sufficient space is allocated to the return value
+		to hold the suppressed trailing zeros.
+		See dtoa_r() above for details on the other arguments.
+	*/
+#ifndef MULTIPLE_THREADS
+	if (dtoa_result)
+		freedtoa(dtoa_result);
+#endif
+	return dtoa_r(dd, mode, ndigits, decpt, sign, rve, 0, 0);
 	}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/dtoa_config.h b/dtoa_config.h
index 380e83b0..c168e28f 100644
--- a/dtoa_config.h
+++ b/dtoa_config.h
@@ -24,7 +24,7 @@
 #define IEEE_8087
 #endif
 
-#define MALLOC(n)   xmalloc(n)
+#define MALLOC xmalloc
 
 static void *xmalloc(size_t size)
 {
@@ -50,6 +50,10 @@ static pthread_mutex_t private_dtoa_lock[2] = {
     PTHREAD_MUTEX_INITIALIZER
 };
 
+#define dtoa_get_threadno pthread_self
+void
+set_max_dtoa_threads(unsigned int n);
+
 #define ACQUIRE_DTOA_LOCK(n)    do {                                \
     int r = pthread_mutex_lock(&private_dtoa_lock[n]);              \
     if (r) {                                                        \
diff --git a/fpconv.h b/fpconv.h
index 59e08675..5d9d95ea 100644
--- a/fpconv.h
+++ b/fpconv.h
@@ -7,10 +7,20 @@
 # define FPCONV_G_FMT_BUFSIZE   32
 
 #ifdef USE_INTERNAL_FPCONV
-static inline void fpconv_init(void)
+#ifdef MULTIPLE_THREADS
+#include "dtoa_config.h"
+#include <unistd.h>
+static inline void fpconv_init()
+{
+    // Add one to try and avoid core id multiplier alignment
+    set_max_dtoa_threads((sysconf(_SC_NPROCESSORS_CONF) + 1) * 3);
+}
+#else
+static inline void fpconv_init()
 {
     /* Do nothing - not required */
 }
+#endif
 #else
 extern void fpconv_init(void);
 #endif
diff --git a/runtests.sh b/runtests.sh
index fe606fa2..1c512367 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -67,6 +67,16 @@ if [ -z "$SKIP_CMAKE" ]; then
     cp -r lua/cjson build/cjson.so tests
     do_tests
     rm -rf build tests/cjson{,.so}
+
+    echo "===== Testing Cmake fpconv build ====="
+    mkdir build
+    cd build
+    cmake -DUSE_INTERNAL_FPCONV=1 ..
+    make
+    cd ..
+    cp -r lua/cjson build/cjson.so tests
+    do_tests
+    rm -rf build tests/cjson{,.so}
 else
     echo "===== Skipping Cmake build ====="
 fi

From 881accc8fadca5ec02aa34d364df2a1aa25cd2f9 Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Wed, 22 Feb 2023 22:01:42 +0800
Subject: [PATCH 38/57] bumped version to 2.1.0.12.

---
 lua-cjson-2.1.0.11-1.rockspec => lua-cjson-2.1.0.12-1.rockspec | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lua-cjson-2.1.0.11-1.rockspec => lua-cjson-2.1.0.12-1.rockspec (100%)

diff --git a/lua-cjson-2.1.0.11-1.rockspec b/lua-cjson-2.1.0.12-1.rockspec
similarity index 100%
rename from lua-cjson-2.1.0.11-1.rockspec
rename to lua-cjson-2.1.0.12-1.rockspec

From 2bfad8f5eeb821357d2ada29506e864ff7ec947e Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Thu, 20 Jul 2023 23:47:32 +0800
Subject: [PATCH 39/57] Bugfix: Lua cjson integer overflow issues
 (CVE-2022-24834) (#94)

* Fix integer overflows due to using wrong integer size.
* Add assertions / panic when overflow still happens.

Co-authored-by: Oran Agra <oran@redislabs.com>
Co-authored-by: Yossi Gottlieb <yossigo@gmail.com>
---
 .travis.yml |   2 +-
 lua_cjson.c |   9 +++--
 strbuf.c    | 110 ++++++++++++++--------------------------------------
 strbuf.h    |  46 +++++++++-------------
 4 files changed, 55 insertions(+), 112 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 091ff98b..469d5dd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ env:
     - JOBS=3
     - LUAROCKS_VER=2.4.2
   matrix:
-      #- LUA=1 LUA_DIR=/usr LUA_INCLUDE_DIR=$LUA_DIR/include/lua5.1
+      #- LUA=1 LUA_DIR=/usr LUA_INCLUDE_DIR=$LUA_DIR/include/lua5.1 
       - LUAJIT=1 LUA_DIR=/usr/local LUA_INCLUDE_DIR=$LUA_DIR/include/luajit-2.1 LUA_SUFFIX=--lua-suffix=jit
 
 install:
diff --git a/lua_cjson.c b/lua_cjson.c
index 42672de3..363466c7 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -40,6 +40,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
+#include <stdint.h>
 #include <limits.h>
 #include <lua.h>
 #include <lauxlib.h>
@@ -179,13 +180,13 @@ typedef struct {
 
 typedef struct {
     json_token_type_t type;
-    int index;
+    size_t index;
     union {
         const char *string;
         double number;
         int boolean;
     } value;
-    int string_len;
+    size_t string_len;
 } json_token_t;
 
 static const char *char2escape[256] = {
@@ -557,6 +558,8 @@ static void json_append_string(lua_State *l, strbuf_t *json, int lindex)
      * This buffer is reused constantly for small strings
      * If there are any excess pages, they won't be hit anyway.
      * This gains ~5% speedup. */
+    if (len > SIZE_MAX / 6 - 3)
+        abort(); /* Overflow check */
     strbuf_ensure_empty_length(json, len * 6 + 2);
 
     strbuf_append_char_unsafe(json, '\"');
@@ -848,7 +851,7 @@ static int json_encode(lua_State *l)
     strbuf_t local_encode_buf;
     strbuf_t *encode_buf;
     char *json;
-    int len;
+    size_t len;
 
     luaL_argcheck(l, lua_gettop(l) == 1, 1, "expected 1 argument");
 
diff --git a/strbuf.c b/strbuf.c
index ed133678..2dc30beb 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <stdint.h>
 
 #include "strbuf.h"
 
@@ -38,22 +39,22 @@ static void die(const char *fmt, ...)
     va_end(arg);
     fprintf(stderr, "\n");
 
-    exit(-1);
+    abort();
 }
 
-void strbuf_init(strbuf_t *s, int len)
+void strbuf_init(strbuf_t *s, size_t len)
 {
-    int size;
+    size_t size;
 
-    if (len <= 0)
+    if (!len)
         size = STRBUF_DEFAULT_SIZE;
     else
-        size = len + 1;         /* \0 terminator */
-
+        size = len + 1;
+    if (size < len)
+        die("Overflow, len: %zu", len);
     s->buf = NULL;
     s->size = size;
     s->length = 0;
-    s->increment = STRBUF_DEFAULT_INCREMENT;
     s->dynamic = 0;
     s->reallocs = 0;
     s->debug = 0;
@@ -65,7 +66,7 @@ void strbuf_init(strbuf_t *s, int len)
     strbuf_ensure_null(s);
 }
 
-strbuf_t *strbuf_new(int len)
+strbuf_t *strbuf_new(size_t len)
 {
     strbuf_t *s;
 
@@ -81,20 +82,10 @@ strbuf_t *strbuf_new(int len)
     return s;
 }
 
-void strbuf_set_increment(strbuf_t *s, int increment)
-{
-    /* Increment > 0:  Linear buffer growth rate
-     * Increment < -1: Exponential buffer growth rate */
-    if (increment == 0 || increment == -1)
-        die("BUG: Invalid string increment");
-
-    s->increment = increment;
-}
-
 static inline void debug_stats(strbuf_t *s)
 {
     if (s->debug) {
-        fprintf(stderr, "strbuf(%lx) reallocs: %d, length: %d, size: %d\n",
+        fprintf(stderr, "strbuf(%lx) reallocs: %d, length: %zd, size: %zd\n",
                 (long)s, s->reallocs, s->length, s->size);
     }
 }
@@ -113,7 +104,7 @@ void strbuf_free(strbuf_t *s)
         free(s);
 }
 
-char *strbuf_free_to_string(strbuf_t *s, int *len)
+char *strbuf_free_to_string(strbuf_t *s, size_t *len)
 {
     char *buf;
 
@@ -131,57 +122,63 @@ char *strbuf_free_to_string(strbuf_t *s, int *len)
     return buf;
 }
 
-static int calculate_new_size(strbuf_t *s, int len)
+static size_t calculate_new_size(strbuf_t *s, size_t len)
 {
-    int reqsize, newsize;
+    size_t reqsize, newsize;
 
     if (len <= 0)
         die("BUG: Invalid strbuf length requested");
 
     /* Ensure there is room for optional NULL termination */
     reqsize = len + 1;
+    if (reqsize < len)
+        die("Overflow, len: %zu", len);
 
     /* If the user has requested to shrink the buffer, do it exactly */
     if (s->size > reqsize)
         return reqsize;
 
     newsize = s->size;
-    if (s->increment < 0) {
+    if (reqsize >= SIZE_MAX / 2) {
+        newsize = reqsize;
+    } else {
         /* Exponential sizing */
         while (newsize < reqsize)
-            newsize *= -s->increment;
-    } else if (s->increment != 0)  {
-        /* Linear sizing */
-        newsize = ((newsize + s->increment - 1) / s->increment) * s->increment;
+            newsize *= 2;
     }
 
+    if (newsize < reqsize)
+        die("BUG: strbuf length would overflow, len: %zu", len);
+
+
     return newsize;
 }
 
 
 /* Ensure strbuf can handle a string length bytes long (ignoring NULL
  * optional termination). */
-void strbuf_resize(strbuf_t *s, int len)
+void strbuf_resize(strbuf_t *s, size_t len)
 {
-    int newsize;
+    size_t newsize;
 
     newsize = calculate_new_size(s, len);
 
     if (s->debug > 1) {
-        fprintf(stderr, "strbuf(%lx) resize: %d => %d\n",
+        fprintf(stderr, "strbuf(%lx) resize: %zd => %zd\n",
                 (long)s, s->size, newsize);
     }
 
     s->size = newsize;
     s->buf = realloc(s->buf, s->size);
     if (!s->buf)
-        die("Out of memory");
+        die("Out of memory, len: %zu", len);
     s->reallocs++;
 }
 
 void strbuf_append_string(strbuf_t *s, const char *str)
 {
-    int space, i;
+    int i;
+    size_t space;
 
     space = strbuf_empty_length(s);
 
@@ -197,55 +194,6 @@ void strbuf_append_string(strbuf_t *s, const char *str)
     }
 }
 
-/* strbuf_append_fmt() should only be used when an upper bound
- * is known for the output string. */
-void strbuf_append_fmt(strbuf_t *s, int len, const char *fmt, ...)
-{
-    va_list arg;
-    int fmt_len;
-
-    strbuf_ensure_empty_length(s, len);
-
-    va_start(arg, fmt);
-    fmt_len = vsnprintf(s->buf + s->length, len, fmt, arg);
-    va_end(arg);
-
-    if (fmt_len < 0)
-        die("BUG: Unable to convert number");  /* This should never happen.. */
-
-    s->length += fmt_len;
-}
-
-/* strbuf_append_fmt_retry() can be used when the there is no known
- * upper bound for the output string. */
-void strbuf_append_fmt_retry(strbuf_t *s, const char *fmt, ...)
-{
-    va_list arg;
-    int fmt_len, try;
-    int empty_len;
-
-    /* If the first attempt to append fails, resize the buffer appropriately
-     * and try again */
-    for (try = 0; ; try++) {
-        va_start(arg, fmt);
-        /* Append the new formatted string */
-        /* fmt_len is the length of the string required, excluding the
-         * trailing NULL */
-        empty_len = strbuf_empty_length(s);
-        /* Add 1 since there is also space to store the terminating NULL. */
-        fmt_len = vsnprintf(s->buf + s->length, empty_len + 1, fmt, arg);
-        va_end(arg);
-
-        if (fmt_len <= empty_len)
-            break;  /* SUCCESS */
-        if (try > 0)
-            die("BUG: length of formatted string changed");
-
-        strbuf_resize(s, s->length + fmt_len);
-    }
-
-    s->length += fmt_len;
-}
 
 /* vi:ai et sw=4 ts=4:
  */
diff --git a/strbuf.h b/strbuf.h
index a98ee220..d77e0f4b 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -32,15 +32,13 @@
 
 /* Size: Total bytes allocated to *buf
  * Length: String length, excluding optional NULL terminator.
- * Increment: Allocation increments when resizing the string buffer.
  * Dynamic: True if created via strbuf_new()
  */
 
 typedef struct {
     char *buf;
-    int size;
-    int length;
-    int increment;
+    size_t size;
+    size_t length;
     int dynamic;
     int reallocs;
     int debug;
@@ -49,33 +47,27 @@ typedef struct {
 #ifndef STRBUF_DEFAULT_SIZE
 #define STRBUF_DEFAULT_SIZE 1023
 #endif
-#ifndef STRBUF_DEFAULT_INCREMENT
-#define STRBUF_DEFAULT_INCREMENT -2
-#endif
 
 /* Initialise */
-extern strbuf_t *strbuf_new(int len);
-extern void strbuf_init(strbuf_t *s, int len);
-extern void strbuf_set_increment(strbuf_t *s, int increment);
+extern strbuf_t *strbuf_new(size_t len);
+extern void strbuf_init(strbuf_t *s, size_t len);
 
 /* Release */
 extern void strbuf_free(strbuf_t *s);
-extern char *strbuf_free_to_string(strbuf_t *s, int *len);
+extern char *strbuf_free_to_string(strbuf_t *s, size_t *len);
 
 /* Management */
-extern void strbuf_resize(strbuf_t *s, int len);
-static int strbuf_empty_length(strbuf_t *s);
-static int strbuf_length(strbuf_t *s);
-static char *strbuf_string(strbuf_t *s, int *len);
-static void strbuf_ensure_empty_length(strbuf_t *s, int len);
+extern void strbuf_resize(strbuf_t *s, size_t len);
+static size_t strbuf_empty_length(strbuf_t *s);
+static size_t strbuf_length(strbuf_t *s);
+static char *strbuf_string(strbuf_t *s, size_t *len);
+static void strbuf_ensure_empty_length(strbuf_t *s, size_t len);
 static char *strbuf_empty_ptr(strbuf_t *s);
-static void strbuf_extend_length(strbuf_t *s, int len);
+static void strbuf_extend_length(strbuf_t *s, size_t len);
 static void strbuf_set_length(strbuf_t *s, int len);
 
 /* Update */
-extern void strbuf_append_fmt(strbuf_t *s, int len, const char *fmt, ...);
-extern void strbuf_append_fmt_retry(strbuf_t *s, const char *format, ...);
-static void strbuf_append_mem(strbuf_t *s, const char *c, int len);
+static void strbuf_append_mem(strbuf_t *s, const char *c, size_t len);
 extern void strbuf_append_string(strbuf_t *s, const char *str);
 static void strbuf_append_char(strbuf_t *s, const char c);
 static void strbuf_ensure_null(strbuf_t *s);
@@ -93,12 +85,12 @@ static inline int strbuf_allocated(strbuf_t *s)
 
 /* Return bytes remaining in the string buffer
  * Ensure there is space for a NULL terminator. */
-static inline int strbuf_empty_length(strbuf_t *s)
+static inline size_t strbuf_empty_length(strbuf_t *s)
 {
     return s->size - s->length - 1;
 }
 
-static inline void strbuf_ensure_empty_length(strbuf_t *s, int len)
+static inline void strbuf_ensure_empty_length(strbuf_t *s, size_t len)
 {
     if (len > strbuf_empty_length(s))
         strbuf_resize(s, s->length + len);
@@ -114,12 +106,12 @@ static inline void strbuf_set_length(strbuf_t *s, int len)
     s->length = len;
 }
 
-static inline void strbuf_extend_length(strbuf_t *s, int len)
+static inline void strbuf_extend_length(strbuf_t *s, size_t len)
 {
     s->length += len;
 }
 
-static inline int strbuf_length(strbuf_t *s)
+static inline size_t strbuf_length(strbuf_t *s)
 {
     return s->length;
 }
@@ -135,14 +127,14 @@ static inline void strbuf_append_char_unsafe(strbuf_t *s, const char c)
     s->buf[s->length++] = c;
 }
 
-static inline void strbuf_append_mem(strbuf_t *s, const char *c, int len)
+static inline void strbuf_append_mem(strbuf_t *s, const char *c, size_t len)
 {
     strbuf_ensure_empty_length(s, len);
     memcpy(s->buf + s->length, c, len);
     s->length += len;
 }
 
-static inline void strbuf_append_mem_unsafe(strbuf_t *s, const char *c, int len)
+static inline void strbuf_append_mem_unsafe(strbuf_t *s, const char *c, size_t len)
 {
     memcpy(s->buf + s->length, c, len);
     s->length += len;
@@ -153,7 +145,7 @@ static inline void strbuf_ensure_null(strbuf_t *s)
     s->buf[s->length] = 0;
 }
 
-static inline char *strbuf_string(strbuf_t *s, int *len)
+static inline char *strbuf_string(strbuf_t *s, size_t *len)
 {
     if (len)
         *len = s->length;

From 68019ea31883e3bb448f57ba5b76ef900f40ecc0 Mon Sep 17 00:00:00 2001
From: Dave Corley <73663882+magicaldave@users.noreply.github.com>
Date: Mon, 16 Oct 2023 14:31:08 -0500
Subject: [PATCH 40/57] Feat(CI): Add automated builds (#1)

* Feat(CI): Add automated builds
---
 .github/workflows/cjson.yml |  78 ++++++++
 CI/get_luajit.Linux.sh      |  36 ++++
 CI/get_luajit.windows.sh    |  52 ++++++
 CMakeLists.txt              |   4 +-
 cmake/FindLuaJit.cmake      |  16 ++
 cmake/LibFindMacros.cmake   | 363 ++++++++++++++++++++++++++++++++++++
 6 files changed, 548 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/cjson.yml
 create mode 100755 CI/get_luajit.Linux.sh
 create mode 100755 CI/get_luajit.windows.sh
 create mode 100644 cmake/FindLuaJit.cmake
 create mode 100644 cmake/LibFindMacros.cmake

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
new file mode 100644
index 00000000..37bd7fb1
--- /dev/null
+++ b/.github/workflows/cjson.yml
@@ -0,0 +1,78 @@
+name: CJSON-Main
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  CJSON_MASTER:
+    strategy:
+      matrix:
+        build_type: [Release, RelWithDebInfo, MinSizeRel, Debug]
+        target_system: [ ubuntu-22.04, windows-2022 ]
+    runs-on: ${{ matrix.target_system }}
+    env:
+      BUILD_EXT: ${{ matrix.target_system == 'windows-2022' && '.dll' || '.so' }}
+      BUILD_DIR: ${{ matrix.target_system == 'windows-2022' && 'D:/a/lua-cjson/lua-cjson' || '/home/runner/work/lua-cjson/lua-cjson' }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Prime ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ matrix.target_system }}-${{ matrix.build_type }}
+          max-size: 1000M
+
+      - name: Cache LuaJIT
+        id: cache-Lua
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ runner.os == 'Linux' && 'apt-cache' || 'LuaJIT' }}
+          key: ${{ runner.os }}-Lua
+
+      - name: Get Deps (LuaJIT)
+        shell: bash
+        if: steps.cache-Lua.outputs.cache-hit != 'true'
+        run: |
+          ${{ runner.os == 'Linux' && 'sudo' || '' }} CI/get_luajit.${{runner.os}}.sh openmw-deps
+
+      - name: Configure
+        shell: bash
+        run: |
+          LUA_DIR=LuaJIT/ cmake .
+
+      - name: Build
+        run: |
+          cmake --build . --config ${{ matrix.build_type }}
+
+      - name: Prep Windows Release
+        if: runner.os == 'Windows'
+        run: |
+          mv ${{ env.BUILD_DIR }}/${{ matrix.build_type }}/cjson.dll ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}.dll
+
+      - name: Prep Linux Release
+        if: runner.os != 'Windows'
+        run: |
+          mv ${{ env.BUILD_DIR }}/cjson.so ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}.so
+
+      - name: Upload Release
+        if: github.event_name != 'pull_request'
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: Stable-CI
+          files: ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}${{ env.BUILD_EXT }}
+          body: |
+            CI Build for Dreamweave IO2 fork
+
+      - name: Upload Artifact
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v3
+        with:
+          name: cjson-${{ matrix.build_type }}-${{matrix.target_system}}
+          path: ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}${{ env.BUILD_EXT }}
diff --git a/CI/get_luajit.Linux.sh b/CI/get_luajit.Linux.sh
new file mode 100755
index 00000000..d47813e3
--- /dev/null
+++ b/CI/get_luajit.Linux.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -euo pipefail
+
+print_help() {
+  echo "usage: $0 [group]..."
+  echo
+  echo "  available groups: "${!GROUPED_DEPS[@]}""
+}
+
+declare -rA GROUPED_DEPS=(
+  # Common dependencies for building OpenMW.
+  [openmw-deps]="
+    libluajit-5.1-dev
+  "
+)
+
+if [[ $# -eq 0 ]]; then
+  >&2 print_help
+  exit 1
+fi
+
+deps=()
+for group in "$@"; do
+  if [[ ! -v GROUPED_DEPS[$group] ]]; then
+    >&2 echo "error: unknown group ${group}"
+    exit 1
+  fi
+  deps+=(${GROUPED_DEPS[$group]})
+done
+
+export APT_CACHE_DIR="${PWD}/apt-cache"
+set -x
+mkdir -pv "$APT_CACHE_DIR"
+apt-get update -yq
+apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"
diff --git a/CI/get_luajit.windows.sh b/CI/get_luajit.windows.sh
new file mode 100755
index 00000000..e56c2cb0
--- /dev/null
+++ b/CI/get_luajit.windows.sh
@@ -0,0 +1,52 @@
+set -e
+
+download() {
+    if [ $# -lt 3 ]; then
+	echo "Invalid parameters to download."
+	return 1
+    fi
+
+    NAME=$1
+    shift
+
+    echo "$NAME..."
+
+    while [ $# -gt 1 ]; do
+	URL=$1
+	FILE=$2
+	shift
+	shift
+
+	if ! [ -f $FILE ]; then
+	    printf "  Downloading $FILE... "
+
+	    if [ -z $VERBOSE ]; then
+		RET=0
+		curl --silent --fail --retry 10 -Ly 5 -o $FILE $URL || RET=$?
+	    else
+		RET=0
+		curl --fail --retry 10 -Ly 5 -o $FILE $URL || RET=$?
+	    fi
+
+	    if [ $RET -ne 0 ]; then
+		echo "Failed!"
+		wrappedExit $RET
+	    else
+		echo "Done."
+	    fi
+	else
+	    echo "  $FILE exists, skipping."
+	fi
+    done
+
+    if [ $# -ne 0 ]; then
+	echo "Missing parameter."
+    fi
+}
+
+download "LuaJIT v2.1.0-beta3-452-g7a0cf5fd" \
+	 "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/LuaJIT-v2.1.0-beta3-452-g7a0cf5fd-msvc2019-win64.7z" \
+	 "LuaJIT-v2.1.0-beta3-452-g7a0cf5fd-msvc2019-win64.7z"
+
+echo "Extracting LuaJIT . . ."
+eval 7z x -y LuaJIT-v2.1.0-beta3-452-g7a0cf5fd-msvc2019-win64.7z -o./LuaJIT
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c17239b2..3f3741dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,9 @@ if(NOT CMAKE_BUILD_TYPE)
         FORCE)
 endif()
 
-find_package(Lua51 REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+
+find_package(LuaJit REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
 
 if(NOT USE_INTERNAL_FPCONV)
diff --git a/cmake/FindLuaJit.cmake b/cmake/FindLuaJit.cmake
new file mode 100644
index 00000000..213487c0
--- /dev/null
+++ b/cmake/FindLuaJit.cmake
@@ -0,0 +1,16 @@
+include(LibFindMacros)
+
+libfind_pkg_detect(LuaJit luajit
+    FIND_PATH luajit.h
+        HINTS $ENV{LUA_DIR}
+        PATH_SUFFIXES include include/luajit-2.1
+    FIND_LIBRARY luajit-5.1 luajit lua51
+        HINTS $ENV{LUA_DIR}
+        PATH_SUFFIXES lib
+)
+
+
+libfind_process(LuaJit)
+
+set(LUA_LIBRARY ${LuaJit_LIBRARY})
+set(LUA_INCLUDE_DIR ${LuaJit_INCLUDE_DIR})
diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
new file mode 100644
index 00000000..2be27c5f
--- /dev/null
+++ b/cmake/LibFindMacros.cmake
@@ -0,0 +1,363 @@
+# Version 2.2
+# Public Domain, originally written by Lasse Kärkkäinen <tronic>
+# Maintained at https://github.com/Tronic/cmake-modules
+# Please send your improvements as pull requests on Github.
+
+include(CMakeParseArguments)
+
+# Find another package and make it a dependency of the current package.
+# This also automatically forwards the "REQUIRED" argument.
+# Usage: libfind_package(<prefix> <another package> [extra args to find_package])
+macro (libfind_package PREFIX PKG)
+  set(${PREFIX}_args ${PKG} ${ARGN})
+  if (${PREFIX}_FIND_REQUIRED)
+    set(${PREFIX}_args ${${PREFIX}_args} REQUIRED)
+  endif()
+  find_package(${${PREFIX}_args})
+  set(${PREFIX}_DEPENDENCIES ${${PREFIX}_DEPENDENCIES};${PKG})
+  unset(${PREFIX}_args)
+endmacro()
+
+# A simple wrapper to make pkg-config searches a bit easier.
+# Works the same as CMake's internal pkg_check_modules but is always quiet.
+macro (libfind_pkg_check_modules)
+  find_package(PkgConfig QUIET)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(${ARGN} QUIET)
+  endif()
+endmacro()
+
+# Avoid useless copy&pasta by doing what most simple libraries do anyway:
+# pkg-config, find headers, find library.
+# Usage: libfind_pkg_detect(<prefix> <pkg-config args> FIND_PATH <name> [other args] FIND_LIBRARY <name> [other args])
+# E.g. libfind_pkg_detect(SDL2 sdl2 FIND_PATH SDL.h PATH_SUFFIXES SDL2 FIND_LIBRARY SDL2)
+function (libfind_pkg_detect PREFIX)
+  # Parse arguments
+  set(argname pkgargs)
+  foreach (i ${ARGN})
+    if ("${i}" STREQUAL "FIND_PATH")
+      set(argname pathargs)
+    elseif ("${i}" STREQUAL "FIND_LIBRARY")
+      set(argname libraryargs)
+    else()
+      set(${argname} ${${argname}} ${i})
+    endif()
+  endforeach()
+  if (NOT pkgargs)
+    message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
+  endif()
+  # Find library
+  libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs})
+  if (pathargs)
+    find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
+  endif()
+  if (libraryargs)
+    find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
+  endif()
+endfunction()
+
+# libfind_header_path(<PREFIX> [PATHS <path> [<path> ...]] NAMES <name> [name ...] VAR <out_var> [QUIET])
+# Get fullpath of the first found header looking inside <PREFIX>_INCLUDE_DIR or in the given PATHS
+# Usage: libfind_header_path(Foobar NAMES foobar/version.h VAR filepath)
+function (libfind_header_path PREFIX)
+  set(options QUIET)
+  set(one_value_keywords VAR PATH)
+  set(multi_value_keywords NAMES PATHS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (NOT OPT_VAR OR NOT OPT_NAMES)
+    message(FATAL_ERROR "Arguments VAR, NAMES are required!")
+  endif()
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(quiet TRUE)
+  endif()
+  set(paths ${OPT_PATHS} ${PREFIX}_INCLUDE_DIR)
+
+  foreach(name ${OPT_NAMES})
+    foreach(path ${paths})
+      set(filepath "${${path}}/${name}")
+      # check for existance
+      if (EXISTS ${filepath})
+        set(${OPT_VAR} ${filepath} PARENT_SCOPE) # export path
+        return()
+      endif()
+    endforeach()
+  endforeach()
+
+  # report error if not found
+  set(${OPT_VAR} NOTFOUND PARENT_SCOPE)
+  if (NOT quiet)
+    message(AUTHOR_WARNING "Unable to find '${OPT_NAMES}'")
+  endif()
+endfunction()
+
+# libfind_version_n_header(<PREFIX>
+#  NAMES <name> [<name> ...]
+#  DEFINES <define> [<define> ...] | CONSTANTS <const> [<const> ...]
+#  [PATHS <path> [<path> ...]]
+#  [QUIET]
+# )
+# Collect all defines|constants from a header inside <PREFIX>_INCLUDE_DIR or in the given PATHS
+#  output stored to <PREFIX>_VERSION.
+# This function does nothing if the version variable is already defined.
+# Usage: libfind_version_n_header(Foobar NAMES foobar/version.h DEFINES FOOBAR_VERSION_MAJOR FOOBAR_VERSION_MINOR)
+function (libfind_version_n_header PREFIX)
+  # Skip processing if we already have a version
+  if (${PREFIX}_VERSION)
+    return()
+  endif()
+
+  set(options QUIET)
+  set(one_value_keywords )
+  set(multi_value_keywords NAMES PATHS DEFINES CONSTANTS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (NOT OPT_NAMES OR (NOT OPT_DEFINES AND NOT OPT_CONSTANTS))
+    message(FATAL_ERROR "Arguments NAMES, DEFINES|CONSTANTS are required!")
+  endif()
+  if (OPT_DEFINES AND OPT_CONSTANTS)
+    message(FATAL_ERROR "Either DEFINES or CONSTANTS must be set!")
+  endif()
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(quiet TRUE)
+    set(force_quiet "QUIET") # to propagate argument QUIET
+  endif()
+
+  # Read the header
+  libfind_header_path(${PREFIX} NAMES ${OPT_NAMES} PATHS ${OPT_PATHS} VAR filename ${force_quiet})
+  if (NOT filename)
+    return()
+  endif()
+  file(READ "${filename}" header)
+  # Parse for version number
+  unset(version_parts)
+  foreach(define_name ${OPT_DEFINES})
+    string(REGEX MATCH "# *define +${define_name} +((\"([^\n]*)\")|([^ \n]*))" match "${header}")
+    # No regex match?
+    if (NOT match OR match STREQUAL header)
+      if (NOT quiet)
+        message(AUTHOR_WARNING "Unable to find \#define ${define_name} \"<version>\" from ${filename}")
+      endif()
+      return()
+    else()
+      list(APPEND version_parts "${CMAKE_MATCH_3}${CMAKE_MATCH_4}")
+    endif()
+  endforeach()
+  foreach(constant_name ${OPT_CONSTANTS})
+    string(REGEX MATCH "${constant_name} *= *((\"([^\;]*)\")|([^ \;]*))" match "${header}")
+    # No regex match?
+    if (NOT match OR match STREQUAL header)
+      if (NOT quiet)
+        message(AUTHOR_WARNING "Unable to find ${constant_name} = \"<version>\" from ${filename}")
+      endif()
+      return()
+    else()
+      list(APPEND version_parts "${CMAKE_MATCH_3}${CMAKE_MATCH_4}")
+    endif()
+  endforeach()
+
+  # Export the version string
+  string(REPLACE ";" "." version "${version_parts}")
+  set(${PREFIX}_VERSION "${version}" PARENT_SCOPE)
+endfunction()
+
+# libfind_version_header(<PREFIX> <HEADER> <DEFINE_NAME> [PATHS <path> [<path> ...]] [QUIET])
+# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
+# This function does nothing if the version variable is already defined.
+# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
+function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
+  # Skip processing if we already have a version
+  if (${PREFIX}_VERSION)
+    return()
+  endif()
+
+  set(options QUIET)
+  set(one_value_keywords )
+  set(multi_value_keywords PATHS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(force_quiet "QUIET") # to propagate argument QUIET
+  endif()
+
+  libfind_version_n_header(${PREFIX} NAMES ${VERSION_H} PATHS ${OPT_PATHS} DEFINES ${DEFINE_NAME} ${force_quiet})
+  set(${PREFIX}_VERSION "${${PREFIX}_VERSION}" PARENT_SCOPE)
+endfunction()
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+function (libfind_process PREFIX)
+  # Skip processing if already processed during this configuration run
+  if (${PREFIX}_FOUND)
+    return()
+  endif()
+
+  set(found TRUE)  # Start with the assumption that the package was found
+
+  # Did we find any files? Did we miss includes? These are for formatting better error messages.
+  set(some_files FALSE)
+  set(missing_headers FALSE)
+
+  # Shorthands for some variables that we need often
+  set(quiet ${${PREFIX}_FIND_QUIETLY})
+  set(required ${${PREFIX}_FIND_REQUIRED})
+  set(exactver ${${PREFIX}_FIND_VERSION_EXACT})
+  set(findver "${${PREFIX}_FIND_VERSION}")
+  set(version "${${PREFIX}_VERSION}")
+
+  # Lists of config option names (all, includes, libs)
+  unset(configopts)
+  set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
+  set(libraryopts ${${PREFIX}_PROCESS_LIBS})
+
+  # Process deps to add to
+  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
+    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
+      # The package seems to export option lists that we can use, woohoo!
+      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
+      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
+    else()
+      # If plural forms don't exist or they equal singular forms
+      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
+          ({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
+        # Singular forms can be used
+        if (DEFINED ${i}_INCLUDE_DIR)
+          list(APPEND includeopts ${i}_INCLUDE_DIR)
+        endif()
+        if (DEFINED ${i}_LIBRARY)
+          list(APPEND libraryopts ${i}_LIBRARY)
+        endif()
+      else()
+        # Oh no, we don't know the option names
+        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
+      endif()
+    endif()
+  endforeach()
+
+  if (includeopts)
+    list(REMOVE_DUPLICATES includeopts)
+  endif()
+
+  if (libraryopts)
+    list(REMOVE_DUPLICATES libraryopts)
+  endif()
+
+  string(REGEX REPLACE ".*[ ;]([^ ;]*(_INCLUDE_DIRS|_LIBRARIES))" "\\1" tmp "${includeopts} ${libraryopts}")
+  if (NOT tmp STREQUAL "${includeopts} ${libraryopts}")
+    message(AUTHOR_WARNING "Plural form ${tmp} found in config options of ${PREFIX}. This works as before but is now deprecated. Please only use singular forms INCLUDE_DIR and LIBRARY, and update your find scripts for LibFindMacros > 2.0 automatic dependency system (most often you can simply remove the PROCESS variables entirely).")
+  endif()
+
+  # Include/library names separated by spaces (notice: not CMake lists)
+  unset(includes)
+  unset(libs)
+
+  # Process all includes and set found false if any are missing
+  foreach (i ${includeopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND includes "${${i}}")
+    else()
+      set(found FALSE)
+      set(missing_headers TRUE)
+    endif()
+  endforeach()
+
+  # Process all libraries and set found false if any are missing
+  foreach (i ${libraryopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND libs "${${i}}")
+    else()
+      set (found FALSE)
+    endif()
+  endforeach()
+
+  # Version checks
+  if (found AND findver)
+    if (NOT version)
+      message(WARNING "The find module for ${PREFIX} does not provide version information, so we'll just assume that it is OK. Please fix the module or remove package version requirements to get rid of this warning.")
+    elseif (version VERSION_LESS findver OR (exactver AND NOT version VERSION_EQUAL findver))
+      set(found FALSE)
+      set(version_unsuitable TRUE)
+    endif()
+  endif()
+
+  # If all-OK, hide all config options, export variables, print status and exit
+  if (found)
+    foreach (i ${configopts})
+      mark_as_advanced(${i})
+    endforeach()
+    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
+    set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
+    set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
+    if (NOT quiet)
+      message(STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+      if (LIBFIND_DEBUG)
+        message(STATUS "  ${PREFIX}_DEPENDENCIES=${${PREFIX}_DEPENDENCIES}")
+        message(STATUS "  ${PREFIX}_INCLUDE_OPTS=${includeopts}")
+        message(STATUS "  ${PREFIX}_INCLUDE_DIRS=${includes}")
+        message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
+        message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
+      endif()
+    endif()
+    return()
+  endif()
+
+  # Format messages for debug info and the type of error
+  set(vars "Relevant CMake configuration variables:\n")
+  foreach (i ${configopts})
+    mark_as_advanced(CLEAR ${i})
+    set(val ${${i}})
+    if ("${val}" STREQUAL "${i}-NOTFOUND")
+      set (val "<not found>")
+    elseif (val AND NOT EXISTS "${val}")
+      set (val "${val}  (does not exist)")
+    else()
+      set(some_files TRUE)
+    endif()
+    set(vars "${vars}  ${i}=${val}\n")
+  endforeach()
+  set(vars "${vars}You may use CMake GUI, cmake -D or ccmake to modify the values. Delete CMakeCache.txt to discard all values and force full re-detection if necessary.\n")
+  if (version_unsuitable)
+    set(msg "${PREFIX} ${${PREFIX}_VERSION} was found but")
+    if (exactver)
+      set(msg "${msg} only version ${findver} is acceptable.")
+    else()
+      set(msg "${msg} version ${findver} is the minimum requirement.")
+    endif()
+  else()
+    if (missing_headers)
+      set(msg "We could not find development headers for ${PREFIX}. Do you have the necessary dev package installed?")
+    elseif (some_files)
+      set(msg "We only found some files of ${PREFIX}, not all of them. Perhaps your installation is incomplete or maybe we just didn't look in the right place?")
+      if(findver)
+        set(msg "${msg} This could also be caused by incompatible version (if it helps, at least ${PREFIX} ${findver} should work).")
+      endif()
+    else()
+      set(msg "We were unable to find package ${PREFIX}.")
+    endif()
+  endif()
+
+  # Fatal error out if REQUIRED
+  if (required)
+    set(msg "REQUIRED PACKAGE NOT FOUND\n${msg} This package is REQUIRED and you need to install it or adjust CMake configuration in order to continue building ${CMAKE_PROJECT_NAME}.")
+    message(FATAL_ERROR "${msg}\n${vars}")
+  endif()
+  # Otherwise just print a nasty warning
+  if (NOT quiet)
+    message(WARNING "WARNING: MISSING PACKAGE\n${msg} This package is NOT REQUIRED and you may ignore this warning but by doing so you may miss some functionality of ${CMAKE_PROJECT_NAME}. \n${vars}")
+  endif()
+endfunction()
+

From c6ffa11d8439a817cfbc4993cc6b0539620f967e Mon Sep 17 00:00:00 2001
From: Dave Corley <73663882+magicaldave@users.noreply.github.com>
Date: Wed, 18 Oct 2023 06:20:25 -0500
Subject: [PATCH 41/57] Feat(CI): Add macOS builds & Dreamweave LuaJIT (#2)

---
 .github/workflows/cjson.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index 37bd7fb1..927a5e3a 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         build_type: [Release, RelWithDebInfo, MinSizeRel, Debug]
-        target_system: [ ubuntu-22.04, windows-2022 ]
+        target_system: [ ubuntu-22.04, windows-2022, macos-11 ]
     runs-on: ${{ matrix.target_system }}
     env:
       BUILD_EXT: ${{ matrix.target_system == 'windows-2022' && '.dll' || '.so' }}
@@ -40,7 +40,8 @@ jobs:
         shell: bash
         if: steps.cache-Lua.outputs.cache-hit != 'true'
         run: |
-          ${{ runner.os == 'Linux' && 'sudo' || '' }} CI/get_luajit.${{runner.os}}.sh openmw-deps
+          curl -o LuaJIT.7z -L https://github.com/DreamWeave-MP/LuaJIT/releases/download/Stable-CI/LuaJIT-${{ runner.os }}.7z
+          7z x -y LuaJIT.7z -oLuaJIT/
 
       - name: Configure
         shell: bash
@@ -51,22 +52,22 @@ jobs:
         run: |
           cmake --build . --config ${{ matrix.build_type }}
 
-      - name: Prep Windows Release
-        if: runner.os == 'Windows'
-        run: |
-          mv ${{ env.BUILD_DIR }}/${{ matrix.build_type }}/cjson.dll ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}.dll
+      # - name: Prep Windows Release
+      #   if: runner.os == 'Windows'
+      #   run: |
+      #     mv ${{ env.BUILD_DIR }}/${{ matrix.build_type }}/cjson.dll ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}.dll
 
       - name: Prep Linux Release
-        if: runner.os != 'Windows'
+        # if: runner.os != 'Windows'
         run: |
-          mv ${{ env.BUILD_DIR }}/cjson.so ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}.so
+          mv ${{ runner.os == 'Windows' && matrix.build_type || '.'}}/cjson${{ env.BUILD_EXT }} cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
 
       - name: Upload Release
         if: github.event_name != 'pull_request'
         uses: softprops/action-gh-release@v1
         with:
           tag_name: Stable-CI
-          files: ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}${{ env.BUILD_EXT }}
+          files: cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
           body: |
             CI Build for Dreamweave IO2 fork
 
@@ -74,5 +75,5 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: actions/upload-artifact@v3
         with:
-          name: cjson-${{ matrix.build_type }}-${{matrix.target_system}}
-          path: ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}${{ env.BUILD_EXT }}
+          name: cjson-${{ matrix.build_type }}-${{ runner.os }}
+          path: cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}

From 5dae577de66bdf94d37f726378f11e9a9928fefa Mon Sep 17 00:00:00 2001
From: Dave Corley <73663882+magicaldave@users.noreply.github.com>
Date: Fri, 20 Oct 2023 06:58:38 -0500
Subject: [PATCH 42/57] Feat(CI): Fix Windows builds by building in gcc (#3)

* Fix(CI): Add gcc builds for windows environments
---
 .github/workflows/cjson.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index 927a5e3a..6748a565 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -22,6 +22,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: msys2/setup-msys2@v2
+        if: runner.os == 'Windows'
+        with:
+          msystem: UCRT64
+          update: true
+          install: git mingw-w64-ucrt-x86_64-gcc
+
       - name: Prime ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
@@ -33,7 +40,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            ${{ runner.os == 'Linux' && 'apt-cache' || 'LuaJIT' }}
+            LuaJIT
           key: ${{ runner.os }}-Lua
 
       - name: Get Deps (LuaJIT)
@@ -44,23 +51,24 @@ jobs:
           7z x -y LuaJIT.7z -oLuaJIT/
 
       - name: Configure
+        if: runner.os != 'Windows'
         shell: bash
         run: |
           LUA_DIR=LuaJIT/ cmake .
 
+      - name: Configure
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          LUA_DIR=LuaJIT/ CC=$(which gcc) cmake . -G 'MinGW Makefiles'
+
       - name: Build
         run: |
           cmake --build . --config ${{ matrix.build_type }}
 
-      # - name: Prep Windows Release
-      #   if: runner.os == 'Windows'
-      #   run: |
-      #     mv ${{ env.BUILD_DIR }}/${{ matrix.build_type }}/cjson.dll ${{ env.BUILD_DIR }}/cjson-${{ matrix.build_type }}.dll
-
-      - name: Prep Linux Release
-        # if: runner.os != 'Windows'
+      - name: Prep Release
         run: |
-          mv ${{ runner.os == 'Windows' && matrix.build_type || '.'}}/cjson${{ env.BUILD_EXT }} cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
+          mv cjson${{ env.BUILD_EXT }} cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
 
       - name: Upload Release
         if: github.event_name != 'pull_request'

From bffdffe4a2d56e00a3b9881ee16085e3ab4f3bde Mon Sep 17 00:00:00 2001
From: Dave Corley <smokydave@icloud.com>
Date: Fri, 20 Oct 2023 17:58:53 -0500
Subject: [PATCH 43/57] Test(CI): Make phoenix build it

---
 .github/workflows/cjson.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index 927a5e3a..41093b18 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         build_type: [Release, RelWithDebInfo, MinSizeRel, Debug]
         target_system: [ ubuntu-22.04, windows-2022, macos-11 ]
-    runs-on: ${{ matrix.target_system }}
+    runs-on:  ${{ matrix.target_system == 'windows-2022' && '[self-hosted, windows, x64]' || matrix.target_system }}
     env:
       BUILD_EXT: ${{ matrix.target_system == 'windows-2022' && '.dll' || '.so' }}
       BUILD_DIR: ${{ matrix.target_system == 'windows-2022' && 'D:/a/lua-cjson/lua-cjson' || '/home/runner/work/lua-cjson/lua-cjson' }}

From 4ca1190875582c90a21e09339f96ed432530af23 Mon Sep 17 00:00:00 2001
From: Phoenix / Hotaru <DeriousHD@gmail.com>
Date: Tue, 24 Oct 2023 09:45:45 +0100
Subject: [PATCH 44/57] Revert "Test(CI): Make phoenix build it"

This reverts commit bffdffe4a2d56e00a3b9881ee16085e3ab4f3bde.
---
 .github/workflows/cjson.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index f1c60a61..6748a565 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         build_type: [Release, RelWithDebInfo, MinSizeRel, Debug]
         target_system: [ ubuntu-22.04, windows-2022, macos-11 ]
-    runs-on:  ${{ matrix.target_system == 'windows-2022' && '[self-hosted, windows, x64]' || matrix.target_system }}
+    runs-on: ${{ matrix.target_system }}
     env:
       BUILD_EXT: ${{ matrix.target_system == 'windows-2022' && '.dll' || '.so' }}
       BUILD_DIR: ${{ matrix.target_system == 'windows-2022' && 'D:/a/lua-cjson/lua-cjson' || '/home/runner/work/lua-cjson/lua-cjson' }}

From d20576d5cef3d7aa3b6d62db7aee9d9d5f03cc70 Mon Sep 17 00:00:00 2001
From: hyw0810 <1210612004@qq.com>
Date: Fri, 1 Mar 2024 09:18:48 +0800
Subject: [PATCH 45/57] bugfix: bus error or SIGSEGV caused by encode not keep
 buffer.

---
 lua_cjson.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua_cjson.c b/lua_cjson.c
index 363466c7..ae178eb9 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -457,6 +457,10 @@ static void json_create_config(lua_State *l)
     int i;
 
     cfg = lua_newuserdata(l, sizeof(*cfg));
+    if (!cfg)
+        abort();
+
+    memset(cfg, 0, sizeof(*cfg));
 
     /* Create GC method to clean up strbuf */
     lua_newtable(l);

From c92ecda53337490633c95e6ae00e322dc9ad1fb8 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Mon, 10 Jun 2024 22:39:55 -0300
Subject: [PATCH 46/57] feature: Lua 5.3 + 5.4 integer support, with CI and
 conflicts fixed.

Co-Authored-By: Hisham Muhammad <hisham@gobolinux.org>
Co-authored-by: Mark Pulford <mark@kyne.com.au>
Co-authored-by: ichenq <ichenq@gmail.com>
Co-authored-by: Cloud Wu <cloudwu@gmail.com>
Co-authored-by: caijietao <t0350.prog@gmail.com>
Co-authored-by: actboy168 <actboy168@gmail.com>
Co-authored-by: wudeng <wudeng256@gmail.com>
Co-authored-by: caiyiheng <rangercyh@qq.com>
---
 .github/workflows/test.yml                    |   4 +-
 .gitignore                                    |   1 +
 CMakeLists.txt                                |   7 ++
 Makefile                                      |   8 +-
 build-packages.sh                             |   2 +-
 dtoa.c                                        | 111 +++++++++++++-----
 fpconv.c                                      |   2 +-
 ....rockspec => lua-cjson-2.1.0.14-1.rockspec |   4 +-
 lua-cjson.spec                                |   2 +-
 lua_cjson.c                                   | 104 ++++++++++++----
 manual.txt => manual.adoc                     |  13 +-
 performance.txt => performance.adoc           |   2 +-
 strbuf.c                                      |   6 +-
 tests/agentzh.t                               |  42 +++++++
 tests/genutf8.pl                              |   1 +
 15 files changed, 236 insertions(+), 73 deletions(-)
 rename lua-cjson-2.1.0.12-1.rockspec => lua-cjson-2.1.0.14-1.rockspec (97%)
 rename manual.txt => manual.adoc (98%)
 rename performance.txt => performance.adoc (98%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 74fdf1f6..5567f637 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
             runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
             runtestEnv: "SKIP_CMAKE=1"
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@master
@@ -47,7 +47,7 @@ jobs:
         sudo cpanm --notest Test::Base Test::LongString
 
     - name: cppcheck
-      run: cppcheck -i .lua/ -i .install/ -i dtoa.c --force --error-exitcode=1 --enable=warning .
+      run: cppcheck -i .lua/ -i .install/ -i dtoa.c --force --error-exitcode=1 --enable=warning --inline-suppr .
 
     - name: prove
       run: LUA_BIN=lua prove -Itests tests
diff --git a/.gitignore b/.gitignore
index b7678892..d9b1095f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.html
 *.o
 *.so
+*.a
 notes
 packages
 tags
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7eaf898..8ac6d381 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,13 @@ else()
     set(_lua_module_dir "${_lua_lib_dir}/lua/5.1")
 endif()
 
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-Dinline=__inline)
+    add_definitions(-Dsnprintf=_snprintf)
+    add_definitions(-Dstrncasecmp=_strnicmp)
+endif()
+
 add_library(cjson MODULE lua_cjson.c strbuf.c ${FPCONV_SOURCES})
 set_target_properties(cjson PROPERTIES PREFIX "")
 target_link_libraries(cjson ${_MODULE_LINK})
diff --git a/Makefile b/Makefile
index 55c21427..c5966c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@ LUA_CMODULE_DIR ?=   $(PREFIX)/lib/lua/$(LUA_VERSION)
 LUA_MODULE_DIR ?=    $(PREFIX)/share/lua/$(LUA_VERSION)
 LUA_BIN_DIR ?=       $(PREFIX)/bin
 
+AR= $(CC) -o
+
 ##### Platform overrides #####
 ##
 ## Tweak one of the platform sections below to suit your situation.
@@ -84,12 +86,12 @@ OBJS =              lua_cjson.o strbuf.o $(FPCONV_OBJS)
 
 .PHONY: all clean install install-extra doc
 
-.SUFFIXES: .html .txt
+.SUFFIXES: .html .adoc
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $<
 
-.txt.html:
+.adoc.html:
 	$(ASCIIDOC) -n -a toc $<
 
 all: $(TARGET)
@@ -97,7 +99,7 @@ all: $(TARGET)
 doc: manual.html performance.html
 
 $(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS)
+	$(AR) $@ $(LDFLAGS) $(CJSON_LDFLAGS) $(OBJS)
 
 install: $(TARGET)
 	mkdir -p $(DESTDIR)$(LUA_CMODULE_DIR)
diff --git a/build-packages.sh b/build-packages.sh
index 23a6f2ed..2c45e660 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -5,7 +5,7 @@
 # Build packages. Use current checked out version, or a specific tag/commit.
 
 # Files requiring a version bump
-VERSION_FILES="lua-cjson-2.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua"
+VERSION_FILES="lua-cjson-2.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.adoc runtests.sh tests/test.lua"
 
 [ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '[1-3].[0-9]*'`"
 VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`"
diff --git a/dtoa.c b/dtoa.c
index 8dac7b8d..33fd6f01 100644
--- a/dtoa.c
+++ b/dtoa.c
@@ -1533,12 +1533,18 @@ ThInfo {
 set_max_dtoa_threads(unsigned int n)
 {
 	size_t L;
+	ThInfo *newTI1;
 
 	if (n > maxthreads) {
 		L = n*sizeof(ThInfo);
 		if (TI1) {
-			TI1 = (ThInfo*)REALLOC(TI1, L);
-			memset(TI1 + maxthreads, 0, (n-maxthreads)*sizeof(ThInfo));
+			newTI1 = (ThInfo*)REALLOC(TI1, L);
+			if (newTI1) {
+				TI1 = newTI1;
+				memset(TI1 + maxthreads, 0, (n-maxthreads)*sizeof(ThInfo));
+				}
+			else
+				return;
 			}
 		else {
 			TI1 = (ThInfo*)MALLOC(L);
@@ -1871,7 +1877,7 @@ mult(Bigint *a, Bigint *b MTd)
 #else
 #ifdef Pack_32
 	for(; xb < xbe; xb++, xc0++) {
-		if (y = *xb & 0xffff) {
+		if ((y = *xb & 0xffff)) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -1885,7 +1891,7 @@ mult(Bigint *a, Bigint *b MTd)
 				while(x < xae);
 			*xc = carry;
 			}
-		if (y = *xb >> 16) {
+		if ((y = *xb >> 16)) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -2718,13 +2724,14 @@ enum {	/* rounding values: same as FLT_ROUNDS */
 	};
 
  void
-gethex( const char **sp, U *rvp, int rounding, int sign MTd)
+gethex(const char **sp, U *rvp, int rounding, int sign MTd)
 {
 	Bigint *b;
+	char d;
 	const unsigned char *decpt, *s0, *s, *s1;
 	Long e, e1;
 	ULong L, lostbits, *x;
-	int big, denorm, esign, havedig, k, n, nbits, up, zret;
+	int big, denorm, esign, havedig, k, n, nb, nbits, nz, up, zret;
 #ifdef IBM
 	int j;
 #endif
@@ -2742,6 +2749,9 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 #endif
 #endif /*}}*/
 		};
+#ifdef IEEE_Arith
+	int check_denorm = 0;
+#endif
 #ifdef USE_LOCALE
 	int i;
 #ifdef NO_LOCALE_CACHE
@@ -2893,7 +2903,7 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 		k++;
 	b = Balloc(k MTa);
 	x = b->x;
-	n = 0;
+	havedig = n = nz = 0;
 	L = 0;
 #ifdef USE_LOCALE
 	for(i = 0; decimalpoint[i+1]; ++i);
@@ -2908,22 +2918,28 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 		if (*--s1 == '.')
 			continue;
 #endif
+		if ((d = hexdig[*s1]))
+			havedig = 1;
+		else if (!havedig) {
+			e += 4;
+			continue;
+			}
 		if (n == ULbits) {
 			*x++ = L;
 			L = 0;
 			n = 0;
 			}
-		L |= (hexdig[*s1] & 0x0f) << n;
+		L |= (d & 0x0f) << n;
 		n += 4;
 		}
 	*x++ = L;
 	b->wds = n = x - b->x;
-	n = ULbits*n - hi0bits(L);
+	nb = ULbits*n - hi0bits(L);
 	nbits = Nbits;
 	lostbits = 0;
 	x = b->x;
-	if (n > nbits) {
-		n -= nbits;
+	if (nb > nbits) {
+		n = nb - nbits;
 		if (any_on(b,n)) {
 			lostbits = 1;
 			k = n - 1;
@@ -2936,8 +2952,8 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 		rshift(b, n);
 		e += n;
 		}
-	else if (n < nbits) {
-		n = nbits - n;
+	else if (nb < nbits) {
+		n = nbits - nb;
 		b = lshift(b, n MTa);
 		e -= n;
 		x = b->x;
@@ -2992,12 +3008,49 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 			return;
 			}
 		k = n - 1;
+#ifdef IEEE_Arith
+		if (!k) {
+			switch(rounding) {
+			  case Round_near:
+				if (((b->x[0] & 3) == 3) || (lostbits && (b->x[0] & 1))) {
+					multadd(b, 1, 1 MTa);
+ emin_check:
+					if (b->x[1] == (1 << (Exp_shift + 1))) {
+						rshift(b,1);
+						e = emin;
+						goto normal;
+						}
+					}
+				break;
+			  case Round_up:
+				if (!sign && (lostbits || (b->x[0] & 1))) {
+ incr_denorm:
+					multadd(b, 1, 2 MTa);
+					check_denorm = 1;
+					lostbits = 0;
+					goto emin_check;
+					}
+				break;
+			  case Round_down:
+				if (sign && (lostbits || (b->x[0] & 1)))
+					goto incr_denorm;
+				break;
+			  }
+			}
+#endif
 		if (lostbits)
 			lostbits = 1;
 		else if (k > 0)
 			lostbits = any_on(b,k);
+#ifdef IEEE_Arith
+		else if (check_denorm)
+			goto no_lostbits;
+#endif
 		if (x[k>>kshift] & 1 << (k & kmask))
 			lostbits |= 2;
+#ifdef IEEE_Arith
+ no_lostbits:
+#endif
 		nbits -= n;
 		rshift(b,n);
 		e = emin;
@@ -3022,16 +3075,9 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 			k = b->wds;
 			b = increment(b MTa);
 			x = b->x;
-			if (denorm) {
-#if 0
-				if (nbits == Nbits - 1
-				 && x[nbits >> kshift] & 1 << (nbits & kmask))
-					denorm = 0; /* not currently used */
-#endif
-				}
-			else if (b->wds > k
+			if (!denorm && (b->wds > k
 			 || ((n = nbits & kmask) !=0
-			     && hi0bits(x[k-1]) < 32-n)) {
+			     && hi0bits(x[k-1]) < 32-n))) {
 				rshift(b,1);
 				if (++e > Emax)
 					goto ovfl;
@@ -3041,8 +3087,10 @@ gethex( const char **sp, U *rvp, int rounding, int sign MTd)
 #ifdef IEEE_Arith
 	if (denorm)
 		word0(rvp) = b->wds > 1 ? b->x[1] & ~0x100000 : 0;
-	else
+	else {
+ normal:
 		word0(rvp) = (b->x[1] & ~0x100000) | ((e + 0x3ff + 52) << 20);
+		}
 	word1(rvp) = b->x[0];
 #endif
 #ifdef IBM
@@ -3409,6 +3457,7 @@ bigcomp(U *rv, const char *s0, BCinfo *bc MTd)
 		if ((j = ((word0(rv) & Exp_mask) >> Exp_shift) - bc->scale) <= 0) {
 			i = 1 - j;
 			if (i <= 31) {
+				/* cppcheck-suppress integerOverflowCond */
 				if (word1(rv) & (0x1 << i))
 					goto odd;
 				}
@@ -3619,10 +3668,11 @@ fpconv_strtod(const char *s00, char **se)
 				c = *++s;
 			if (c > '0' && c <= '9') {
 				L = c - '0';
-				s1 = s;
-				while((c = *++s) >= '0' && c <= '9')
-					L = 10*L + c - '0';
-				if (s - s1 > 8 || L > 19999)
+				while((c = *++s) >= '0' && c <= '9') {
+					if (L <= 19999)
+						L = 10*L + c - '0';
+					}
+				if (L > 19999)
 					/* Avoid confusion from exponents
 					 * so large that e might overflow.
 					 */
@@ -4884,6 +4934,7 @@ nrv_alloc(const char *s, char *s0, size_t s0len, char **rve, int n MTd)
 		s0 = rv_alloc(n MTa);
 	else if (s0len <= n) {
 		rv = 0;
+		/* cppcheck-suppress nullPointerArithmetic */
 		t = rv + n;
 		goto rve_chk;
 		}
@@ -5237,9 +5288,11 @@ dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char
 #ifndef SET_INEXACT
 #ifdef Check_FLT_ROUNDS
 	try_quick = Rounding == 1;
+#else
+	try_quick = 1;
 #endif
 #endif /*SET_INEXACT*/
-#endif
+#endif /*USE_BF96*/
 
 	if (mode > 5) {
 		mode -= 4;
@@ -5281,6 +5334,7 @@ dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char
 	else if (blen <= i) {
 		buf = 0;
 		if (rve)
+			/* cppcheck-suppress nullPointerArithmetic */
 			*rve = buf + i;
 		return buf;
 		}
@@ -5469,6 +5523,7 @@ dtoa_r(double dd, int mode, int ndigits, int *decpt, int *sign, char **rve, char
 	res3 = p10->b1 * dbhi + (tv3 & 0xffffffffull);
 	res = p10->b0 * dbhi + (tv3>>32) + (res3>>32);
 	be += p10->e - 0x3fe;
+	/* cppcheck-suppress integerOverflowCond */
 	eulp = j1 = be - 54 + ulpadj;
 	if (!(res & 0x8000000000000000ull)) {
 		--be;
diff --git a/fpconv.c b/fpconv.c
index 0ef7f18c..64208f8d 100644
--- a/fpconv.c
+++ b/fpconv.c
@@ -130,7 +130,7 @@ double fpconv_strtod(const char *nptr, char **endptr)
     /* Duplicate number into buffer */
     if (buflen >= FPCONV_G_FMT_BUFSIZE) {
         /* Handle unusually large numbers */
-        buf = malloc(buflen + 1);
+        buf = (char *)malloc(buflen + 1);
         if (!buf) {
             fprintf(stderr, "Out of memory");
             abort();
diff --git a/lua-cjson-2.1.0.12-1.rockspec b/lua-cjson-2.1.0.14-1.rockspec
similarity index 97%
rename from lua-cjson-2.1.0.12-1.rockspec
rename to lua-cjson-2.1.0.14-1.rockspec
index 9ed4272e..4376a081 100644
--- a/lua-cjson-2.1.0.12-1.rockspec
+++ b/lua-cjson-2.1.0.14-1.rockspec
@@ -1,9 +1,9 @@
 package = "lua-cjson"
-version = "2.1.0.11-1"
+version = "2.1.0.14-1"
 
 source = {
     url = "git+https://github.com/openresty/lua-cjson",
-    tag = "2.1.0.11",
+    tag = "2.1.0.14",
 }
 
 description = {
diff --git a/lua-cjson.spec b/lua-cjson.spec
index 13fc56d2..3d3cb16f 100644
--- a/lua-cjson.spec
+++ b/lua-cjson.spec
@@ -50,7 +50,7 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE NEWS performance.html performance.txt manual.html manual.txt rfc4627.txt THANKS
+%doc LICENSE NEWS performance.html performance.adoc manual.html manual.adoc rfc4627.txt THANKS
 %{lualibdir}/*
 %{luadatadir}/*
 %{_bindir}/*
diff --git a/lua_cjson.c b/lua_cjson.c
index ae178eb9..bbd8eff8 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -66,6 +66,13 @@
 
 #endif
 
+#ifdef _MSC_VER
+#define CJSON_EXPORT    __declspec(dllexport)
+#define strncasecmp(x,y,z) _strnicmp(x,y,z)
+#else
+#define CJSON_EXPORT    extern
+#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)))
@@ -104,8 +111,8 @@
 #define json_lightudata_mask(ludata)    (ludata)
 #endif
 
-#if LUA_VERSION_NUM > 501
-#define lua_objlen(L,i)		lua_rawlen(L, (i))
+#if LUA_VERSION_NUM >= 502
+#define lua_objlen(L,i)		luaL_len(L, (i))
 #endif
 
 static const char * const *json_empty_array;
@@ -118,6 +125,7 @@ typedef enum {
     T_ARR_END,
     T_STRING,
     T_NUMBER,
+    T_INTEGER,
     T_BOOLEAN,
     T_NULL,
     T_COLON,
@@ -135,6 +143,7 @@ static const char *json_token_type_name[] = {
     "T_ARR_END",
     "T_STRING",
     "T_NUMBER",
+    "T_INTEGER",
     "T_BOOLEAN",
     "T_NULL",
     "T_COLON",
@@ -184,6 +193,7 @@ typedef struct {
     union {
         const char *string;
         double number;
+        lua_Integer integer;
         int boolean;
     } value;
     size_t string_len;
@@ -234,7 +244,7 @@ static json_config_t *json_fetch_config(lua_State *l)
 {
     json_config_t *cfg;
 
-    cfg = lua_touserdata(l, lua_upvalueindex(1));
+    cfg = (json_config_t *)lua_touserdata(l, lua_upvalueindex(1));
     if (!cfg)
         luaL_error(l, "BUG: Unable to fetch CJSON configuration");
 
@@ -443,7 +453,7 @@ static int json_destroy_config(lua_State *l)
 {
     json_config_t *cfg;
 
-    cfg = lua_touserdata(l, 1);
+    cfg = (json_config_t *)lua_touserdata(l, 1);
     if (cfg)
         strbuf_free(&cfg->encode_buf);
     cfg = NULL;
@@ -456,7 +466,7 @@ static void json_create_config(lua_State *l)
     json_config_t *cfg;
     int i;
 
-    cfg = lua_newuserdata(l, sizeof(*cfg));
+    cfg = (json_config_t *)lua_newuserdata(l, sizeof(*cfg));
     if (!cfg)
         abort();
 
@@ -552,9 +562,9 @@ static void json_encode_exception(lua_State *l, json_config_t *cfg, strbuf_t *js
 static void json_append_string(lua_State *l, strbuf_t *json, int lindex)
 {
     const char *escstr;
-    unsigned i;
     const char *str;
     size_t len;
+    size_t i;
 
     str = lua_tolstring(l, lindex, &len);
 
@@ -653,9 +663,9 @@ static int json_append_data(lua_State *l, json_config_t *cfg,
 /* json_append_array args:
  * - lua_State
  * - JSON strbuf
- * - Size of passwd Lua array (top of stack) */
+ * - Size of passed Lua array (top of stack) */
 static void json_append_array(lua_State *l, json_config_t *cfg, int current_depth,
-                              strbuf_t *json, int array_length)
+                              strbuf_t *json, int array_length, int raw)
 {
     int comma, i, json_pos, err;
 
@@ -667,7 +677,17 @@ static void json_append_array(lua_State *l, json_config_t *cfg, int current_dept
         if (comma++ > 0)
             strbuf_append_char(json, ',');
 
-        lua_rawgeti(l, -1, i);
+        if (raw) {
+            lua_rawgeti(l, -1, i);
+        } else {
+#if LUA_VERSION_NUM >= 503
+            lua_geti(l, -1, i);
+#else
+            lua_pushinteger(l, i);
+            lua_gettable(l, -2);
+#endif
+        }
+
         err = json_append_data(l, cfg, current_depth, json);
         if (err) {
             strbuf_set_length(json, json_pos);
@@ -684,8 +704,17 @@ static void json_append_array(lua_State *l, json_config_t *cfg, int current_dept
 static void json_append_number(lua_State *l, json_config_t *cfg,
                                strbuf_t *json, int lindex)
 {
-    double num = lua_tonumber(l, lindex);
     int len;
+#if LUA_VERSION_NUM >= 503
+    if (lua_isinteger(l, lindex)) {
+        lua_Integer num = lua_tointeger(l, lindex);
+        strbuf_ensure_empty_length(json, FPCONV_G_FMT_BUFSIZE); /* max length of int64 is 19 */
+        len = sprintf(strbuf_empty_ptr(json), LUA_INTEGER_FMT, num);
+        strbuf_extend_length(json, len);
+        return;
+    }
+#endif
+    double num = lua_tonumber(l, lindex);
 
     if (cfg->encode_invalid_numbers == 0) {
         /* Prevent encoding invalid numbers */
@@ -773,6 +802,7 @@ static int json_append_data(lua_State *l, json_config_t *cfg,
     int len;
     int as_array = 0;
     int has_metatable;
+    int raw = 1;
 
     switch (lua_type(l, -1)) {
     case LUA_TSTRING:
@@ -797,17 +827,30 @@ static int json_append_data(lua_State *l, json_config_t *cfg,
             lua_pushlightuserdata(l, json_lightudata_mask(&json_array));
             lua_rawget(l, LUA_REGISTRYINDEX);
             as_array = lua_rawequal(l, -1, -2);
-            lua_pop(l, 2);
+            if (as_array) {
+                raw = 1;
+                lua_pop(l, 2);
+                len = lua_objlen(l, -1);
+            } else {
+                raw = 0;
+                lua_pop(l, 2);
+                if (luaL_getmetafield(l, -1, "__len")) {
+                    lua_pushvalue(l, -2);
+                    lua_call(l, 1, 1);
+                    len = lua_tonumber(l, -1);
+                    lua_pop(l, 1);
+                    as_array = 1;
+                }
+            }
         }
 
         if (as_array) {
-            len = lua_objlen(l, -1);
-            json_append_array(l, cfg, current_depth, json, len);
+            json_append_array(l, cfg, current_depth, json, len, raw);
         } else {
             len = lua_array_length(l, cfg, json);
 
             if (len > 0 || (len == 0 && !cfg->encode_empty_table_as_object)) {
-                json_append_array(l, cfg, current_depth, json, len);
+                json_append_array(l, cfg, current_depth, json, len, raw);
             } else {
                 if (has_metatable) {
                     lua_getmetatable(l, -1);
@@ -817,7 +860,9 @@ static int json_append_data(lua_State *l, json_config_t *cfg,
                     as_array = lua_rawequal(l, -1, -2);
                     lua_pop(l, 2); /* pop pointer + metatable */
                     if (as_array) {
-                        json_append_array(l, cfg, current_depth, json, 0);
+                        len = lua_objlen(l, -1);
+                        raw = 1;
+                        json_append_array(l, cfg, current_depth, json, len, raw);
                         break;
                     }
                 }
@@ -832,7 +877,7 @@ static int json_append_data(lua_State *l, json_config_t *cfg,
         if (lua_touserdata(l, -1) == NULL) {
             strbuf_append_mem(json, "null", 4);
         } else if (lua_touserdata(l, -1) == json_lightudata_mask(&json_array)) {
-            json_append_array(l, cfg, current_depth, json, 0);
+            json_append_array(l, cfg, current_depth, json, 0, 1);
         }
         break;
     default:
@@ -1145,13 +1190,19 @@ static int json_is_invalid_number(json_parse_t *json)
 static void json_next_number_token(json_parse_t *json, json_token_t *token)
 {
     char *endptr;
-
-    token->type = T_NUMBER;
-    token->value.number = fpconv_strtod(json->ptr, &endptr);
-    if (json->ptr == endptr)
-        json_set_token_error(token, json, "invalid number");
-    else
-        json->ptr = endptr;     /* Skip the processed number */
+    token->value.integer = strtoll(json->ptr, &endptr, 10);
+    if (json->ptr == endptr || *endptr == '.' || *endptr == 'e' ||
+        *endptr == 'E' || *endptr == 'x') {
+        token->type = T_NUMBER;
+        token->value.number = fpconv_strtod(json->ptr, &endptr);
+        if (json->ptr == endptr) {
+            json_set_token_error(token, json, "invalid number");
+            return;
+        }
+    } else {
+        token->type = T_INTEGER;
+    }
+    json->ptr = endptr;     /* Skip the processed number */
 
     return;
 }
@@ -1387,6 +1438,9 @@ static void json_process_value(lua_State *l, json_parse_t *json,
     case T_NUMBER:
         lua_pushnumber(l, token->value.number);
         break;;
+    case T_INTEGER:
+        lua_pushinteger(l, token->value.integer);
+        break;;
     case T_BOOLEAN:
         lua_pushboolean(l, token->value.boolean);
         break;;
@@ -1602,7 +1656,7 @@ static int lua_cjson_safe_new(lua_State *l)
     return 1;
 }
 
-int luaopen_cjson(lua_State *l)
+CJSON_EXPORT int luaopen_cjson(lua_State *l)
 {
     lua_cjson_new(l);
 
@@ -1616,7 +1670,7 @@ int luaopen_cjson(lua_State *l)
     return 1;
 }
 
-int luaopen_cjson_safe(lua_State *l)
+CJSON_EXPORT int luaopen_cjson_safe(lua_State *l)
 {
     lua_cjson_safe_new(l);
 
diff --git a/manual.txt b/manual.adoc
similarity index 98%
rename from manual.txt
rename to manual.adoc
index a12e3785..83303a30 100644
--- a/manual.txt
+++ b/manual.adoc
@@ -1,6 +1,6 @@
 = Lua CJSON 2.1devel Manual =
 Mark Pulford <mark@kyne.com.au>
-:revdate: 1st March 2012
+:revdate: August 2016
 
 Overview
 --------
@@ -20,7 +20,7 @@ The Lua CJSON module provides JSON support for Lua.
 Lua CJSON is covered by the MIT license. Review the file +LICENSE+ for
 details.
 
-The latest version of this software is available from the
+The current stable version of this software is available from the
 http://www.kyne.com.au/%7Emark/software/lua-cjson.php[Lua CJSON website].
 
 Feel free to email me if you have any patches, suggestions, or comments.
@@ -29,8 +29,8 @@ Feel free to email me if you have any patches, suggestions, or comments.
 Installation
 ------------
 
-Lua CJSON requires either http://www.lua.org[Lua] 5.1, Lua 5.2, or
-http://www.luajit.org[LuaJIT] to build.
+Lua CJSON requires either http://www.lua.org[Lua] 5.1, Lua 5.2, Lua 5.3,
+or http://www.luajit.org[LuaJIT] to build.
 
 The build method can be selected from 4 options:
 
@@ -203,8 +203,8 @@ Import Lua CJSON via the Lua +require+ function. Lua CJSON does not
 register a global module table.
 
 The +cjson+ module will throw an error during JSON conversion if any
-invalid data is encountered. Refer to <<cjson_encode,+cjson.encode+>>
-and <<cjson_decode,+cjson.decode+>> for details.
+invalid data is encountered. Refer to <<encode,+cjson.encode+>> and
+<<decode,+cjson.decode+>> for details.
 
 The +cjson.safe+ module behaves identically to the +cjson+ module,
 except when errors are encountered during JSON conversion. On error, the
@@ -238,6 +238,7 @@ workaround if required. Lua CJSON should be reinitialised via
 different locale per thread is not supported.
 
 
+[[decode]]
 decode
 ~~~~~~
 
diff --git a/performance.txt b/performance.adoc
similarity index 98%
rename from performance.txt
rename to performance.adoc
index fc3a5bb5..a36412d6 100644
--- a/performance.txt
+++ b/performance.adoc
@@ -26,7 +26,7 @@ http://chiselapp.com/user/dhkolf/repository/dkjson/[DKJSON 2.1]::
 https://github.com/brimworks/lua-yajl[Lua YAJL 2.0]::
   - C wrapper for the YAJL library
 
-http://www.kyne.com.au/%7Emark/software/lua-cjson.php[Lua CSJON 2.0.0]::
+http://www.kyne.com.au/%7Emark/software/lua-cjson.php[Lua CJSON 2.0.0]::
   - C implementation with no dependencies on other libraries
 
 
diff --git a/strbuf.c b/strbuf.c
index 2dc30beb..73cd9b89 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -59,7 +59,7 @@ void strbuf_init(strbuf_t *s, size_t len)
     s->reallocs = 0;
     s->debug = 0;
 
-    s->buf = malloc(size);
+    s->buf = (char *)malloc(size);
     if (!s->buf)
         die("Out of memory");
 
@@ -70,7 +70,7 @@ strbuf_t *strbuf_new(size_t len)
 {
     strbuf_t *s;
 
-    s = malloc(sizeof(strbuf_t));
+    s = (strbuf_t*)malloc(sizeof(strbuf_t));
     if (!s)
         die("Out of memory");
 
@@ -169,7 +169,7 @@ void strbuf_resize(strbuf_t *s, size_t len)
     }
 
     s->size = newsize;
-    s->buf = realloc(s->buf, s->size);
+    s->buf = (char *)realloc(s->buf, s->size);
     if (!s->buf)
         die("Out of memory, len: %zu", len);
     s->reallocs++;
diff --git a/tests/agentzh.t b/tests/agentzh.t
index 552630ab..88a94b82 100644
--- a/tests/agentzh.t
+++ b/tests/agentzh.t
@@ -332,3 +332,45 @@ Cannot serialise function: type not supported
 
 {"valid":"valid"}
 ["one","two","three"]
+
+
+
+=== TEST 23: array-like proxy object with __len and __index
+--- lua
+local cjson = require "cjson"
+local real_array = {"foo", "bar", "baz"}
+local proxy_array = {}
+setmetatable(proxy_array, {
+  __len = function() return 3 end,
+  __index = function(t, k)
+    return real_array[k]
+  end,
+})
+
+print(cjson.encode(proxy_array))
+--- out
+["foo","bar","baz"]
+
+
+
+=== TEST 24: check that integers are handled correctly on Lua 5.3+
+--- lua
+local lv = tonumber((_VERSION):match("Lua 5%.([0-9]+)"))
+
+if lv >= 3 then
+  local cjson = require "cjson"
+  local array = cjson.decode [[ [10, 10.0, 3.5] ]]
+  for i = 1, 4 do
+    print(tostring(i) .. ": " .. tostring(math.type(array[i])))
+  end
+else
+  print("1: integer")
+  print("2: float")
+  print("3: float")
+  print("4: nil")
+end
+--- out
+1: integer
+2: float
+3: float
+4: nil
diff --git a/tests/genutf8.pl b/tests/genutf8.pl
index db661a19..c79f238b 100755
--- a/tests/genutf8.pl
+++ b/tests/genutf8.pl
@@ -6,6 +6,7 @@
 #       cff03b039d850f370a7362f3313e5268
 
 use strict;
+no warnings 'nonchar';
 
 # 0xD800 - 0xDFFF are used to encode supplementary codepoints
 # 0x10000 - 0x10FFFF are supplementary codepoints

From 42ee52e79e277c496d8103618c811c6eb8f4f586 Mon Sep 17 00:00:00 2001
From: James Hudson <mrthehud@gmail.com>
Date: Fri, 21 Jun 2024 01:38:03 +0100
Subject: [PATCH 47/57] doc: update location of cjson documentation.

The kyne.com.au server seems to have moved to kyne.au
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4655a9ad..1ab0d5ad 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ This fork of [mpx/lua-cjson](https://github.com/mpx/lua-cjson) is included in
 the [OpenResty](https://openresty.org/) bundle and includes a few bugfixes and
 improvements, especially to facilitate the encoding of empty tables as JSON Arrays.
 
-Please refer to the [lua-cjson documentation](http://www.kyne.com.au/~mark/software/lua-cjson.php)
+Please refer to the [lua-cjson documentation](https://kyne.au/~mark/software/lua-cjson.php)
 for standard usage, this README only provides informations regarding this fork's additions.
 
 See [`mpx/master..openresty/master`](https://github.com/mpx/lua-cjson/compare/master...openresty:master)

From b0b4c58df8fba8f7ea36c69bbdb517f9732b1bcf Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Tue, 11 Jun 2024 09:44:50 +0800
Subject: [PATCH 48/57] doc: add comment for dtoa.c.

---
 dtoa.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dtoa.c b/dtoa.c
index 33fd6f01..19a0caef 100644
--- a/dtoa.c
+++ b/dtoa.c
@@ -1,3 +1,7 @@
+/* The code comes from https://portal.ampl.com/~dmg/netlib/fp/dtoa.c
+ * Go to https://portal.ampl.com/~dmg/netlib/fp/changes for the detailed changes.
+ */
+
 /****************************************************************
  *
  * The author of this software is David M. Gay.

From 91ca29db9a4a4fd0eedaebcd5d5f3ba2ace5ae63 Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Thu, 1 Aug 2024 09:23:08 +0800
Subject: [PATCH 49/57] doc: added doc for encode_skip_unsupported_value_types.

---
 README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/README.md b/README.md
index 1ab0d5ad..debe1ae8 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Table of Contents
     * [empty_array_mt](#empty_array_mt)
     * [encode_number_precision](#encode_number_precision)
     * [encode_escape_forward_slash](#encode_escape_forward_slash)
+    * [encode_skip_unsupported_value_types](#encode_skip_unsupported_value_types)
     * [decode_array_with_array_mt](#decode_array_with_array_mt)
 
 Description
@@ -171,6 +172,35 @@ If disabled, forward slash '/' will be encoded as '/' (no escape is applied).
 
 [Back to TOC](#table-of-contents)
 
+encode_skip_unsupported_value_types
+---------------------------
+**syntax:** `cjson.encode_skip_unsupported_value_types(enabled)`
+
+**default:** false
+
+If enabled, cjson will not throw exception when there are unsupported types
+in the Lua table.
+
+For example:
+
+```lua
+local ffi = require "ffi"
+local cjson = require "cjson"
+cjson.encode_skip_unsupported_value_types(true)
+local t = {key = "val"}
+
+t.cdata = ffi.new("char[?]", 100)
+print(cjson.encode(t))
+```
+
+This will generate:
+
+```json
+{"key":"val"}
+```
+
+[Back to TOC](#table-of-contents)
+
 decode_array_with_array_mt
 --------------------------
 **syntax:** `cjson.decode_array_with_array_mt(enabled)`

From cd944c13a94713a984c4593fc3639e49ae59b91d Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Thu, 16 Oct 2025 12:23:59 +0800
Subject: [PATCH 50/57] gugfix: fixed Makefile.

---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c5966c5d..915ed393 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,6 @@ LUA_CMODULE_DIR ?=   $(PREFIX)/lib/lua/$(LUA_VERSION)
 LUA_MODULE_DIR ?=    $(PREFIX)/share/lua/$(LUA_VERSION)
 LUA_BIN_DIR ?=       $(PREFIX)/bin
 
-AR= $(CC) -o
-
 ##### Platform overrides #####
 ##
 ## Tweak one of the platform sections below to suit your situation.
@@ -99,7 +97,7 @@ all: $(TARGET)
 doc: manual.html performance.html
 
 $(TARGET): $(OBJS)
-	$(AR) $@ $(LDFLAGS) $(CJSON_LDFLAGS) $(OBJS)
+	$(CC) -o $@ $(LDFLAGS) $(CJSON_LDFLAGS) $(OBJS)
 
 install: $(TARGET)
 	mkdir -p $(DESTDIR)$(LUA_CMODULE_DIR)

From 35bac3c9741af54d121a8ef4e04ff20755943444 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 29 Oct 2025 22:35:41 -0400
Subject: [PATCH 51/57] bugfix: fix truncation of decoded numbers outside
 lua_Integer's range (#116)

json_next_number_token stores the `long long` return value from `stroll`
in a `lua_Integer` (which is typically a typedef for `ptrdiff_t`).

On 32-bit platforms, this ends up storing an 8-byte number into a 4-byte
variable, truncating the value.

Instead, store the converted value in a temporary `long long` variable
so we can detect the scenario and decode into a `lua_Number`.

Signed-off-by: James McCoy <jamessan@jamessan.com>
---
 lua_cjson.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lua_cjson.c b/lua_cjson.c
index bbd8eff8..93b81e67 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -1190,7 +1190,7 @@ static int json_is_invalid_number(json_parse_t *json)
 static void json_next_number_token(json_parse_t *json, json_token_t *token)
 {
     char *endptr;
-    token->value.integer = strtoll(json->ptr, &endptr, 10);
+    long long tmpval = strtoll(json->ptr, &endptr, 10);
     if (json->ptr == endptr || *endptr == '.' || *endptr == 'e' ||
         *endptr == 'E' || *endptr == 'x') {
         token->type = T_NUMBER;
@@ -1199,8 +1199,16 @@ static void json_next_number_token(json_parse_t *json, json_token_t *token)
             json_set_token_error(token, json, "invalid number");
             return;
         }
+    } else if (tmpval > PTRDIFF_MAX || tmpval < PTRDIFF_MIN) {
+        /* Typical Lua builds typedef ptrdiff_t to lua_Integer. If tmpval is
+         * outside the range of that type, we need to use T_NUMBER to avoid
+         * truncation.
+         */
+        token->type = T_NUMBER;
+        token->value.number = tmpval;
     } else {
         token->type = T_INTEGER;
+        token->value.integer = tmpval;
     }
     json->ptr = endptr;     /* Skip the processed number */
 

From e6daf3cdfac61055af3f7d88d9886942ff0de6e6 Mon Sep 17 00:00:00 2001
From: lijunlong <lijunlong@openresty.com>
Date: Mon, 19 Jan 2026 08:17:26 +0800
Subject: [PATCH 52/57] bumped to to v2.1.0.16

---
 ...cjson-2.1.0.14-1.rockspec => lua-cjson-2.1.0.16-1.rockspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename lua-cjson-2.1.0.14-1.rockspec => lua-cjson-2.1.0.16-1.rockspec (97%)

diff --git a/lua-cjson-2.1.0.14-1.rockspec b/lua-cjson-2.1.0.16-1.rockspec
similarity index 97%
rename from lua-cjson-2.1.0.14-1.rockspec
rename to lua-cjson-2.1.0.16-1.rockspec
index 4376a081..037993ad 100644
--- a/lua-cjson-2.1.0.14-1.rockspec
+++ b/lua-cjson-2.1.0.16-1.rockspec
@@ -1,9 +1,9 @@
 package = "lua-cjson"
-version = "2.1.0.14-1"
+version = "2.1.0.16-1"
 
 source = {
     url = "git+https://github.com/openresty/lua-cjson",
-    tag = "2.1.0.14",
+    tag = "2.1.0.16",
 }
 
 description = {

From 3c64e2247623a66347a48d66b6a791b58a71fdbe Mon Sep 17 00:00:00 2001
From: Deyan Dobromirov <dvdvideo123@gmail.com>
Date: Mon, 19 Jan 2026 02:44:59 +0200
Subject: [PATCH 53/57] Fixed: worning for explicit pointer to int conversion.

---
 strbuf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/strbuf.c b/strbuf.c
index 73cd9b89..704f7021 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -85,8 +85,8 @@ strbuf_t *strbuf_new(size_t len)
 static inline void debug_stats(strbuf_t *s)
 {
     if (s->debug) {
-        fprintf(stderr, "strbuf(%lx) reallocs: %d, length: %zd, size: %zd\n",
-                (long)s, s->reallocs, s->length, s->size);
+        fprintf(stderr, "strbuf(%p) reallocs: %d, length: %zd, size: %zd\n",
+                s, s->reallocs, s->length, s->size);
     }
 }
 
@@ -164,8 +164,8 @@ void strbuf_resize(strbuf_t *s, size_t len)
     newsize = calculate_new_size(s, len);
 
     if (s->debug > 1) {
-        fprintf(stderr, "strbuf(%lx) resize: %zd => %zd\n",
-                (long)s, s->size, newsize);
+        fprintf(stderr, "strbuf(%p) resize: %zd => %zd\n",
+                s, s->size, newsize);
     }
 
     s->size = newsize;

From ea05d06f5a56d94d423fc697561a33ca3b8bf085 Mon Sep 17 00:00:00 2001
From: skewb1k <skewb1kunix@gmail.com>
Date: Mon, 19 Jan 2026 08:51:57 +0800
Subject: [PATCH 54/57] feature: add option to indent encoded output.

---
 README.md      | 26 +++++++++++++++++++++++
 lua_cjson.c    | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/test.lua | 38 ++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+)

diff --git a/README.md b/README.md
index debe1ae8..d2094b1c 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Table of Contents
     * [encode_number_precision](#encode_number_precision)
     * [encode_escape_forward_slash](#encode_escape_forward_slash)
     * [encode_skip_unsupported_value_types](#encode_skip_unsupported_value_types)
+    * [encode_indent](#encode_indent)
     * [decode_array_with_array_mt](#decode_array_with_array_mt)
 
 Description
@@ -201,6 +202,31 @@ This will generate:
 
 [Back to TOC](#table-of-contents)
 
+encode_indent
+----------------------------
+**syntax:** `cjson.encode_indent(indent)`
+
+If non-empty string provided, JSON values encoded by `cjson.encode()` will be
+formatted in a human-readable way, using `indent` for indentation
+at each nesting level. Also enables newlines and a space after colons.
+
+Example:
+
+```lua
+local cjson = require "cjson"
+
+cjson.encode_indent("  ")
+print(cjson.encode({ a = 1, b = { c = 2 } }))
+-- {
+--   "a": 1,
+--   "b": {
+--     "c": 2
+--   }
+-- }
+```
+
+[Back to TOC](#table-of-contents)
+
 decode_array_with_array_mt
 --------------------------
 **syntax:** `cjson.decode_array_with_array_mt(enabled)`
diff --git a/lua_cjson.c b/lua_cjson.c
index 93b81e67..789817da 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -91,6 +91,7 @@
 #define DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT 0
 #define DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH 1
 #define DEFAULT_ENCODE_SKIP_UNSUPPORTED_VALUE_TYPES 0
+#define DEFAULT_ENCODE_INDENT NULL
 
 #ifdef DISABLE_INVALID_NUMBERS
 #undef DEFAULT_DECODE_INVALID_NUMBERS
@@ -172,6 +173,7 @@ typedef struct {
     int encode_keep_buffer;
     int encode_empty_table_as_object;
     int encode_escape_forward_slash;
+    const char *encode_indent;
 
     int decode_invalid_numbers;
     int decode_max_depth;
@@ -310,6 +312,18 @@ static int json_enum_option(lua_State *l, int optindex, int *setting,
     return 1;
 }
 
+/* Process string option for a configuration function */
+static int json_string_option(lua_State *l, int optindex, const char **setting)
+{
+    if (!lua_isnil(l, optindex)) {
+        const char *value = luaL_checkstring(l, optindex);
+        *setting = value;
+    }
+
+    lua_pushstring(l, *setting ? *setting : "");
+    return 1;
+}
+
 /* Configures handling of extremely sparse arrays:
  * convert: Convert extremely sparse arrays into objects? Otherwise error.
  * ratio: 0: always allow sparse; 1: never allow sparse; >1: use ratio
@@ -400,6 +414,18 @@ static int json_cfg_encode_keep_buffer(lua_State *l)
     return 1;
 }
 
+/* Configure how to indent output */
+static int json_cfg_encode_indent(lua_State *l)
+{
+    json_config_t *cfg = json_arg_init(l, 1);
+
+    json_string_option(l, 1, &cfg->encode_indent);
+    /* simplify further checking */
+    if (cfg->encode_indent[0] == '\0') cfg->encode_indent = NULL;
+
+    return 1;
+}
+
 #if defined(DISABLE_INVALID_NUMBERS) && !defined(USE_INTERNAL_FPCONV)
 void json_verify_invalid_number_setting(lua_State *l, int *setting)
 {
@@ -491,6 +517,7 @@ static void json_create_config(lua_State *l)
     cfg->decode_array_with_array_mt = DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT;
     cfg->encode_escape_forward_slash = DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH;
     cfg->encode_skip_unsupported_value_types = DEFAULT_ENCODE_SKIP_UNSUPPORTED_VALUE_TYPES;
+    cfg->encode_indent = DEFAULT_ENCODE_INDENT;
 
 #if DEFAULT_ENCODE_KEEP_BUFFER > 0
     strbuf_init(&cfg->encode_buf, 0);
@@ -660,6 +687,13 @@ static void json_check_encode_depth(lua_State *l, json_config_t *cfg,
 static int json_append_data(lua_State *l, json_config_t *cfg,
                              int current_depth, strbuf_t *json);
 
+static void json_append_newline_and_indent(strbuf_t *json, json_config_t *cfg, int depth)
+{
+    strbuf_append_char(json, '\n');
+    for (int i = 0; i < depth; i++)
+        strbuf_append_string(json, cfg->encode_indent);
+}
+
 /* json_append_array args:
  * - lua_State
  * - JSON strbuf
@@ -668,15 +702,21 @@ static void json_append_array(lua_State *l, json_config_t *cfg, int current_dept
                               strbuf_t *json, int array_length, int raw)
 {
     int comma, i, json_pos, err;
+    int has_items = 0;
 
     strbuf_append_char(json, '[');
 
     comma = 0;
     for (i = 1; i <= array_length; i++) {
+        has_items = 1;
+
         json_pos = strbuf_length(json);
         if (comma++ > 0)
             strbuf_append_char(json, ',');
 
+        if (cfg->encode_indent)
+            json_append_newline_and_indent(json, cfg, current_depth);
+
         if (raw) {
             lua_rawgeti(l, -1, i);
         } else {
@@ -698,6 +738,9 @@ static void json_append_array(lua_State *l, json_config_t *cfg, int current_dept
         lua_pop(l, 1);
     }
 
+    if (has_items && cfg->encode_indent)
+        json_append_newline_and_indent(json, cfg, current_depth-1);
+
     strbuf_append_char(json, ']');
 }
 
@@ -752,6 +795,7 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
                                int current_depth, strbuf_t *json)
 {
     int comma, keytype, json_pos, err;
+    int has_items = 0;
 
     /* Object */
     strbuf_append_char(json, '{');
@@ -760,10 +804,15 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
     /* table, startkey */
     comma = 0;
     while (lua_next(l, -2) != 0) {
+        has_items = 1;
+
         json_pos = strbuf_length(json);
         if (comma++ > 0)
             strbuf_append_char(json, ',');
 
+        if (cfg->encode_indent)
+            json_append_newline_and_indent(json, cfg, current_depth);
+
         /* table, key, value */
         keytype = lua_type(l, -2);
         if (keytype == LUA_TNUMBER) {
@@ -778,6 +827,9 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
                                   "table key must be a number or string");
             /* never returns */
         }
+        if (cfg->encode_indent)
+            strbuf_append_char(json, ' ');
+
 
         /* table, key, value */
         err = json_append_data(l, cfg, current_depth, json);
@@ -792,6 +844,9 @@ static void json_append_object(lua_State *l, json_config_t *cfg,
         /* table, key */
     }
 
+    if (has_items && cfg->encode_indent)
+        json_append_newline_and_indent(json, cfg, current_depth-1);
+
     strbuf_append_char(json, '}');
 }
 
@@ -1579,6 +1634,7 @@ static int lua_cjson_new(lua_State *l)
         { "decode_invalid_numbers", json_cfg_decode_invalid_numbers },
         { "encode_escape_forward_slash", json_cfg_encode_escape_forward_slash },
         { "encode_skip_unsupported_value_types", json_cfg_encode_skip_unsupported_value_types },
+        { "encode_indent", json_cfg_encode_indent },
         { "new", lua_cjson_new },
         { NULL, NULL }
     };
diff --git a/tests/test.lua b/tests/test.lua
index cf7a54a2..0513d979 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -333,6 +333,44 @@ local cjson_tests = {
       json.decode, { [["\uDB00\uD"]] },
       false, { "Expected value but found invalid unicode escape code at character 2" } },
 
+    -- Test indenting
+    { 'Set encode_indent("  ")',
+      json.encode_indent, { "  " }, true, { "  " } },
+    { "Encode object with indenting",
+      json.encode, { { a = "a", b = "b" } },
+      true, {
+          util.one_of {
+              '{\n  "a": "a",\n  "b": "b"\n}',
+              '{\n  "b": "b",\n  "a": "a"\n}',
+          }
+      } },
+    { "Encode empty object with indenting",
+      json.encode, { { } }, true, { '{}' } },
+    { "Encode nested object with indenting",
+      json.encode, { { a = { b = 1 } } },
+      true, { '{\n  "a": {\n    "b": 1\n  }\n}' } },
+    { "Encode array with indenting",
+      json.encode, { { 1, 2, 3 } },
+      true, { '[\n  1,\n  2,\n  3\n]' } },
+    { "Encode empty array with indenting",
+      json.encode, { json.empty_array }, true, { '[]' } },
+    { "Encode nested arrays with indenting",
+      json.encode, { { { 1, 2 }, { 3, 4 } } },
+      true, { '[\n  [\n    1,\n    2\n  ],\n  [\n    3,\n    4\n  ]\n]' } },
+    { "Encode array of objects with indenting",
+      json.encode, { { { a = "a" }, { b = "b" } } },
+      true, { '[\n  {\n    "a": "a"\n  },\n  {\n    "b": "b"\n  }\n]' } },
+    { 'Set encode_indent("abc")',
+      json.encode_indent, { "abc" }, true, { "abc" } },
+    { "Encode object with non-whitespace indenting",
+      json.encode, { { a = { b = 1 } } },
+      true, { '{\nabc"a": {\nabcabc"b": 1\nabc}\n}' } },
+    { 'Set encode_indent("")',
+      json.encode_indent, { "" }, true, { "" } },
+    { "Encode array of objects with empty indenting",
+      json.encode, { { { a = "a" }, { b = "b" } } },
+      true, { '[{"a":"a"},{"b":"b"}]' } },
+
     -- Test locale support
     --
     -- The standard Lua interpreter is ANSI C online doesn't support locales

From 74c23b4465074c0d47b6a6686ec59b29a3a4192c Mon Sep 17 00:00:00 2001
From: Dave Corley <corleycomputerrepair@protonmail.ch>
Date: Tue, 20 Jan 2026 23:19:31 -0600
Subject: [PATCH 55/57] FIX: Bump action versions

---
 .github/workflows/cjson.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index 6748a565..c52edb95 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Upload Release
         if: github.event_name != 'pull_request'
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: Stable-CI
           files: cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
@@ -81,7 +81,7 @@ jobs:
 
       - name: Upload Artifact
         if: github.event_name == 'pull_request'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v6
         with:
           name: cjson-${{ matrix.build_type }}-${{ runner.os }}
           path: cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}

From bfbeef9747049252c63f96256799bc80f04ae595 Mon Sep 17 00:00:00 2001
From: Dave Corley <corleycomputerrepair@protonmail.ch>
Date: Tue, 20 Jan 2026 23:24:04 -0600
Subject: [PATCH 56/57] CLEANUP: Remove the build_typeb stuff as that seems to
 be pointless for cjson

---
 .github/workflows/cjson.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index c52edb95..ae8accfc 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -12,7 +12,6 @@ jobs:
   CJSON_MASTER:
     strategy:
       matrix:
-        build_type: [Release, RelWithDebInfo, MinSizeRel, Debug]
         target_system: [ ubuntu-22.04, windows-2022, macos-11 ]
     runs-on: ${{ matrix.target_system }}
     env:
@@ -32,7 +31,7 @@ jobs:
       - name: Prime ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ matrix.target_system }}-${{ matrix.build_type }}
+          key: ${{ matrix.target_system }}
           max-size: 1000M
 
       - name: Cache LuaJIT
@@ -64,18 +63,18 @@ jobs:
 
       - name: Build
         run: |
-          cmake --build . --config ${{ matrix.build_type }}
+          cmake --build .
 
       - name: Prep Release
         run: |
-          mv cjson${{ env.BUILD_EXT }} cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
+          mv cjson${{ env.BUILD_EXT }} cjson-${{ runner.os }}${{ env.BUILD_EXT }}
 
       - name: Upload Release
         if: github.event_name != 'pull_request'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: Stable-CI
-          files: cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
+          files: cjson-${{ runner.os }}${{ env.BUILD_EXT }}
           body: |
             CI Build for Dreamweave IO2 fork
 
@@ -83,5 +82,5 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: actions/upload-artifact@v6
         with:
-          name: cjson-${{ matrix.build_type }}-${{ runner.os }}
-          path: cjson-${{ matrix.build_type }}-${{ runner.os }}${{ env.BUILD_EXT }}
+          name: cjson-${{ runner.os }}
+          path: cjson-${{ runner.os }}${{ env.BUILD_EXT }}

From b055030e5ddbad4044eda56c07bd7dd8a65d98b0 Mon Sep 17 00:00:00 2001
From: Dave Corley <corleycomputerrepair@protonmail.ch>
Date: Tue, 20 Jan 2026 23:26:56 -0600
Subject: [PATCH 57/57] FIX: We ship luajit2 now

---
 .github/workflows/cjson.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cjson.yml b/.github/workflows/cjson.yml
index ae8accfc..9a957566 100644
--- a/.github/workflows/cjson.yml
+++ b/.github/workflows/cjson.yml
@@ -46,7 +46,7 @@ jobs:
         shell: bash
         if: steps.cache-Lua.outputs.cache-hit != 'true'
         run: |
-          curl -o LuaJIT.7z -L https://github.com/DreamWeave-MP/LuaJIT/releases/download/Stable-CI/LuaJIT-${{ runner.os }}.7z
+          curl -o LuaJIT.7z -L https://github.com/DreamWeave-MP/luajit2/releases/download/Stable-CI/LuaJIT-${{ runner.os }}.7z
           7z x -y LuaJIT.7z -oLuaJIT/
 
       - name: Configure