From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 15 Sep 2009 18:34:20 +0000 (-0700)
Subject: Examine: fixup output in the presence of containers with spares
X-Git-Tag: mdadm-3.0.1~2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee836c39b503e67b895a7ebabee8208a7ff0fea8;p=thirdparty%2Fmdadm.git

Examine: fixup output in the presence of containers with spares

If we dump any 'spare' or 'device' information for a container in the
'brief' case then we need a newline before printing member array info.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/Examine.c b/Examine.c
index c79a7011..d4904bc9 100644
--- a/Examine.c
+++ b/Examine.c
@@ -136,17 +136,23 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 		for (ap=arrays; ap; ap=ap->next) {
 			char sep='=';
 			char *d;
+			int newline = 0;
+
 			ap->st->ss->brief_examine_super(ap->st, brief > 1);
-			if (ap->spares) printf("   spares=%d", ap->spares);
+			if (ap->spares)
+				newline += printf("   spares=%d", ap->spares);
 			if (brief > 1) {
-				printf("   devices");
+				newline += printf("   devices");
 				for (d=dl_next(ap->devs); d!= ap->devs; d=dl_next(d)) {
 					printf("%c%s", sep, d);
 					sep=',';
 				}
 			}
-			if (ap->st->ss->brief_examine_subarrays)
+			if (ap->st->ss->brief_examine_subarrays) {
+				if (newline)
+					printf("\n");
 				ap->st->ss->brief_examine_subarrays(ap->st, brief > 1);
+			}
 			ap->st->ss->free_super(ap->st);
 			/* FIXME free ap */
 			if (ap->spares || brief > 1)