X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fjson-parse.c;h=6621c4da05513366fd68f4cc6957476594ac54bf;hb=82f61d1dd58f64119e33ed88d4ab7572b0ad1083;hp=db3e47314dbc6c258e45dc3f720c989ed535cd0c;hpb=a6d42174fde823c89a661c17be2165bce0d94870;p=yaz-moved-to-github.git

diff --git a/util/json-parse.c b/util/json-parse.c
index db3e473..6621c4d 100644
--- a/util/json-parse.c
+++ b/util/json-parse.c
@@ -1,7 +1,10 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,6 +25,7 @@ static struct json_node *do_parse_from_stdin(void)
     FILE *f = stdin;
     WRBUF w = wrbuf_alloc();
     struct json_node *n;
+    size_t pos;
     const char *json_str;
     const char *err_msg;
     int c;
@@ -29,9 +33,13 @@ static struct json_node *do_parse_from_stdin(void)
     while ((c = getc(f)) != EOF)
         wrbuf_putc(w, c);
     json_str = wrbuf_cstr(w);
-    n = json_parse(json_str, &err_msg);
+    n = json_parse2(json_str, &err_msg, &pos);
     if (!n)
-        fprintf(stderr, "JSON parse error: %s\n", err_msg);
+    {
+        fprintf(stderr, "JSON parse error: %s\nLeading text was:\n", err_msg);
+        fwrite(json_str, 1, pos, stderr);
+        fprintf(stderr, "^\n");
+    }
     wrbuf_destroy(w);
     return n;
 }