--- libelwix/src/json.c 2017/11/28 02:00:45 1.1.2.5 +++ libelwix/src/json.c 2017/11/29 08:32:46 1.1.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: json.c,v 1.1.2.5 2017/11/28 02:00:45 misho Exp $ +* $Id: json.c,v 1.1.2.10 2017/11/29 08:32:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -116,7 +116,8 @@ json_gettoken(json_t * __restrict json, jtok_t * __res elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); return NULL; } else - tok = &jtoks[json->h_next++]; + tok = &jtoks[json->h_next]; + tok->tok_idx = json->h_next++; tok->tok_start = tok->tok_end = tok->tok_parent = -1; tok->tok_size = 0; @@ -276,7 +277,7 @@ json_parse(json_t * __restrict json, const char *jstr, switch ((ch = jstr[json->h_pos])) { case '{': case '[': - cx++; /* start new token */ + cx++; /* start new object/array token */ if (!jtoks) break; @@ -324,11 +325,9 @@ json_parse(json_t * __restrict json, const char *jstr, } break; case '\"': - if (json_parse_string(json, jstr, jlen, jtoks, toksnum) == -1) { - elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); + if (json_parse_string(json, jstr, jlen, jtoks, toksnum) == -1) return (u_int) -1; - } - cx++; + cx++; /* start new string token */ if (jtoks && json->h_parent != -1) jtoks[json->h_parent].tok_size++; break; @@ -374,7 +373,7 @@ json_parse(json_t * __restrict json, const char *jstr, if (json_parse_value(json, jstr, jlen, jtoks, toksnum) == -1) return (u_int) -1; - cx++; + cx++; /* start new value token */ if (jtoks && json->h_parent != -1) jtoks[json->h_parent].tok_size++; break; @@ -387,7 +386,7 @@ json_parse(json_t * __restrict json, const char *jstr, if (json_parse_value(json, jstr, jlen, jtoks, toksnum) == -1) return (u_int) -1; - cx++; + cx++; /* start new value token */ if (jtoks && json->h_parent != -1) jtoks[json->h_parent].tok_size++; break; @@ -402,7 +401,8 @@ json_parse(json_t * __restrict json, const char *jstr, return (u_int) -1; } } - } + } else + cx++; /* increment needed tokens number for termination empty token */ return cx; } @@ -426,8 +426,8 @@ json_token2val(const char *jstr, jtok_t * __restrict t if (!v) return NULL; - AIT_SET_STRSIZ(v, tok->tok_end - tok->tok_start); - strncpy(AIT_GET_STR(v), jstr + tok->tok_start, AIT_LEN(v) - 1); + AIT_SET_STRSIZ(v, json_toklen(tok)); + strncpy(AIT_GET_STR(v), json_tokstr(jstr, tok), AIT_LEN(v) - 1); return v; } @@ -448,12 +448,12 @@ json_token2str(const char *jstr, jtok_t * __restrict t if (!jstr || !tok) return NULL; - len = tok->tok_end - tok->tok_start; + len = json_toklen(tok); str = e_malloc(len + 1); if (!str) return NULL; else { - strncpy(str, jstr + tok->tok_start, len); + strncpy(str, json_tokstr(jstr, tok), len); str[len] = 0; } @@ -516,11 +516,11 @@ json_findbykey(const char *jstr, const char *key, jtok } /* - * json_token2array() - Convert token to array + * json_token2array() - Convert token to string array * * @jstr = JSON string * @tok = Token for convert - * return: =NULL error or !=NULL allocated array with variables, + * return: =NULL error or !=NULL allocated array with string variables, * after use should be ait_freeVars() */ array_t * @@ -545,18 +545,440 @@ json_token2array(const char *jstr, jtok_t * __restrict if (tok->tok_type == J_STRING || tok->tok_type == J_VALUE) { v = ait_getVars(&arr, 0); - AIT_SET_STRSIZ(v, json_toklen(tok)); + AIT_SET_STRSIZ(v, json_toklen(tok) + 1); json_tokstrcpy(AIT_GET_STR(v), jstr, tok); } else if (tok->tok_type == J_ARRAY) { for (i = 0; i < tok->tok_size; i++) { t = &tok[i + 1]; v = ait_getVars(&arr, i); - AIT_SET_STRSIZ(v, json_toklen(t)); + AIT_SET_STRSIZ(v, json_toklen(t) + 1); json_tokstrcpy(AIT_GET_STR(v), jstr, t); } + } else if (tok->tok_type == J_OBJECT) { + for (i = 0; tok->tok_idx <= tok[i + 1].tok_parent; i++) { + t = &tok[i + 1]; + v = ait_getVars(&arr, i); + AIT_SET_STRSIZ(v, json_toklen(t) + 1); + json_tokstrcpy(AIT_GET_STR(v), jstr, t); + } } else { - /* todo for object */ + elwix_SetErr(J_ERR_PARAM, "%s", jerrstr[J_ERR_PARAM]); + return NULL; } return arr; +} + + + +/* + * json_add_begin_object() - Adds begin of object { + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_begin_object(char * __restrict jstr, int jlen, int wspace) +{ + int len; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + + if (wspace) + len = strlcat(jstr, "{ ", jlen); + else + len = strlcat(jstr, "{", jlen); + + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_end_object() - Adds end of object } + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_end_object(char * __restrict jstr, int jlen, int wspace) +{ + int len; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + if (wspace) + len = strlcat(jstr, " }", jlen); + else + len = strlcat(jstr, "}", jlen); + + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_begin_array() - Adds begin of array [ + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_begin_array(char * __restrict jstr, int jlen, int wspace) +{ + int len; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + if (wspace) + len = strlcat(jstr, "[ ", jlen); + else + len = strlcat(jstr, "[", jlen); + + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_end_array() - Adds end of array ] + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_end_array(char * __restrict jstr, int jlen, int wspace) +{ + int len; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + if (wspace) + len = strlcat(jstr, " ]", jlen); + else + len = strlcat(jstr, "]", jlen); + + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_char() - Adds character + * + * @jstr = JSON string + * @jlen = JSON string length + * @ch = Character + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_char(char * __restrict jstr, int jlen, u_char ch) +{ + int len; + + if (!jstr) + return -1; + + len = strlen(jstr) + 1; + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + return -1; + } else { + jstr[len++] = (char) ch; + jstr[len] = 0; + } + + return len; +} + +/* + * json_add_colon() - Adds key/value pair delimiter colon : + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_colon(char * __restrict jstr, int jlen, int wspace) +{ + int len; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + if (wspace) + len = strlcat(jstr, ": ", jlen); + else + len = strlcat(jstr, ":", jlen); + + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_comma() - Adds value delimiter comma , + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_comma(char * __restrict jstr, int jlen, int wspace) +{ + int len; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + if (wspace) + len = strlcat(jstr, ", ", jlen); + else + len = strlcat(jstr, ",", jlen); + + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_string() - Adds string + * + * @jstr = JSON string + * @jlen = JSON string length + * @unquot = Unquoted string + * @str = String, it can't be NULL + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_string(char * __restrict jstr, int jlen, int unquot, const char *str) +{ + int len; + size_t eos; + + if (!jstr || !str) + return -1; + else + eos = strlen(jstr); + + if (!unquot) { + len = strlcat(jstr, "\"", jlen); + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + } + len = strlcat(jstr, str, jlen); + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + if (!unquot) { + len = strlcat(jstr, "\"", jlen); + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + } + + return len; +} + +/* + * json_add_value() - Adds value + * + * @jstr = JSON string + * @jlen = JSON string length + * @unquot = Unquoted number + * @num = Number + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_value(char * __restrict jstr, int jlen, int unquot, long num) +{ + int len; + char wrk[STRSIZ] = { [0 ... STRSIZ - 1] = 0 }; + size_t eos; + + if (!jstr) + return -1; + else + eos = strlen(jstr); + + if (!unquot) { + len = strlcat(jstr, "\"", jlen); + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + } + snprintf(wrk, sizeof wrk, "%ld", num); + len = strlcat(jstr, wrk, jlen); + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + if (!unquot) { + len = strlcat(jstr, "\"", jlen); + if (len >= jlen) { + elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; + return -1; + } + } + + return len; +} + +/* + * json_add_pair() - Adds key/value pair + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * @key = Key string + * @val = Value string + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_pair(char * __restrict jstr, int jlen, int wspace, const char *key, const char *val) +{ + int len = -1; + size_t eos; + + if (!jstr || !key || !val) + return -1; + else + eos = strlen(jstr); + + if (json_add_string(jstr, jlen, 0, key) == -1) { + jstr[eos] = 0; + return -1; + } + if (json_add_colon(jstr, jlen, wspace) == -1) { + jstr[eos] = 0; + return -1; + } + if ((len = json_add_string(jstr, jlen, 0, key)) == -1) { + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* + * json_add_array() - Adds array + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * @arr = Array with variables + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_array(char * __restrict jstr, int jlen, int wspace, array_t * __restrict arr) +{ + int len = -1; + register int i; + ait_val_t *v; + size_t eos; + + if (!jstr || !arr) + return -1; + else + eos = strlen(jstr); + + if (json_add_begin_array(jstr, jlen, wspace) == -1) { + jstr[eos] = 0; + return -1; + } + for (i = 0; i < array_Size(arr); i++) { + v = array(arr, i, ait_val_t*); + if (v) { + if (AIT_TYPE(v) == string) { + if (json_add_string(jstr, jlen, 0, AIT_GET_STR(v)) == -1) { + jstr[eos] = 0; + return -1; + } + } else { + if (json_add_value(jstr, jlen, 0, AIT_GET_LIKE(v, long)) == -1) { + jstr[eos] = 0; + return -1; + } + } + if (i < array_Size(arr) - 1 && json_add_comma(jstr, jlen, wspace) == -1) { + jstr[eos] = 0; + return -1; + } + } + } + if ((len = json_add_end_array(jstr, jlen, wspace)) == -1) { + jstr[eos] = 0; + return -1; + } + + return len; }