--- libelwix/src/json.c	2017/11/28 14:57:45	1.1.2.8
+++ libelwix/src/json.c	2017/12/03 20:01:42	1.2.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.1.2.8 2017/11/28 14:57:45 misho Exp $
+* $Id: json.c,v 1.2.2.1 2017/12/03 20:01:42 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -563,8 +563,473 @@ json_token2array(const char *jstr, jtok_t * __restrict
 		}
 	} else {
 		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;
 }