--- libelwix/src/json.c	2017/11/29 08:32:46	1.1.2.10
+++ libelwix/src/json.c	2017/12/03 21:50:23	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.1.2.10 2017/11/29 08:32:46 misho Exp $
+* $Id: json.c,v 1.3 2017/12/03 21:50:23 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -563,6 +563,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;
 	}
 
@@ -921,7 +922,7 @@ json_add_pair(char * __restrict jstr, int jlen, int ws
 		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;
 	}
@@ -981,4 +982,54 @@ json_add_array(char * __restrict jstr, int jlen, int w
 	}
 
 	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;
 }