Keep spaces between filesystem entries

Author: mattlangford

cmds/filesystem.c

@@ -479,6 +479,11 @@ static int btrfs_scan_kernel(void *search, unsigned unit_mode)
 
 		fd = open(mnt->mnt_dir, O_RDONLY);
 		if ((fd != -1) && !get_df(fd, &space_info_arg)) {
+			/* put spacing between filesystem entries for readability */
+			if (found != 0) {
+				pr_verbose(LOG_DEFAULT, "\n");
+			}
+
 			print_one_fs(&fs_info_arg, dev_info_arg,
 				     space_info_arg, label, unit_mode);
 			free(space_info_arg);
@@ -755,6 +760,7 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd,
 	char uuid_buf[BTRFS_UUID_UNPARSED_SIZE];
 	unsigned unit_mode;
 	int found = 0;
+	int needs_newline = 0;
 
 	unit_mode = get_unit_mode_from_arg(&argc, argv, 0);
 
@@ -843,6 +849,9 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd,
 		goto out;
 	}
 
+	/* the above call will return 0 if it found anything, in those cases we need an extra newline below */
+	needs_newline = !ret;
+
 	/* shows mounted only */
 	if (where == BTRFS_SCAN_MOUNTED)
 		goto out;
@@ -880,8 +889,14 @@ static int cmd_filesystem_show(const struct cmd_struct *cmd,
 		goto out;
 	}
 
-	list_for_each_entry(fs_devices, &all_uuids, fs_list)
+	list_for_each_entry(fs_devices, &all_uuids, fs_list) {
+		/* put spacing between filesystem entries for readability */
+		if (needs_newline) {
+			pr_verbose(LOG_DEFAULT, "\n");
+		}
 		print_one_uuid(fs_devices, unit_mode);
+		needs_newline = true;
+	}
 
 	if (search && !found) {
 		error("not a valid btrfs filesystem: %s", search);