mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: properly re-encode the keys and string values

Browse source 
Instead of pasting quotes around them.
This commit is contained in:
Wim Taymans 2021-06-10 16:32:16 +02:00
parent 1c513464c8
commit 826f52344f
1 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

50
spa/tools/spa-json-dump.c
View file

@ -35,10 +35,47 @@
#include <spa/utils/result.h> #include <spa/utils/result.h>
#include <spa/utils/json.h> #include <spa/utils/json.h>
static void encode_string(FILE *f, const char *val, int len)
{
int i;
fprintf(f, "\"");
for (i = 0; i < len; i++) {
char v = val[i];
switch (v) {
case '\n':
fprintf(f, "\\n");
break;
case '\r':
fprintf(f, "\\r");
break;
case '\b':
fprintf(f, "\\b");
break;
case '\t':
fprintf(f, "\\t");
break;
case '\f':
fprintf(f, "\\f");
break;
case '\\': case '"': case '/':
fprintf(f, "\\%c", v);
break;
default:
if (v > 0 && v < 0x20)
fprintf(f, "\\u%04x", v);
else
fprintf(f, "%c", v);
break;
}
}
fprintf(f, "\"");
}
static int dump(FILE *file, int indent, struct spa_json *it, const char *value, int len) static int dump(FILE *file, int indent, struct spa_json *it, const char *value, int len)
{ {
struct spa_json sub; struct spa_json sub;
int count = 0; int count = 0;
char key[1024];
if (spa_json_is_array(value, len)) { if (spa_json_is_array(value, len)) {
fprintf(file, "["); fprintf(file, "[");
@ -53,10 +90,12 @@ static int dump(FILE *file, int indent, struct spa_json *it, const char *value,
} else if (spa_json_is_object(value, len)) { } else if (spa_json_is_object(value, len)) {
fprintf(file, "{"); fprintf(file, "{");
spa_json_enter(it, &sub); spa_json_enter(it, &sub);
while ((len = spa_json_next(&sub, &value)) > 0) { while (spa_json_get_string(&sub, key, sizeof(key)-1) > 0) {
char *q = spa_json_is_string(value, len) ? "" : "\""; fprintf(file, "%s\n%*s",
fprintf(file, "%s\n%*s%s%.*s%s: ", count++ > 0 ? "," : "", count++ > 0 ? "," : "",
indent+2, "", q, len, value, q); indent+2, "");
encode_string(file, key, strlen(key));
fprintf(file, ": ");
if ((len = spa_json_next(&sub, &value)) <= 0) if ((len = spa_json_next(&sub, &value)) <= 0)
break; break;
dump(file, indent+2, &sub, value, len); dump(file, indent+2, &sub, value, len);
@ -66,10 +105,11 @@ static int dump(FILE *file, int indent, struct spa_json *it, const char *value,
} else if (spa_json_is_string(value, len) || } else if (spa_json_is_string(value, len) ||
spa_json_is_null(value, len) || spa_json_is_null(value, len) ||
spa_json_is_bool(value, len) || spa_json_is_bool(value, len) ||
spa_json_is_int(value, len) ||
spa_json_is_float(value, len)) { spa_json_is_float(value, len)) {
fprintf(file, "%.*s", len, value); fprintf(file, "%.*s", len, value);
} else { } else {
fprintf(file, "\"%.*s\"", len, value); encode_string(file, value, len);
} }
return 0; return 0;
} }