Hi Christian,
small formatting nitpick inline ...
On 16/11/17 19:52, Christian Beier wrote:
The existing read functionality feeds the complete JSON to jshn as a
cmdline argument, leading to `-ash: jshn: Argument list too long`
errors for JSONs bigger than ca. 100KB.
This commit adds the ability to read the JSON directly from a file if
wanted, removing this shell-imposed size limit.
Tested on x86-64 and ar71xx. An mmap()-based solution was also evaluated,
but found to make no performance difference on either platform.
Signed-off-by: Christian Beier <dontm...@freeshell.org>
---
jshn.c | 30 ++++++++++++++++++++++++++++--
sh/jshn.sh | 4 ++++
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/jshn.c b/jshn.c
index 79136dd..a3866a0 100644
--- a/jshn.c
+++ b/jshn.c
@@ -25,6 +25,8 @@
#include <stdbool.h>
#include <ctype.h>
#include <getopt.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include "list.h"
#include "avl.h"
@@ -300,7 +302,7 @@ out:
static int usage(const char *progname)
{
- fprintf(stderr, "Usage: %s [-n] [-i] -r <message>|-w\n", progname);
+ fprintf(stderr, "Usage: %s [-n] [-i] -r <message>|-R <file>|-w\n",
progname);
return 2;
}
@@ -333,6 +335,10 @@ int main(int argc, char **argv)
struct env_var *vars;
int i;
int ch;
+ int fd;
+ struct stat sb;
+ char *fbuf;
+ int ret;
avl_init(&env_vars, avl_strcmp_var, false, NULL);
for (i = 0; environ[i]; i++);
@@ -354,7 +360,7 @@ int main(int argc, char **argv)
avl_insert(&env_vars, &vars[i].avl);
}
- while ((ch = getopt(argc, argv, "p:nir:w")) != -1) {
+ while ((ch = getopt(argc, argv, "p:nir:R:w")) != -1) {
switch(ch) {
case 'p':
var_prefix = optarg;
@@ -362,6 +368,26 @@ int main(int argc, char **argv)
break;
case 'r':
return jshn_parse(optarg);
+ case 'R':
+ if((fd = open(optarg, O_RDONLY)) == -1) {
you have spaces leading up to the if() and then needs to be a space
between if and (
+ fprintf(stderr, "Error opening %s\n", optarg);
+ return 3;
spaces vs tabs
+ }
+ if (fstat(fd, &sb) == -1) {
+ fprintf(stderr, "Error getting size of %s\n",
optarg);
+ close(fd);
+ return 3;
spaces vs tabs
+ }
+ if(!(fbuf = malloc(sb.st_size)) || read(fd, fbuf,
sb.st_size) != sb.st_size) {
+ fprintf(stderr, "Error reading %s\n", optarg);
+ free(fbuf);
+ close(fd);
+ return 3;
spaces vs tabs
John
+ }
+ ret = jshn_parse(fbuf);
+ free(fbuf);
+ close(fd);
+ return ret;
case 'w':
return jshn_format(no_newline, indent);
case 'n':
diff --git a/sh/jshn.sh b/sh/jshn.sh
index bf76edb..0a146e1 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -174,6 +174,10 @@ json_load() {
eval "`jshn -r "$1"`"
}
+json_load_file() {
+ eval "`jshn -R "$1"`"
+}
+
json_dump() {
jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w
}
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
