experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json escape etc

Browse source
This commit is contained in:
Olof Hagsand 2016-10-06 20:58:41 +02:00
parent 7062a75fd7
commit 303f4a35a8
3 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/src/clixon_json.c
View file

@ -160,6 +160,32 @@ array_eval(cxobj *xprev,
return array;
}
char *
json_escape(char *str)
{
int i, j;
char *snew;
j = 0;
for (i=0;i<strlen(str);i++)
if (str[i]=='\n')
j++;
if ((snew = malloc(strlen(str)+1+j))==NULL){
clicon_err(OE_XML, errno, "malloc");
return NULL;
}
j = 0;
for (i=0;i<strlen(str);i++)
if (str[i]=='\n'){
snew[j++]='\\';
snew[j++]='n';
}
else
snew[j++]=str[i];
snew[j++]='\0';
return snew;
}
/*! Do the actual work of translating XML to JSON
* @param[out] cb Cligen text buffer containing json on exit
* @param[in] x XML tree structure containing XML to translate
@ -214,10 +240,14 @@ xml2json1_cbuf(cbuf *cb,
arraytype2str(arraytype),
childtype2str(childt));
switch(arraytype){
case BODY_ARRAY:
assert(xml_value(x));
cprintf(cb, "\"%s\"", xml_value(x));
case BODY_ARRAY:{
char *str;
if ((str = json_escape(xml_value(x))) == NULL)
goto done;
cprintf(cb, "\"%s\"", str);
free(str);
break;
}
case NO_ARRAY:
if (!flat)
cprintf(cb, "%*s\"%s\": ",