From aa97d8b59960ff007632ac5a6a6993a46935092e Mon Sep 17 00:00:00 2001
From: "Serge A. Zaitsev" <devnull@localhost>
Date: Mon, 15 Nov 2010 15:46:31 +0200
Subject: [PATCH] Demo: changed to read from '.js' file

---
 demo.c | 76 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 23 deletions(-)

diff --git a/demo.c b/demo.c
index e644dcb..788017f 100644
--- a/demo.c
+++ b/demo.c
@@ -10,57 +10,87 @@
 
 #define NUM_TOKENS 20
 
-static void json_dump_obj(jsontok_t *obj, const unsigned char *js) {
+static void json_dump_obj(jsontok_t *obj, const char *js) {
 	size_t len;
 
-	printf("[%d,%d]", obj->start, obj->end);
-	len = (size_t) (obj->end - obj->start);
+	if (obj->end < 0 || obj->start < 0) {
+		return;
+	}
+
+	len = obj->end - obj->start;
+
+	printf("[%d,%d]\t", obj->start, obj->end);
 
 	char *type;
 	switch (obj->type) {
 		case JSON_OTHER:
-			type = "other";
+			type = "(?)";
 			break;
 		case JSON_NUMBER:
-			type = "number";
+			type = "(N)";
 			break;
 		case JSON_STRING:
-			type = "string";
+			type = "(S)";
 			break;
 		case JSON_ARRAY:
-			type = "array";
+			type = "(A)";
 			break;
 		case JSON_OBJECT:
-			type = "object";
+			type = "(O)";
 			break;
 	}
 
-	printf(" %s ", type);
+	printf("%s ", type);
 
-	if (len > 0) {
-			char *s = strndup((const char *) &js[obj->start], len);
-			printf("%s", s);
-			free(s);
-	}
-	printf("\n");
+	char *s = strndup((const char *) &js[obj->start], len);
+	printf("%s\n", s);
+	free(s);
 }
 
-int main(void) {
+int main(int argc, char *argv[]) {
 	int i;
 	jsontok_t tokens[NUM_TOKENS];
+	FILE *f;
+	int filesize = 0;
+	char *js = NULL;
+
+	if (argc != 2) {
+		fprintf(stderr, "Usage: ./demo <file.js>\n");
+		exit(EXIT_SUCCESS);
+	}
 
-	const unsigned char *js = (unsigned char *)
-		"{"
-			"\"foo\": \"bar\","
-			"\"bar\": [1,2, 3],"
-			"\"obj\": { \"true\": false}"
-		"}";
+	f = fopen(argv[1], "r");
+	if (f == NULL) {
+		fprintf(stderr, "Failed to open file `%s`\n", argv[1]);
+		exit(EXIT_FAILURE);
+	}
+
+	while (1) {
+		int r;
+		char buf[BUFSIZ];
+		r = fread(buf, 1, BUFSIZ, f);
+		if (r <= 0) {
+			break;
+		}
+		js = (char *) realloc(js, filesize + r);
+		if (js == NULL) {
+			fprintf(stderr, "Cannot allocate anough memory\n");
+			fclose(f);
+			exit(EXIT_FAILURE);
+		}
+		memcpy(js + filesize, buf, r);
+		filesize += r;
+	}
+
+	fclose(f);
 
-	jsmn_parse(js, tokens, NUM_TOKENS, NULL);
+	jsmn_parse((unsigned char *) js, tokens, NUM_TOKENS, NULL);
 
 	for (i = 0; i<NUM_TOKENS; i++) {
 		json_dump_obj(&tokens[i], js);
 	}
 
+	free(js);
+
 	return 0;
 }