From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 31 May 2011 13:41:19 +0000 (+0200)
Subject: jshn: add an option for printing the json data without a terminating newline
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=bdf636377785788f7463d915e0adfb1a77bfe8c5;hp=a8032be64c4d03a98af47e9f4d93ddc137d23733

jshn: add an option for printing the json data without a terminating newline
---

diff --git a/jshn.c b/jshn.c
index a2d711f..e2f0b83 100644
--- a/jshn.c
+++ b/jshn.c
@@ -210,33 +210,38 @@ out:
 	return obj;
 }
 
-static int jshn_format(void)
+static int jshn_format(bool no_newline)
 {
 	json_object *obj;
 
 	obj = json_object_new_object();
 	jshn_add_objects(obj, "JSON_VAR", false);
-	fprintf(stdout, "%s\n", json_object_to_json_string(obj));
+	fprintf(stdout, "%s%s", json_object_to_json_string(obj),
+		no_newline ? "" : "\n");
 	json_object_put(obj);
 	return 0;
 }
 
 static int usage(const char *progname)
 {
-	fprintf(stderr, "Usage: %s -r <message>|-w\n", progname);
+	fprintf(stderr, "Usage: %s [-n] -r <message>|-w\n", progname);
 	return 2;
 }
 
 int main(int argc, char **argv)
 {
+	bool no_newline = false;
 	int ch;
 
-	while ((ch = getopt(argc, argv, "r:w")) != -1) {
+	while ((ch = getopt(argc, argv, "nr:w")) != -1) {
 		switch(ch) {
 		case 'r':
 			return jshn_parse(optarg);
 		case 'w':
-			return jshn_format();
+			return jshn_format(no_newline);
+		case 'n':
+			no_newline = true;
+			break;
 		default:
 			return usage(argv[0]);
 		}
diff --git a/sh/jshn.sh b/sh/jshn.sh
index b27d852..63d4b09 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -77,7 +77,7 @@ json_load() {
 }
 
 json_dump() {
-	jshn -w
+	jshn "$@" -w
 }
 
 json_get_type() {