From a50e99d1375020d28e8cd976041e0d7ceef123ff Mon Sep 17 00:00:00 2001 From: Ian Dowse Date: Fri, 16 Nov 2001 22:13:44 +0000 Subject: [PATCH] Give a sensible error message when the filesystem to be dumped is not listed in /etc/fstab. Previously, the user would be greeted with "DUMP: bad sblock magic number" when dump tried to parse the directory contents as an FFS filesystem. PR: bin/12789 Submitted by: Bob Willcox --- sbin/dump/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 0e3b3f6f0e1a..eb9c232916b2 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -97,6 +97,7 @@ main(argc, argv) int argc; char *argv[]; { + struct stat sb; register ino_t ino; register int dirty; register struct dinode *dp; @@ -336,10 +337,12 @@ main(argc, argv) else msgtail("to %s\n", tape); - if ((diskfd = open(disk, O_RDONLY)) < 0) { - msg("Cannot open %s\n", disk); - exit(X_STARTUP); - } + if ((diskfd = open(disk, O_RDONLY)) < 0) + err(X_STARTUP, "Cannot open %s", disk); + if (fstat(diskfd, &sb) != 0) + err(X_STARTUP, "%s: stat", disk); + if (S_ISDIR(sb.st_mode)) + errx(X_STARTUP, "%s: unknown file system", disk); sync(); sblock = (struct fs *)sblock_buf; bread(SBOFF, (char *) sblock, SBSIZE);