mctl: enforce plain output for json

troglobit · troglobit · commit c79fba824478 · 2024-04-08T10:45:16.000+02:00
Signed-off-by: Joachim Wiberg &lt;troglobit@gmail.com&gt;
diff --git a/src/mctl.c b/src/mctl.c
@@ -618,6 +618,9 @@ static int cmd(int argc, char *argv[])
 
 	cmd = compose(match(argc, argv), buf, sizeof(buf));
 	while (cmdind < argc) {
+		if (!strcmp(argv[cmdind], "json"))
+			plain = 1; /* enforce plain mode for json output */
+
 		strlcat(buf, " ", sizeof(buf));
 		strlcat(buf, argv[cmdind++], sizeof(buf));
 	}

Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,9 @@ static int cmd(int argc, char *argv[])`
`618`	`618`
`619`	`619`	`cmd = compose(match(argc, argv), buf, sizeof(buf));`
`620`	`620`	`while (cmdind < argc) {`
	`621`	`+ if (!strcmp(argv[cmdind], "json"))`
	`622`	`+ plain = 1; /* enforce plain mode for json output */`
	`623`	`+`
`621`	`624`	`strlcat(buf, " ", sizeof(buf));`
`622`	`625`	`strlcat(buf, argv[cmdind++], sizeof(buf));`
`623`	`626`	`}`