get rid of redundant status check (from Torek)

SCCS-vsn: sbin/fsck/main.c 5.13

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index f62d766..56bd5c1 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -11,7 +11,7 @@ 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.13 (Berkeley) %G%";

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


@@ -167,10 +167,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 +181,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;