From 3922360800a704d81a33b20ab1c3c48f9bd837a2 Mon Sep 17 00:00:00 2001 From: "Serge A. Zaitsev" Date: Wed, 17 Nov 2010 12:19:38 +0200 Subject: [PATCH] Demo: options added. Number of tokens can be specified now. --- demo.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/demo.c b/demo.c index 4a76436..bcd6016 100644 --- a/demo.c +++ b/demo.c @@ -5,11 +5,12 @@ #include #include #include +#include +#include +#include #include "jsmn.h" -#define NUM_TOKENS 30 - static void jsmn_dump_obj(jsontok_t *obj, const char *js) { size_t len; @@ -44,29 +45,56 @@ static void jsmn_dump_obj(jsontok_t *obj, const char *js) { free(s); } +void usage(void) { + fprintf(stderr, "Usage: ./demo \n"); + exit(EXIT_SUCCESS); +} + int main(int argc, char *argv[]) { int i; int r; - jsontok_t tokens[NUM_TOKENS]; + int c; + jsontok_t *tokens; + int num_tokens = 100; FILE *f; int filesize = 0; char *js = NULL; - if (argc != 2) { - fprintf(stderr, "Usage: ./demo \n"); - exit(EXIT_SUCCESS); + while ((c = getopt(argc, argv, "ht:")) != -1) { + switch (c) { + case 'h': + usage(); + break; + case 't': + num_tokens = atoi(optarg); + if (errno || num_tokens < 0) { + fprintf(stderr, "Invalid token number: %s!\n", optarg); + exit(EXIT_FAILURE); + } + break; + } + } + + if (optind >= argc) { + usage(); } - if (strcmp(argv[1], "-") == 0) { + if (strcmp(argv[optind], "-") == 0) { f = stdin; } else { - f = fopen(argv[1], "r"); + f = fopen(argv[optind], "r"); if (f == NULL) { fprintf(stderr, "Failed to open file `%s`\n", argv[1]); exit(EXIT_FAILURE); } } + tokens = malloc(num_tokens * sizeof(jsontok_t)); + if (tokens == NULL) { + fprintf(stderr, "Cannot allocate anough memory\n"); + exit(EXIT_FAILURE); + } + while (1) { char buf[BUFSIZ]; r = fread(buf, 1, BUFSIZ, f); @@ -86,15 +114,14 @@ int main(int argc, char *argv[]) { fclose(f); jsmn_parser parser; - - jsmn_init_parser(&parser, js, tokens, NUM_TOKENS); + jsmn_init_parser(&parser, js, tokens, num_tokens); r = jsmn_parse(&parser); if (r < 0) { printf("error %d at pos %d: %s\n", r, parser.pos, &js[parser.pos]); } - for (i = 0; i