--- libelwix/src/json.c 2017/11/29 00:49:47 1.1.2.9 +++ libelwix/src/json.c 2019/09/05 14:17:56 1.7.12.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: json.c,v 1.1.2.9 2017/11/29 00:49:47 misho Exp $ +* $Id: json.c,v 1.7.12.2 2019/09/05 14:17:56 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 - 2019 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -224,7 +224,7 @@ json_parse_value(json_t * __restrict json, const char case '}': goto found; } - if (jstr[json->h_pos] < 32 || jstr[json->h_pos] > 127) { + if (jstr[json->h_pos] < 32 || (u_char) jstr[json->h_pos] > 127) { json->h_pos = pos; elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); return -1; @@ -437,24 +437,30 @@ 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) { - char *str = NULL; + char *s, *s2, *wrk, *str = NULL; size_t len; if (!jstr || !tok) return NULL; + len = json_toklen(tok); str = e_malloc(len + 1); if (!str) return NULL; else { - strncpy(str, json_tokstr(jstr, tok), len); - str[len] = 0; + memset(str, 0, len + 1); + + wrk = e_strdup(json_tokstr(jstr, tok)); + wrk[len] = 0; + for (s = wrk, s2 = str; *s; s++) + *s2++ = (*s != '\\') ? *s : *++s; + e_free(wrk); } return str; @@ -483,16 +489,73 @@ 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_token2bool() - Return token to bool int + * + * @jstr = JSON string + * @tok = Token for convert + * @return 0 for FALSE and !=0 for TRUE + */ +int +json_token2bool(const char *jstr, jtok_t * __restrict tok) +{ + double ret = 0; + char *str; + + str = json_token2str(jstr, tok); + if (!str) + return 0; + + switch (*str) { + case 't': + case 'T': + ret = 1; + break; + case 'f': + case 'F': + ret = 0; + break; + default: + ret = (int) strtol(str, NULL, 10); + break; + } + 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 +570,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,6 +586,32 @@ json_findbykey(const char *jstr, const char *key, jtok } /* + * 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 @@ -527,7 +623,7 @@ 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; @@ -548,11 +644,15 @@ json_token2array(const char *jstr, jtok_t * __restrict 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]; + 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++) { @@ -563,6 +663,7 @@ json_token2array(const char *jstr, jtok_t * __restrict } } else { elwix_SetErr(J_ERR_PARAM, "%s", jerrstr[J_ERR_PARAM]); + ait_freeVars(&arr); return NULL; } @@ -570,6 +671,7 @@ json_token2array(const char *jstr, jtok_t * __restrict } + /* * json_add_begin_object() - Adds begin of object { * @@ -582,10 +684,14 @@ 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 @@ -593,6 +699,7 @@ json_add_begin_object(char * __restrict jstr, int jlen if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; return -1; } @@ -611,9 +718,12 @@ 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); @@ -622,6 +732,7 @@ json_add_end_object(char * __restrict jstr, int jlen, if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; return -1; } @@ -640,9 +751,12 @@ 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); @@ -651,6 +765,7 @@ json_add_begin_array(char * __restrict jstr, int jlen, if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; return -1; } @@ -669,9 +784,12 @@ 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); @@ -680,6 +798,7 @@ json_add_end_array(char * __restrict jstr, int jlen, i if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; return -1; } @@ -702,7 +821,7 @@ json_add_char(char * __restrict jstr, int jlen, u_char if (!jstr) return -1; - len = strlen(jstr); + len = strlen(jstr) + 1; if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); return -1; @@ -726,9 +845,12 @@ 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); @@ -737,6 +859,7 @@ json_add_colon(char * __restrict jstr, int jlen, int w if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; return -1; } @@ -755,9 +878,12 @@ 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); @@ -766,6 +892,7 @@ json_add_comma(char * __restrict jstr, int jlen, int w if (len >= jlen) { elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); + jstr[eos] = 0; return -1; } @@ -785,20 +912,35 @@ 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) + 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 (!unquot) - len = strlcat(jstr, "\"", 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; } @@ -817,21 +959,36 @@ json_add_value(char * __restrict jstr, int jlen, int u { int len; char wrk[STRSIZ] = { [0 ... STRSIZ - 1] = 0 }; + size_t eos; if (!jstr) return -1; + else + eos = strlen(jstr); - if (!unquot) + 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 (!unquot) - len = strlcat(jstr, "\"", 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; } @@ -850,21 +1007,72 @@ 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) + if (json_add_string(jstr, jlen, 0, key) == -1) { + jstr[eos] = 0; return -1; - if (json_add_colon(jstr, jlen, wspace) == -1) + } + if (json_add_colon(jstr, jlen, wspace) == -1) { + jstr[eos] = 0; return -1; - if ((len = json_add_string(jstr, jlen, 0, key)) == -1) + } + if ((len = json_add_string(jstr, jlen, 0, val)) == -1) { + jstr[eos] = 0; return -1; + } return len; } /* + * json_add_pair2() - Adds key/value pair with formated args + * + * @jstr = JSON string + * @jlen = JSON string length + * @wspace = whitespace include + * @key = Key string + * @fmt = Format string for values + * return: -1 error or !=-1 actual JSON string length + */ +int +json_add_pair2(char * __restrict jstr, int jlen, int wspace, const char *key, const char *fmt, ...) +{ + int len = -1; + size_t eos; + va_list lst; + char szStr[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; + + if (!jstr || !key || !fmt) + 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; + } + va_start(lst, fmt); + vsnprintf(szStr, sizeof szStr, fmt, lst); + va_end(lst); + if ((len = json_add_string(jstr, jlen, 0, szStr)) == -1) { + jstr[eos] = 0; + return -1; + } + + return len; +} + +/* * json_add_array() - Adds array * * @jstr = JSON string @@ -879,28 +1087,148 @@ json_add_array(char * __restrict jstr, int jlen, int w 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) + 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) + 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) + 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) + 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) + 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; }