--- libelwix/src/json.c 2017/11/28 02:00:45 1.1.2.5 +++ libelwix/src/json.c 2018/04/19 00:00:36 1.5 @@ -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.5 2018/04/19 00:00:36 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2017 +Copyright 2004 - 2018 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -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; } @@ -437,7 +437,7 @@ json_token2val(const char *jstr, jtok_t * __restrict t * * @jstr = JSON string * @tok = Token for convert - * @return =NULL error or !=NULL allocated str, after use should be e_free() + * @return =NULL error or !=NULL allocated str, after use should be json_freestr()|e_free() */ char * json_token2str(const char *jstr, jtok_t * __restrict tok) @@ -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; } @@ -483,16 +483,39 @@ json_token2num(const char *jstr, jtok_t * __restrict t } /* - * json_findbykey() - Find data by key + * json_token2dbl() - Return token to double * * @jstr = JSON string + * @tok = Token for convert + * @return number + */ +double +json_token2dbl(const char *jstr, jtok_t * __restrict tok) +{ + double ret = 0; + char *str; + + str = json_token2str(jstr, tok); + if (!str) + return 0; + + ret = strtod(str, NULL); + e_free(str); + return ret; +} + +/* + * json_findbykey() - Find token data by key + * + * @jstr = JSON string * @key = Search key + * @type = Search key for particular token type, if is J_UNDEF this mean any type * @toks = Parsed tokens * @toksnum = Number of parsed tokens * return: =NULL error or !=NULL data token found */ jtok_t * -json_findbykey(const char *jstr, const char *key, jtok_t * __restrict toks, int toksnum) +json_findbykey(const char *jstr, const char *key, jtype_t type, jtok_t * __restrict toks, int toksnum) { jtok_t *tok = NULL; register int i; @@ -507,8 +530,15 @@ json_findbykey(const char *jstr, const char *key, jtok if (toks[i].tok_type == J_STRING && klen == toks[i].tok_end - toks[i].tok_start && !strncmp(jstr + toks[i].tok_start, key, klen)) { - tok = toks + i + 1; - break; + if (type != J_UNDEF) { + if (toks[i + 1].tok_type == type) { + tok = toks + i + 1; + break; + } + } else { + tok = toks + i + 1; + break; + } } } @@ -516,18 +546,44 @@ json_findbykey(const char *jstr, const char *key, jtok } /* - * json_token2array() - Convert token to array + * json_findbypos() - Find token by position on JSON string * + * @pos = Offset from begin of JSON string + * @toks = Parsed tokens + * @toksnum = Number of parsed tokens + * return: =NULL error or !=NULL token found + */ +jtok_t * +json_findbypos(u_long pos, jtok_t * __restrict toks, int toksnum) +{ + jtok_t *tok = NULL; + register int i; + + if (toks) + return NULL; + + for (i = 1; i < toksnum; i++) + if (pos <= toks[i].tok_end && pos >= toks[i].tok_start) { + tok = toks + i; + break; + } + + return tok; +} + +/* + * 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 * json_token2array(const char *jstr, jtok_t * __restrict tok) { array_t *arr = NULL; - register int i; + register int i, j; int siz; ait_val_t *v; jtok_t *t; @@ -545,18 +601,552 @@ 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++) { + for (i = 0, j = 1; i < tok->tok_size; i++) { + t = &tok[i + j]; + v = ait_getVars(&arr, i); + AIT_SET_STRSIZ(v, json_toklen(t) + 1); + json_tokstrcpy(AIT_GET_STR(v), jstr, t); + + /* if there we have array from objects should parse all object tokens */ + while (i < tok->tok_size - 1 && tok->tok_idx != tok[i + j + 1].tok_parent) + j++; + } + } 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)); + 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]); + ait_freeVars(&arr); + 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, val)) == -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; +} + +/* + * json_dump_yaml() - Dump parsed JSON string to YAML format + * + * @f = Output handler + * @jstr = JSON string + * @toks = JSON tokens + * @toksnum = Number of tokens + * @indent = Start indent spaces + * return: 0 done and 1 added one more item + */ +int +json_dump_yaml(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent) +{ + register int i, j, k; + + if (!toksnum) + return 0; + + if (toks->tok_type == J_VALUE) { + fprintf(f, "%.*s", (int) json_toklen(toks), json_tokstr(jstr, toks)); + return 1; + } else if (toks->tok_type == J_STRING) { + fprintf(f, "%.*s", (int) json_toklen(toks), json_tokstr(jstr, toks)); + return 1; + } else if (toks->tok_type == J_OBJECT) { + fprintf(f, "\n"); + for (j = i = 0; i < json_toksize(toks); i++) { + for (k = 0; k < indent; k++) + fprintf(f, " "); + j += json_dump_yaml(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, ": "); + j += json_dump_yaml(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, "\n"); + } + return j + 1; + } else if (toks->tok_type == J_ARRAY) { + fprintf(f, "\n"); + for (j = i = 0; i < json_toksize(toks); i++) { + for (k = 0; k < indent - 1; k++) + fprintf(f, " "); + fprintf(f, " - "); + j += json_dump_yaml(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, "\n"); + } + return j + 1; + } + + return 0; +} + +/* + * json_dump() - Dump parsed JSON string to structure format + * + * @f = Output handler + * @jstr = JSON string + * @toks = JSON tokens + * @toksnum = Number of tokens + * @indent = Start indent spaces + * return: 0 done and 1 added one more item + */ +int +json_dump(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent) +{ + register int i, j, k; + + if (!toksnum) + return 0; + + if (toks->tok_type == J_VALUE) { + fprintf(f, "[idx=%ld type=VALUE start=%ld end=%ld size=%ld parent=%ld] = %.*s", + toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent, + (int) json_toklen(toks), json_tokstr(jstr, toks)); + return 1; + } else if (toks->tok_type == J_STRING) { + fprintf(f, "[idx=%ld type=STRING start=%ld end=%ld size=%ld parent=%ld] = %.*s", + toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent, + (int) json_toklen(toks), json_tokstr(jstr, toks)); + return 1; + } else if (toks->tok_type == J_OBJECT) { + fprintf(f, "\n"); + fprintf(f, "object:: [idx=%ld type=OBJECT start=%ld end=%ld size=%ld parent=%ld]\n", + toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent); + for (j = i = 0; i < json_toksize(toks); i++) { + for (k = 0; k < indent; k++) + fprintf(f, " "); + j += json_dump(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, ": "); + j += json_dump(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, "\n"); + } + return j + 1; + } else if (toks->tok_type == J_ARRAY) { + fprintf(f, "\n"); + fprintf(f, "array[] [idx=%ld type=ARRAY start=%ld end=%ld size=%ld parent=%ld]", + toks->tok_idx, toks->tok_start, toks->tok_end, toks->tok_size, toks->tok_parent); + for (j = i = 0; i < json_toksize(toks); i++) { + for (k = 0; k < indent - 1; k++) + fprintf(f, " "); + j += json_dump(f, jstr, toks + j + 1, toksnum - j, indent + 1); + fprintf(f, "\n"); + } + return j + 1; + } + + return 0; }