vfsck: Fix roken fallout

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

diff --git a/src/vfsck/dir.c b/src/vfsck/dir.c
index d9e54d4..fb65744 100644 (file)
--- a/src/vfsck/dir.c
+++ b/src/vfsck/dir.c
@@ -18,15 +18,27 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
+#ifdef AFS_HPUX_ENV
+/* We need the old directory type headers (included below), so don't include
+ * the normal dirent.h, or it will conflict. */
+# undef HAVE_DIRENT_H
+# include <sys/inode.h>
+# define       LONGFILENAMES   1
+# include <sys/sysmacros.h>
+# include <sys/ino.h>
+# define       DIRSIZ_MACRO
+# ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
+#  include </usr/old/usr/include/ndir.h>
+# else
+#  include <ndir.h>
+# endif
+#endif
 
-#define VICE                   /* allow us to put our changes in at will */
-#include <stdio.h>
+#include <roken.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
+#include <ctype.h>
+
+#define VICE                   /* allow us to put our changes in at will */
 
 #ifdef AFS_OSF_ENV
 #include <sys/vnode.h>
@@ -58,14 +70,7 @@ RCSID
 
 #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>
-#define        DIRSIZ_MACRO
-#include <ndir.h>
-#else
+#ifndef        AFS_HPUX_ENV
 #define KERNEL
 #include <sys/dir.h>
 #undef KERNEL
@@ -114,15 +119,15 @@ descend(parentino, inumber)
      struct inodesc *parentino;
      ino_t inumber;
 {
-    register struct dinode *dp;
+    struct dinode *dp;
     struct inodesc curino;
 
-    memset((char *)&curino, 0, sizeof(struct inodesc));
+    memset(&curino, 0, sizeof(struct inodesc));
     if (statemap[inumber] != DSTATE)
        errexit("BAD INODE %d TO DESCEND", statemap[inumber]);
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-    /* 
-     * keep any continuation inode information 
+    /*
+     * keep any continuation inode information
      */
     if (statemap[inumber] & HASCINODE)
        statemap[inumber] = HASCINODE | DFOUND;
@@ -136,8 +141,8 @@ descend(parentino, inumber)
        direrror(inumber, "ZERO LENGTH DIRECTORY");
        if (reply("REMOVE") == 1)
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-           /* 
-            * keep any continuation inode information 
+           /*
+            * keep any continuation inode information
             */
            if (statemap[inumber] & HASCINODE)
                statemap[inumber] = HASCINODE | DCLEAR;
@@ -181,10 +186,10 @@ descend(parentino, inumber)
 }
 
 dirscan(idesc)
-     register struct inodesc *idesc;
+     struct inodesc *idesc;
 {
-    register struct direct *dp;
-    register struct bufarea *bp;
+    struct direct *dp;
+    struct bufarea *bp;
     int dsize, n;
     long blksiz;
     char dbuf[DIRBLKSIZ];
@@ -221,10 +226,10 @@ dirscan(idesc)
  */
 struct direct *
 fsck_readdir(idesc)
-     register struct inodesc *idesc;
+     struct inodesc *idesc;
 {
-    register struct direct *dp, *ndp;
-    register struct bufarea *bp;
+    struct direct *dp, *ndp;
+    struct bufarea *bp;
     long size, blksiz;
 
     blksiz = idesc->id_numfrags * sblock.fs_fsize;
@@ -272,10 +277,10 @@ fsck_readdir(idesc)
  */
 dircheck(idesc, dp)
      struct inodesc *idesc;
-     register struct direct *dp;
+     struct direct *dp;
 {
-    register int size;
-    register char *cp;
+    int size;
+    char *cp;
     int spaceleft;
 
     size = DIRSIZ(dp);
@@ -306,7 +311,7 @@ direrror(ino, errmesg)
      ino_t ino;
      char *errmesg;
 {
-    register struct dinode *dp;
+    struct dinode *dp;
 
     pwarn("%s ", errmesg);
     pinode(ino);
@@ -324,10 +329,10 @@ direrror(ino, errmesg)
 }
 
 adjust(idesc, lcnt)
-     register struct inodesc *idesc;
+     struct inodesc *idesc;
      short lcnt;
 {
-    register struct dinode *dp;
+    struct dinode *dp;
 
     dp = ginode(idesc->id_number);
     if (dp->di_nlink == lcnt) {
@@ -357,7 +362,7 @@ adjust(idesc, lcnt)
 mkentry(idesc)
      struct inodesc *idesc;
 {
-    register struct direct *dirp = idesc->id_dirp;
+    struct direct *dirp = idesc->id_dirp;
     struct direct newent;
     int newlen, oldlen;
 
@@ -382,7 +387,7 @@ mkentry(idesc)
 chgino(idesc)
      struct inodesc *idesc;
 {
-    register struct direct *dirp = idesc->id_dirp;
+    struct direct *dirp = idesc->id_dirp;
 
     if (memcmp(dirp->d_name, idesc->id_name, (int)dirp->d_namlen + 1))
        return (KEEPON);
@@ -394,14 +399,14 @@ linkup(orphan, parentdir)
      ino_t orphan;
      ino_t parentdir;
 {
-    register struct dinode *dp;
+    struct dinode *dp;
     int lostdir, len;
     ino_t oldlfdir;
     struct inodesc idesc;
     char tempname[BUFSIZ];
     extern int pass4check();
 
-    memset((char *)&idesc, 0, sizeof(struct inodesc));
+    memset(&idesc, 0, sizeof(struct inodesc));
     dp = ginode(orphan);
     lostdir = (dp->di_mode & IFMT) == IFDIR;
     pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");
@@ -524,7 +529,7 @@ makeentry(parent, ino, name)
     if (parent < ROOTINO || parent >= maxino || ino < ROOTINO
        || ino >= maxino)
        return (0);
-    memset((char *)&idesc, 0, sizeof(struct inodesc));
+    memset(&idesc, 0, sizeof(struct inodesc));
     idesc.id_type = DATA;
     idesc.id_func = mkentry;
     idesc.id_number = parent;
@@ -547,10 +552,10 @@ makeentry(parent, ino, name)
  * Attempt to expand the size of a directory
  */
 expanddir(dp)
-     register struct dinode *dp;
+     struct dinode *dp;
 {
     daddr_t lastbn, newblk;
-    register struct bufarea *bp;
+    struct bufarea *bp;
     char *cp, firstblk[DIRBLKSIZ];
 
     lastbn = lblkno(&sblock, dp->di_size);
@@ -605,7 +610,7 @@ allocdir(parent, request, mode)
     ino_t ino;
     char *cp;
     struct dinode *dp;
-    register struct bufarea *bp;
+    struct bufarea *bp;
 
     ino = allocino(request, IFDIR | mode);
     dirhead.dot_ino = ino;
@@ -682,8 +687,8 @@ lftempname(bufp, ino)
      char *bufp;
      ino_t ino;
 {
-    register ino_t in;
-    register char *cp;
+    ino_t in;
+    char *cp;
     int namlen;
 
     cp = bufp + 2;