summaryrefslogtreecommitdiff
path: root/Examine.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-09-15 11:34:20 -0700
committerDan Williams <dan.j.williams@intel.com>2009-09-15 11:34:20 -0700
commitee836c39b503e67b895a7ebabee8208a7ff0fea8 (patch)
treef169418c2638beceeba74ab3a0121d0dab6cc767 /Examine.c
parent709743c554c78b4bbc4483a3ba6845909d4db6ba (diff)
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>
Diffstat (limited to 'Examine.c')
-rw-r--r--Examine.c12
1 files changed, 9 insertions, 3 deletions
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)