diff options
| author | Petr Uzel | 2012-05-17 09:37:25 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-05-23 09:43:51 +0200 |
| commit | 078ad9bf06568b38767ac2049371e628373c0ef8 (patch) | |
| tree | 6836ec8a1efddcbd16e8f538ebb9a10185706d7f /misc-utils/blkid.c | |
| parent | blkid: introduce symbolic names for different blkid exit codes (diff) | |
| download | kernel-qcow2-util-linux-078ad9bf06568b38767ac2049371e628373c0ef8.tar.gz kernel-qcow2-util-linux-078ad9bf06568b38767ac2049371e628373c0ef8.tar.xz kernel-qcow2-util-linux-078ad9bf06568b38767ac2049371e628373c0ef8.zip | |
blkid: stop device probing if error is detected
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@siemens-enterprise.com>
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'misc-utils/blkid.c')
| -rw-r--r-- | 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 52b2a4bc9..25e6c00e8 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) { /* |