X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fvfsck%2Finode.c;h=f4944611218b62e27ee8b96f80be25ba9c98bf11;hp=30c60dc8304290919592fba8a39d6b6b478a75c8;hb=6534b10a4180ec10bceebbc11405718e7969fa21;hpb=4a531cb7069f3ced1aae5a1948d708a7f24539df

diff --git a/src/vfsck/inode.c b/src/vfsck/inode.c
index 30c60dc..f494461 100644
--- a/src/vfsck/inode.c
+++ b/src/vfsck/inode.c
@@ -18,24 +18,28 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#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			/* control whether AFS changes are present */
-#include <stdio.h>
+#include <roken.h>
 
-#include <sys/time.h>
-#include <sys/param.h>
+#include <ctype.h>
+
+#define VICE			/* control whether AFS changes are present */
 
-#ifdef	AFS_OSF_ENV
-#include <sys/mount.h>
-#include <sys/vnode.h>
-#include <ufs/inode.h>
-#include <ufs/fs.h>
-#define	_BSD
-#define	_KERNEL
-#include <ufs/dir.h>
-#undef	_KERNEL
-#undef	_BSD
-#else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #define VFS
 #include <sys/vnode.h>
@@ -54,26 +58,13 @@
 #endif
 #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
-#ifdef HAVE_USR_OLD_USR_INCLUDE_NDIR_H
-#include </usr/old/usr/include/ndir.h>
-#else
-#include <ndir.h>
-#endif
-#else
+#ifndef	AFS_HPUX_ENV
 #include <sys/dir.h>
 #endif
 #include <sys/fs.h>
 #endif /* AFS_VFSINCL_ENV */
-#endif /* AFS_OSF_ENV */
 
 #include <afs/osi_inode.h>
-#include <pwd.h>
 #include "fsck.h"
 
 #ifdef AFS_SUN_ENV
@@ -106,24 +97,9 @@ ckinode(dp, idesc)
     idesc->id_filesize = dp->di_size;
     if ((dp->di_mode & IFMT) == IFBLK || (dp->di_mode & IFMT) == IFCHR)
 	return (KEEPON);
-#ifdef	AFS_OSF_ENV
-    if ((dp->di_flags & IC_FASTLINK) != 0) {
-	return (KEEPON);
-    }
-#endif /* AFS_OSF_ENV */
     dino = *dp;
     ndb = howmany(dino.di_size, (UOFF_T) sblock.fs_bsize);
     ap = &dino.di_db[0];
-#ifdef AFS_OSF_ENV
-    /*
-     * Check property lists on pass1
-     */
-    if (idesc->id_func == pass1check && dino.di_flags & IC_PROPLIST && *ap) {
-	ret = proplist_scan(dp, idesc);
-	if (ret & STOP)
-	    return (ret);
-    }
-#endif /* AFS_OSF_ENV */
     for (; ap < &dino.di_db[NDADDR]; ap++) {
 	if (--ndb == 0 && (offset = blkoff(&sblock, dino.di_size)) != 0)
 	    idesc->id_numfrags =
@@ -141,7 +117,7 @@ ckinode(dp, idesc)
 	    return (ret);
     }
     idesc->id_numfrags = sblock.fs_frag;
-#if	defined(AFS_SUN56_ENV)
+#if	defined(AFS_SUN5_ENV)
     /*
      * indir_data_blks determine the no. of data blocks
      * in the previous levels. ie., at level 3 it
@@ -208,7 +184,7 @@ iblock(idesc, ilevel, isize)
 	return (SKIP);
     bp = getdatablk(idesc->id_blkno, sblock.fs_bsize);
     ilevel--;
-#if	defined(AFS_SUN56_ENV)
+#if	defined(AFS_SUN5_ENV)
     for (sizepb = 1, i = 0; i < ilevel; i++) {
 	sizepb *= (u_offset_t) NINDIR(&sblock);
     }
@@ -266,7 +242,7 @@ iblock(idesc, ilevel, isize)
 	if (*ap) {
 	    idesc->id_blkno = *ap;
 	    if (ilevel > 0) {
-#if	defined(AFS_SUN56_ENV)
+#if	defined(AFS_SUN5_ENV)
 		n = iblock(idesc, ilevel, isize);
 		/*
 		 * each iteration decrease "remaining block
@@ -351,9 +327,9 @@ inocleanup()
     if (inphead == NULL)
 	return;
     for (inpp = &inpsort[inplast - 1]; inpp >= inpsort; inpp--)
-	free((char *)(*inpp));
-    free((char *)inphead);
-    free((char *)inpsort);
+	free(*inpp);
+    free(inphead);
+    free(inpsort);
     inphead = inpsort = NULL;
 }
 #endif
@@ -394,8 +370,8 @@ clri(idesc, type, flag)
 	    n_files--;
 
 	/*
-	 * If there is a CI associated with this inode, we must 
-	 * clear it as well.  
+	 * If there is a CI associated with this inode, we must
+	 * clear it as well.
 	 */
 	if (statemap[idesc->id_number] & HASCINODE) {
 	    if (!(dp->di_contin < ROOTINO || dp->di_contin > maxino))
@@ -490,7 +466,7 @@ pinode(ino)
     printf("MODE=%o\n", dp->di_mode);
     if (preen)
 	printf("%s: ", devname);
-#if	defined(AFS_SUN56_ENV)
+#if	defined(AFS_SUN5_ENV)
     printf("SIZE=%" AFS_INT64_FMT " ", dp->di_size);
 #else
     printf("SIZE=%ld ", dp->di_size);
@@ -515,7 +491,7 @@ blkerror(ino, type, blk)
 #endif /* VICE */
     case FSTATE:
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-	/* 
+	/*
 	 *  Keep the continuation inode info
 	 */
 	if (statemap[ino] & HASCINODE)
@@ -529,7 +505,7 @@ blkerror(ino, type, blk)
 
     case DSTATE:
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-	/* 
+	/*
 	 *  Keep the continuation inode info
 	 */
 	if (statemap[ino] & HASCINODE)