From: Karel Zak <kzak@redhat.com>
Date: Thu, 3 Feb 2011 11:01:45 +0000 (+0100)
Subject: blkid: don't print devname if nothing detected
X-Git-Tag: v2.19~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbcafb870f9622841d57a7554d8c4af258abc203;p=thirdparty%2Futil-linux.git

blkid: don't print devname if nothing detected

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 2f7860fd23..11eee2e7fb 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -513,13 +513,14 @@ static int lowprobe_device(blkid_probe pr, const char *devname,
 	if (rc < 0)
 		goto done;
 
-	nvals = blkid_probe_numof_values(pr);
+	if (!rc)
+		nvals = blkid_probe_numof_values(pr);
 
 	if (nvals && !first && output & (OUTPUT_UDEV_LIST | OUTPUT_EXPORT_LIST))
 		/* add extra line between output from devices */
 		fputc('\n', stdout);
 
-	if (output & OUTPUT_DEVICE_ONLY) {
+	if (nvals && (output & OUTPUT_DEVICE_ONLY)) {
 		printf("%s\n", devname);
 		goto done;
 	}