--- libelwix/src/json.c	2025/08/25 10:05:52	1.12.2.1
+++ libelwix/src/json.c	2026/03/31 15:29:12	1.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.12.2.1 2025/08/25 10:05:52 misho Exp $
+* $Id: json.c,v 1.14 2026/03/31 15:29:12 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 <info@elwix.org>
 
-Copyright 2004 - 2025
+Copyright 2004 - 2026
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -436,6 +436,34 @@ json_token2val(const char *jstr, jtok_t * __restrict t
 }
 
 /*
+ * json_token2rstr() - Return token to raw string
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return =NULL error or !=NULL allocated str, after use should be json_freestr()|e_free()
+ */
+char *
+json_token2rstr(const char *jstr, jtok_t * __restrict tok)
+{
+	char *str = NULL;
+	size_t len;
+
+	if (!jstr || !tok)
+		return NULL;
+
+	len = json_toklen(tok);
+	str = e_malloc(len + 1);
+	if (!str)
+		return NULL;
+	else {
+		memcpy(str, json_tokstr(jstr, tok), len);
+		str[len] = 0;
+	}
+
+	return str;
+}
+
+/*
  * json_token2str() - Return token to string
  *
  * @jstr = JSON string
@@ -482,7 +510,7 @@ json_token2num(const char *jstr, jtok_t * __restrict t
 	long ret = 0;
 	char *str;
 
-	str = json_token2str(jstr, tok);
+	str = json_token2rstr(jstr, tok);
 	if (!str)
 		return 0;
 
@@ -504,7 +532,7 @@ json_token2dbl(const char *jstr, jtok_t * __restrict t
 	double ret = 0;
 	char *str;
 
-	str = json_token2str(jstr, tok);
+	str = json_token2rstr(jstr, tok);
 	if (!str)
 		return 0;
 
@@ -526,7 +554,7 @@ json_token2bool(const char *jstr, jtok_t * __restrict 
 	double ret = 0;
 	char *str;
 
-	str = json_token2str(jstr, tok);
+	str = json_token2rstr(jstr, tok);
 	if (!str)
 		return 0;
 
@@ -811,7 +839,24 @@ json_token2array(const char *jstr, jtok_t * __restrict
 	return arr;
 }
 
+/*
+ * json_freearray() - Free & destroy allocated array from json_token2array function
+ *
+ * @parr = Array
+ * return -1 error or 0 ok
+ */
+int
+json_freearray(array_t **parr)
+{
+	if (!parr)
+		return -1;
 
+	array_Free(*parr);
+	array_Destroy(parr);
+	return 0;
+}
+
+
 /*
  * json_add_begin_object() - Adds begin of object {
  *
@@ -1421,6 +1466,9 @@ json_validate(const char *jstr, int *started)
 {
 	register int o = 0, a = 0, q = 0, pos = 0;
 
+	if (!jstr)
+		return -1;
+
 	if (started)
 		*started = 0;
 
@@ -1458,4 +1506,57 @@ json_validate(const char *jstr, int *started)
 	} while (q || a || o);
 
 	return pos;
+}
+
+/*
+ * json_marshaling() - Prepare JSON to one continues line
+ *
+ * @jstr = JSON string
+ * @space = if it is 0 then spaces will be removed
+ * return NULL error or !=NULL ready JSON for proceeding
+ */
+char *
+json_marshaling(char * __restrict jstr, int space)
+{
+	int started, ended, len;
+	char *str, *pos, *js;
+	register int q = 0;
+
+	if (!jstr)
+		return NULL;
+	else
+		js = jstr;
+
+	ended = json_validate(jstr, &started);
+	if (!ended)
+		return NULL;
+	len = ended - started + 1;
+	str = e_malloc(len);
+	if (!str)
+		return NULL;
+	else {
+		memset(str, 0, len);
+		pos = str;
+	}
+
+	js += started;
+	while (*js && js < jstr + ended && --len) {
+		if (*js < 0x20) {
+			js++;
+			continue;
+		}
+		if (space && !q && *js == 0x20) {
+			js++;
+			continue;
+		}
+		if (*js == '"')
+			q = ~q;
+		*pos++ = *js++;
+	}
+	*pos = 0;
+
+	len = strlen(jstr) + 1;
+	strlcpy(jstr, str, len);
+	e_free(str);
+	return jstr;
 }