Update fsdb(8) to reflect new structure of fsck_ffs(8).

The cleanup of fsck_ffs(8) in commit c0bfa109b942659f6 broke fsdb(8).
This commit adds the one-line update needed in fsdb(8) to make it
work with the new fsck_ffs(8) structure.

Reported by: Chuck Silvers
Tested by:   Chuck Silvers
MFC after:   3 days

diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 690a98038884fd5c73fe34d534f55cdbbb054f03..daa346826eff7531bfc66b09716dbb737b3ac50a 100644 (file)
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -490,6 +490,7 @@ struct inostat *inoinfo(ino_t inum);
 void           IOstats(char *what);
 int            linkup(ino_t orphan, ino_t parentdir, char *name);
 int            makeentry(ino_t parent, ino_t ino, const char *name);
+int            openfilesys(char *dev);
 void           panic(const char *fmt, ...) __printflike(1, 2);
 void           pass1(void);
 void           pass1b(void);

diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 9ea5f5b91110f64882f2d6236e1da8c580204b87..2724893a5b9a99ad25ed2217d24e45b876f21c58 100644 (file)
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -76,7 +76,6 @@ static void usage(void) __dead2;
 static intmax_t argtoimax(int flag, const char *req, const char *str, int base);
 static int checkfilesys(char *filesys);
 static int setup_bkgrdchk(struct statfs *mntp, int sbrdfailed, char **filesys);
-static int openfilesys(char *dev);
 static int chkdoreload(struct statfs *mntp);
 static struct statfs *getmntpt(const char *);
 
@@ -715,44 +714,6 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys)
        return (1);
 }
 
-/*
- * Open a device or file to be checked by fsck.
- */
-static int
-openfilesys(char *dev)
-{
-       struct stat statb;
-       int saved_fsreadfd;
-
-       if (stat(dev, &statb) < 0) {
-               pfatal("CANNOT STAT %s: %s\n", dev, strerror(errno));
-               return (0);
-       }
-       if ((statb.st_mode & S_IFMT) != S_IFCHR &&
-           (statb.st_mode & S_IFMT) != S_IFBLK) {
-               if (bkgrdflag != 0 && (statb.st_flags & SF_SNAPSHOT) == 0) {
-                       pfatal("BACKGROUND FSCK LACKS A SNAPSHOT\n");
-                       exit(EEXIT);
-               }
-               if (bkgrdflag != 0) {
-                       cursnapshot = statb.st_ino;
-               } else {
-                       pfatal("%s IS NOT A DISK DEVICE\n", dev);
-                       if (reply("CONTINUE") == 0)
-                               return (0);
-               }
-       }
-       saved_fsreadfd = fsreadfd;
-       if ((fsreadfd = open(dev, O_RDONLY)) < 0) {
-               fsreadfd = saved_fsreadfd;
-               pfatal("CANNOT OPEN %s: %s\n", dev, strerror(errno));
-               return (0);
-       }
-       if (saved_fsreadfd != -1)
-               close(saved_fsreadfd);
-       return (1);
-}
-
 static int
 chkdoreload(struct statfs *mntp)
 {

diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index bbb8a854e999502018243fa0fc75b25b4866fe49..66f4f59004cb9a100010f77187575f58bd6ee4f9 100644 (file)
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -210,6 +210,44 @@ badsb:
        return (0);
 }
 
+/*
+ * Open a device or file to be checked by fsck.
+ */
+int
+openfilesys(char *dev)
+{
+       struct stat statb;
+       int saved_fsreadfd;
+
+       if (stat(dev, &statb) < 0) {
+               pfatal("CANNOT STAT %s: %s\n", dev, strerror(errno));
+               return (0);
+       }
+       if ((statb.st_mode & S_IFMT) != S_IFCHR &&
+           (statb.st_mode & S_IFMT) != S_IFBLK) {
+               if (bkgrdflag != 0 && (statb.st_flags & SF_SNAPSHOT) == 0) {
+                       pfatal("BACKGROUND FSCK LACKS A SNAPSHOT\n");
+                       exit(EEXIT);
+               }
+               if (bkgrdflag != 0) {
+                       cursnapshot = statb.st_ino;
+               } else {
+                       pfatal("%s IS NOT A DISK DEVICE\n", dev);
+                       if (reply("CONTINUE") == 0)
+                               return (0);
+               }
+       }
+       saved_fsreadfd = fsreadfd;
+       if ((fsreadfd = open(dev, O_RDONLY)) < 0) {
+               fsreadfd = saved_fsreadfd;
+               pfatal("CANNOT OPEN %s: %s\n", dev, strerror(errno));
+               return (0);
+       }
+       if (saved_fsreadfd != -1)
+               close(saved_fsreadfd);
+       return (1);
+}
+
 /*
  * Read in the super block and its summary info.
  */
@@ -331,6 +369,7 @@ void
 sblock_init(void)
 {
 
+       fsreadfd = -1;
        fswritefd = -1;
        fsmodified = 0;
        lfdir = 0;

diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 785aeb2b5a750dc39d5e69004de29b2e58f75ceb..c935f88952b4ff3575acbff939a25523e154725f 100644 (file)
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -111,7 +111,7 @@ main(int argc, char *argv[])
                fsys = argv[0];
 
        sblock_init();
-       if (!setup(fsys))
+       if (openfilesys(fsys) == 0 || readsb(0) == 0 || setup(fsys) == 0)
                errx(1, "cannot set up file system `%s'", fsys);
        if (fswritefd < 0)
                nflag++;