aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2013-10-24 01:06:44 +0000
committerHiroki Sato <hrs@FreeBSD.org>2013-10-24 01:06:44 +0000
commit4103b0b0252601ec6d5c9143adaed630530deaea (patch)
tree439a461ade1914f9c549302ec3520cc83e425b0e /sbin
parent8a5e5a978d5836e44f0efe312206e30fef7fcc9a (diff)
downloadsrc-4103b0b0252601ec6d5c9143adaed630530deaea.tar.gz
src-4103b0b0252601ec6d5c9143adaed630530deaea.zip
Return 0 if:
1. "-u N" specified, no -f, and mdN found, 2. no -u, "-f /pathname" specified, and mdN associated with /pathname found, 3. "-u N" specified, "-f /pathname" specified, and both of them found, 4. "-l" specified and no -f, 5. "-l" specified, "-f /pathname" specified, and /pathname found. otherwise return -1. Spotted by: Julian H. Stacey
Notes
Notes: svn path=/head/; revision=257036
Diffstat (limited to 'sbin')
-rw-r--r--sbin/mdconfig/mdconfig.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 233058d5d661..4257dd73db0e 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -481,12 +481,18 @@ md_list(const char *units, int opt, const char *fflag)
printf("\n");
/* XXX: Check if it's enough to clean everything. */
geom_stats_snapshot_free(sq);
- if (((opt & OPT_UNIT) && (fflag == NULL) && ufound) ||
- ((opt & OPT_UNIT) == 0 && (fflag != NULL) && ffound) ||
- ((opt & OPT_UNIT) && (fflag != NULL) && ufound && ffound))
- return (0);
- else
- return (-1);
+ if (opt & OPT_UNIT) {
+ if (((fflag == NULL) && ufound) ||
+ ((fflag == NULL) && (units != NULL) && ufound) ||
+ ((fflag != NULL) && ffound) ||
+ ((fflag != NULL) && (units != NULL) && ufound && ffound))
+ return (0);
+ } else if (opt & OPT_LIST) {
+ if ((fflag == NULL) ||
+ ((fflag != NULL) && ffound))
+ return (0);
+ }
+ return (-1);
}
/*