From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 13 Feb 2026 10:43:16 +0000 (+0100)
Subject: include device in json output and use json array when needed
X-Git-Tag: v2.43-devel~76^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9034294767944181510ccc0949e9c67b33ca0fb3;p=thirdparty%2Futil-linux.git

include device in json output and use json array when needed
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index a8580e538..9d38d94b2 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -337,6 +337,8 @@ static void print_value(const struct blkid_control *ctl, int num,
 		fputs("\n", stdout);
 
 	} else if (ctl->output & OUTPUT_JSON) {
+		if (num == 1 && devname)
+			ul_jsonwrt_value_s(ctl->json_fmt, "device", devname);
 		ul_jsonwrt_value_s_sized(ctl->json_fmt, name, value, valsz);
 
 	} else {
@@ -372,10 +374,8 @@ static void print_tags(const struct blkid_control *ctl, blkid_dev dev)
 		return;
 	}
 
-	if (ctl->output == OUTPUT_JSON) {
-		ul_jsonwrt_init(ctl->json_fmt, stdout, 0);
+	if (ctl->output == OUTPUT_JSON)
 		ul_jsonwrt_open(ctl->json_fmt, NULL, UL_JSON_OBJECT);
-	}
 
 	iter = blkid_tag_iterate_begin(dev);
 	while (blkid_tag_next(iter, &type, &value) == 0) {
@@ -981,6 +981,9 @@ int main(int argc, char **argv)
 		 */
 		blkid_dev dev;
 
+		if (ctl.output & OUTPUT_JSON)
+			ul_jsonwrt_init(ctl.json_fmt, stdout, 0);
+
 		if (!search_type)
 			errx(BLKID_EXIT_OTHER,
 			     _("The lookup option requires a "
@@ -999,6 +1002,11 @@ int main(int argc, char **argv)
 		blkid_dev_iterate	iter;
 		blkid_dev		dev;
 
+		if (ctl.output & OUTPUT_JSON) {
+			ul_jsonwrt_init(ctl.json_fmt, stdout, 0);
+			ul_jsonwrt_array_open(ctl.json_fmt, NULL);
+		}
+
 		blkid_probe_all(cache);
 
 		iter = blkid_dev_iterate_begin(cache);
@@ -1011,11 +1019,20 @@ int main(int argc, char **argv)
 			err = 0;
 		}
 		blkid_dev_iterate_end(iter);
+
+		if (ctl.output == OUTPUT_JSON) {
+			ul_jsonwrt_array_close(ctl.json_fmt);
+			fprintf(stdout, "\n");
+		}
+
 	/* Add all specified devices to cache (optionally display tags) */
 	} else for (i = 0; i < numdev; i++) {
 		blkid_dev dev = blkid_get_dev(cache, devices[i],
 						  BLKID_DEV_NORMAL);
 
+		if (ctl.output & OUTPUT_JSON)
+			ul_jsonwrt_init(ctl.json_fmt, stdout, 0);
+
 		if (dev) {
 			if (search_type &&
 			    !blkid_dev_has_tag(dev, search_type,