volume_id: abort early on read failures.

should help with probing missing fdd's
2009-02-15 05:51:19 +00:00
parent 93b38208d1
commit 28ea4298e3
20 changed files with 99 additions and 70 deletions
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -37,7 +37,7 @@ get_label_uuid(int fd, char **label, char **uuid)
 	if (ioctl(/*vid->*/fd, BLKGETSIZE64, &size) != 0)
 		size = 0;

-	if (volume_id_probe_all(vid, 0, size) != 0)
+	if (volume_id_probe_all(vid, /*0,*/ size) != 0)
 		goto ret;

 	if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {