vfsck: Fix roken fallout

[openafs.git] / src / vfsck / pass3.c

diff --git a/src/vfsck/pass3.c b/src/vfsck/pass3.c
index cf1abb8..655deb4 100644 (file)
--- a/src/vfsck/pass3.c
+++ b/src/vfsck/pass3.c
@@ -18,11 +18,11 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID("$Header$");
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
 
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
@@ -34,13 +34,10 @@ RCSID("$Header$");
 #include <ufs/dir.h>
 #undef _KERNEL
 #undef _BSD
-#include <stdio.h>
-#else  /* AFS_OSF_ENV */
+#else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -54,91 +51,85 @@ RCSID("$Header$");
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #endif
 #include <sys/fs.h>
 #endif /* AFS_VFSINCL_ENV */
-#endif /* AFS_OSF_ENV */
+#endif /* AFS_OSF_ENV */
 
 #include <afs/osi_inode.h>
 #include "fsck.h"
 
-int    pass2check();
+int pass2check();
 
 pass3()
 {
-       register struct dinode *dp;
-       struct inodesc idesc;
-       ino_t inumber, orphan;
-       int loopcnt;
+    struct dinode *dp;
+    struct inodesc idesc;
+    ino_t inumber, orphan;
+    int loopcnt;
 
-       bzero((char *)&idesc, sizeof(struct inodesc));
-       idesc.id_type = DATA;
-       for (inumber = ROOTINO; inumber <= lastino; inumber++) {
+    memset(&idesc, 0, sizeof(struct inodesc));
+    idesc.id_type = DATA;
+    for (inumber = ROOTINO; inumber <= lastino; inumber++) {
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-               if (statemap[inumber] & HASCINODE) {
-                   if ((dp = ginode(inumber)) == NULL)
-                       break;
-                   /* 
-                    * Make sure di_contin is not out of range and then
-                    * check and make sure that the inode #di_contin
-                    * is a continuation inode that has not already been
-                    * referenced.
-                    */
-                   if ((dp->di_contin < ROOTINO || dp->di_contin > maxino) ||
-                       ((statemap[dp->di_contin] & STATE) != CSTATE))
-                   {
-                       /*  this is an error which must be cleared by hand. */
-                       pfatal("BAD CONTINUATION INODE NUMBER ");
-#ifdef VICE
-                       vprintf(" I=%u ", inumber);
-#else
-                       printf(" I=%u ", inumber);
-#endif /* VICE */
-                       if (reply("CLEAR") == 1) {
-                               dp->di_contin = 0;
-                               inodirty();
-                       }
-                   } else {
-                       statemap[dp->di_contin] = CRSTATE;
-                   }
+       if (statemap[inumber] & HASCINODE) {
+           if ((dp = ginode(inumber)) == NULL)
+               break;
+           /*
+            * Make sure di_contin is not out of range and then
+            * check and make sure that the inode #di_contin
+            * is a continuation inode that has not already been
+            * referenced.
+            */
+           if ((dp->di_contin < ROOTINO || dp->di_contin > maxino)
+               || ((statemap[dp->di_contin] & STATE) != CSTATE)) {
+               /*  this is an error which must be cleared by hand. */
+               pfatal("BAD CONTINUATION INODE NUMBER ");
+               printf(" I=%u ", inumber);
+               if (reply("CLEAR") == 1) {
+                   dp->di_contin = 0;
+                   inodirty();
                }
-               if ((statemap[inumber] & STATE) == DSTATE) {
+           } else {
+               statemap[dp->di_contin] = CRSTATE;
+           }
+       }
+       if ((statemap[inumber] & STATE) == DSTATE) {
 #else /* no ACLS */
-               if (statemap[inumber] == DSTATE) {
+       if (statemap[inumber] == DSTATE) {
 #endif /* ACLS */
-                       pathp = pathname;
-                       *pathp++ = '?';
-                       *pathp = '\0';
-                       idesc.id_func = findino;
-                       idesc.id_name = "..";
-                       idesc.id_parent = inumber;
-                       loopcnt = 0;
-                       do {
-                               orphan = idesc.id_parent;
-                               if (orphan < ROOTINO || orphan > maxino)
-                                       break;
-                               dp = ginode(orphan);
-                               idesc.id_parent = 0;
-                               idesc.id_number = orphan;
-                               if ((ckinode(dp, &idesc) & FOUND) == 0)
-                                       break;
-                               if (loopcnt >= sblock.fs_cstotal.cs_ndir)
-                                       break;
-                               loopcnt++;
+           pathp = pathname;
+           *pathp++ = '?';
+           *pathp = '\0';
+           idesc.id_func = findino;
+           idesc.id_name = "..";
+           idesc.id_parent = inumber;
+           loopcnt = 0;
+           do {
+               orphan = idesc.id_parent;
+               if (orphan < ROOTINO || orphan > maxino)
+                   break;
+               dp = ginode(orphan);
+               idesc.id_parent = 0;
+               idesc.id_number = orphan;
+               if ((ckinode(dp, &idesc) & FOUND) == 0)
+                   break;
+               if (loopcnt >= sblock.fs_cstotal.cs_ndir)
+                   break;
+               loopcnt++;
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-                       } while ((statemap[idesc.id_parent] & STATE) == DSTATE);
+           } while ((statemap[idesc.id_parent] & STATE) == DSTATE);
 #else /* no ACLS */
-                       } while (statemap[idesc.id_parent] == DSTATE);
+           } while (statemap[idesc.id_parent] == DSTATE);
 #endif /* ACLS */
-                       if (linkup(orphan, idesc.id_parent) == 1) {
-                               idesc.id_func = pass2check;
-                               idesc.id_number = lfdir;
-                               descend(&idesc, orphan);
-                       }
-               }
+           if (linkup(orphan, idesc.id_parent) == 1) {
+               idesc.id_func = pass2check;
+               idesc.id_number = lfdir;
+               descend(&idesc, orphan);
+           }
        }
+    }
 }