no longer need to include time.h, vnode.h, and inode.h; just include dinode.h

[unix-history] / usr / src / sbin / fsck / main.c

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index f62d766..daf0c06 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -11,13 +11,11 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.15 (Berkeley) %G%";

 #endif not lint
 
 #include <sys/param.h>
 #endif not lint
 
 #include <sys/param.h>

-#include <sys/time.h>
-#include <sys/vnode.h>
-#include <ufs/inode.h>
+#include <ufs/dinode.h>

 #include <ufs/fs.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <ufs/fs.h>
 #include <sys/stat.h>
 #include <sys/wait.h>


@@ -27,9 +25,8 @@ static char sccsid[] = "@(#)main.c    5.12 (Berkeley) %G%";
 #include "fsck.h"
 
 char   *rawname(), *unrawname(), *blockcheck(), *malloc();
 #include "fsck.h"
 
 char   *rawname(), *unrawname(), *blockcheck(), *malloc();

-int    catch(), catchquit(), voidquit();
+void   catch(), catchquit(), voidquit();

 int    returntosingle;
 int    returntosingle;

-int    (*signal())();

 
 struct part {
        char    *name;                  /* device name */
 
 struct part {
        char    *name;                  /* device name */


@@ -167,10 +164,6 @@ main(argc, argv)
                        nextdisk = nextdisk->next;
                }
                while ((pid = wait(&status)) != -1) {
                        nextdisk = nextdisk->next;
                }
                while ((pid = wait(&status)) != -1) {

-                       if (status.w_termsig)
-                               sumstatus |= 8;
-                       else
-                               sumstatus |= status.w_retcode;

                        for (dk = disks; dk; dk = dk->next)
                                if (dk->pid == pid)
                                        break;
                        for (dk = disks; dk; dk = dk->next)
                                if (dk->pid == pid)
                                        break;


@@ -185,6 +178,7 @@ main(argc, argv)
                                status.w_retcode = 8;
                        }
                        if (status.w_retcode != 0) {
                                status.w_retcode = 8;
                        }
                        if (status.w_retcode != 0) {

+                               sumstatus |= status.w_retcode;

                                *badnext = dk->part;
                                badnext = &dk->part->next;
                                dk->part = dk->part->next;
                                *badnext = dk->part;
                                badnext = &dk->part->next;
                                dk->part = dk->part->next;