blkid -p dev1 dev2 [...] now stops upon first error detected and
returns correct value. Previously, if error was detected with dev1,
it continued with dev2 anyways and so the return value corresponded
to the last device only.
Reported-by: Bernhard Voelker <bernhard.voelker@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Petr Uzel <petr.uzel@xxxxxxx>
---
misc-utils/blkid.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 52b2a4b..25e6c00 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -868,11 +868,14 @@ int main(int argc, char **argv)
goto exit;
}
- for (i = 0; i < numdev; i++)
+ for (i = 0; i < numdev; i++) {
err = lowprobe_device(pr, devices[i], lowprobe, show,
output_format,
(blkid_loff_t) offset,
(blkid_loff_t) size);
+ if (err)
+ break;
+ }
blkid_free_probe(pr);
} else if (eval) {
/*
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
