Use more non-b0rked error reporting. Print the disk we are trying to open

and (we have the disk error from libufs? the disk error: the errno).

Requested by:	bde, <many>

1 files changed, 6 insertions, 3 deletions

diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 0881697..6e0c955 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -243,10 +243,13 @@ dumpfs(const char *name)
 	ufs_disk_close(&disk);
 	return (0);
 
-err:	libufs_printerror(&disk);
+err:	if (errno || disk.d_error != NULL) {
+		if (disk.d_error != NULL)
+			warnx("%s: %s", name, disk.d_error);
+		else
+			warn("%s", name);
+	}
 	ufs_disk_close(&disk);
-	if (errno)
-		warn("%s", name);
 	return (1);
 }