#include <unistd.h>
#include <jansson.h>
+#include "strbuffer.h"
typedef int (*dump_func)(const char *buffer, int size, void *data);
-static int dump_to_file(const char *buffer, int size, void *data)
+struct string
{
- FILE *dest = (FILE *)data;
- if(fwrite(buffer, size, 1, dest) != 1)
- return -1;
- return 0;
+ char *buffer;
+ int length;
+ int size;
+};
+
+static int dump_to_strbuffer(const char *buffer, int size, void *data)
+{
+ return strbuffer_append_bytes((strbuffer_t *)data, buffer, size);
}
-static int dump_to_fd(const char *buffer, int size, void *data)
+static int dump_to_file(const char *buffer, int size, void *data)
{
- int *fd = (int *)data;
- if(write(*fd, buffer, size) != size)
+ FILE *dest = (FILE *)data;
+ if(fwrite(buffer, size, 1, dest) != 1)
return -1;
return 0;
}
memset(ws_buffer, ' ', ws_count);
return dump(ws_buffer, ws_count, data);
}
- else
- return dump(" ", 1, data);
+ return 0;
}
static int dump_string(const char *str, dump_func dump, void *data)
return -1;
end = str;
- while(*end)
+ while(1)
{
- while(*end && *end != '\\' && *end != '"')
+ const char *text;
+ char seq[7];
+ int length;
+
+ while(*end && *end != '\\' && *end != '"' && (*end < 0 || *end > 0x1F))
end++;
- if(end != str)
+ if(end != str) {
if(dump(str, end - str, data))
return -1;
-
- if(*end == '\\')
- {
- if(dump("\\\\", 2, data))
- return -1;
- end++;
}
- else if(*end == '"')
+
+ if(!*end)
+ break;
+
+ /* handle \, ", and control codes */
+ length = 2;
+ switch(*end)
{
- if(dump("\\\"", 2, data))
- return -1;
- end++;
+ case '\\': text = "\\\\"; break;
+ case '\"': text = "\\\""; break;
+ case '\b': text = "\\b"; break;
+ case '\f': text = "\\f"; break;
+ case '\n': text = "\\n"; break;
+ case '\r': text = "\\r"; break;
+ case '\t': text = "\\t"; break;
+ default:
+ {
+ sprintf(seq, "\\u00%02x", *end);
+ text = seq;
+ length = 6;
+ break;
+ }
}
+
+ if(dump(text, length, data))
+ return -1;
+
+ end++;
str = end;
}
case JSON_FALSE:
return dump("false", 5, data);
- case JSON_NUMBER:
+ case JSON_INTEGER:
+ {
+ char *buffer;
+ int size, ret;
+
+ size = asprintf(&buffer, "%d", json_integer_value(json));
+ if(size == -1)
+ return -1;
+
+ ret = dump(buffer, size, data);
+ free(buffer);
+ return ret;
+ }
+
+ case JSON_REAL:
{
char *buffer;
int size, ret;
- size = asprintf(&buffer, "%.17f", json_number_value(json));
+ size = asprintf(&buffer, "%.17f", json_real_value(json));
if(size == -1)
return -1;
if(dump("[", 1, data))
return -1;
if(n == 0)
- dump("]", 1, data);
+ return dump("]", 1, data);
if(dump_indent(flags, depth + 1, dump, data))
return -1;
}
-int json_dumpf(const json_t *json, FILE *output, uint32_t flags)
+int json_dump(const json_t *json, const char *path, uint32_t flags)
{
- if(do_dump(json, flags, 0, dump_to_file, (void *)output))
+ int result;
+
+ FILE *output = fopen(path, "w");
+ if(!output)
return -1;
- return dump_to_file("\n", 1, (void *)output);
+
+ result = json_dumpf(json, output, flags);
+
+ fclose(output);
+ return result;
}
-int json_dumpfd(const json_t *json, int fd, uint32_t flags)
+char *json_dumps(const json_t *json, uint32_t flags)
{
- if(do_dump(json, flags, 0, dump_to_fd, (void *)&fd))
+ strbuffer_t strbuff;
+ char *result;
+
+ if(strbuffer_init(&strbuff))
+ return NULL;
+
+ if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff))
+ return NULL;
+
+ if(dump_to_strbuffer("\n", 1, (void *)&strbuff))
+ return NULL;
+
+ result = strdup(strbuffer_value(&strbuff));
+ strbuffer_close(&strbuff);
+
+ return result;
+}
+
+int json_dumpf(const json_t *json, FILE *output, uint32_t flags)
+{
+ if(do_dump(json, flags, 0, dump_to_file, (void *)output))
return -1;
- return dump_to_fd("\n", 1, (void *)&fd);
+ return dump_to_file("\n", 1, (void *)output);
}