summaryrefslogtreecommitdiff
path: root/lua_cjson.c
diff options
context:
space:
mode:
authorJesper Lundgren <jesperlundgren@exosite.com>2020-03-09 16:12:24 +0800
committer罗泽轩 <spacewanderlzx@gmail.com>2020-03-24 09:03:48 +0800
commit0df488874f52a881d14b5876babaa780bb6200ee (patch)
treefc41c7a1842662e6b411f83b8ab4a7776244f806 /lua_cjson.c
parent9931667547e2eda9911ec07b0f408b1a04b8a46c (diff)
downloadlua-cjson-2.1.0.8.tar.gz
lua-cjson-2.1.0.8.tar.bz2
lua-cjson-2.1.0.8.zip
feature: add option to disable forward slash escaping2.1.0.8rc12.1.0.8
Thanks @spacewander for optimization and documentation.
Diffstat (limited to 'lua_cjson.c')
-rw-r--r--lua_cjson.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/lua_cjson.c b/lua_cjson.c
index 2a69699..875bdaf 100644
--- a/lua_cjson.c
+++ b/lua_cjson.c
@@ -81,6 +81,7 @@
81#define DEFAULT_ENCODE_NUMBER_PRECISION 14 81#define DEFAULT_ENCODE_NUMBER_PRECISION 14
82#define DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT 1 82#define DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT 1
83#define DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT 0 83#define DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT 0
84#define DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH 1
84 85
85#ifdef DISABLE_INVALID_NUMBERS 86#ifdef DISABLE_INVALID_NUMBERS
86#undef DEFAULT_DECODE_INVALID_NUMBERS 87#undef DEFAULT_DECODE_INVALID_NUMBERS
@@ -155,6 +156,7 @@ typedef struct {
155 int encode_number_precision; 156 int encode_number_precision;
156 int encode_keep_buffer; 157 int encode_keep_buffer;
157 int encode_empty_table_as_object; 158 int encode_empty_table_as_object;
159 int encode_escape_forward_slash;
158 160
159 int decode_invalid_numbers; 161 int decode_invalid_numbers;
160 int decode_max_depth; 162 int decode_max_depth;
@@ -406,6 +408,20 @@ static int json_cfg_decode_invalid_numbers(lua_State *l)
406 return 1; 408 return 1;
407} 409}
408 410
411static int json_cfg_encode_escape_forward_slash(lua_State *l)
412{
413 int ret;
414 json_config_t *cfg = json_arg_init(l, 1);
415
416 ret = json_enum_option(l, 1, &cfg->encode_escape_forward_slash, NULL, 1);
417 if (cfg->encode_escape_forward_slash) {
418 char2escape['/'] = "\\/";
419 } else {
420 char2escape['/'] = NULL;
421 }
422 return ret;
423}
424
409static int json_destroy_config(lua_State *l) 425static int json_destroy_config(lua_State *l)
410{ 426{
411 json_config_t *cfg; 427 json_config_t *cfg;
@@ -442,6 +458,7 @@ static void json_create_config(lua_State *l)
442 cfg->encode_number_precision = DEFAULT_ENCODE_NUMBER_PRECISION; 458 cfg->encode_number_precision = DEFAULT_ENCODE_NUMBER_PRECISION;
443 cfg->encode_empty_table_as_object = DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT; 459 cfg->encode_empty_table_as_object = DEFAULT_ENCODE_EMPTY_TABLE_AS_OBJECT;
444 cfg->decode_array_with_array_mt = DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT; 460 cfg->decode_array_with_array_mt = DEFAULT_DECODE_ARRAY_WITH_ARRAY_MT;
461 cfg->encode_escape_forward_slash = DEFAULT_ENCODE_ESCAPE_FORWARD_SLASH;
445 462
446#if DEFAULT_ENCODE_KEEP_BUFFER > 0 463#if DEFAULT_ENCODE_KEEP_BUFFER > 0
447 strbuf_init(&cfg->encode_buf, 0); 464 strbuf_init(&cfg->encode_buf, 0);
@@ -1457,6 +1474,7 @@ static int lua_cjson_new(lua_State *l)
1457 { "encode_keep_buffer", json_cfg_encode_keep_buffer }, 1474 { "encode_keep_buffer", json_cfg_encode_keep_buffer },
1458 { "encode_invalid_numbers", json_cfg_encode_invalid_numbers }, 1475 { "encode_invalid_numbers", json_cfg_encode_invalid_numbers },
1459 { "decode_invalid_numbers", json_cfg_decode_invalid_numbers }, 1476 { "decode_invalid_numbers", json_cfg_decode_invalid_numbers },
1477 { "encode_escape_forward_slash", json_cfg_encode_escape_forward_slash },
1460 { "new", lua_cjson_new }, 1478 { "new", lua_cjson_new },
1461 { NULL, NULL } 1479 { NULL, NULL }
1462 }; 1480 };