#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 /* 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>
#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
ckinode(dp, idesc)
struct dinode *dp;
- register struct inodesc *idesc;
+ struct inodesc *idesc;
{
- register daddr_t *ap;
+ daddr_t *ap;
long ret, n, ndb, offset;
struct dinode dino;
UOFF_T indir_data_blks;
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 =
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
iblock(idesc, ilevel, isize)
struct inodesc *idesc;
- register long ilevel;
+ long ilevel;
UOFF_T isize;
{
- register daddr_t *ap;
- register daddr_t *aplim;
+ daddr_t *ap;
+ daddr_t *aplim;
int i, n, (*func) ();
UOFF_T sizepb;
OFF_T nif;
- register struct bufarea *bp;
+ struct bufarea *bp;
char buf[BUFSIZ];
extern int dirscan(), pass1check();
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);
}
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
daddr_t blk;
int cnt;
{
- register int c;
+ int c;
if ((unsigned)(blk + cnt) > maxfsblock)
return (1);
#ifdef AFS_SUN5_ENVX
inocleanup()
{
- register struct inoinfo **inpp;
+ struct inoinfo **inpp;
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
}
clri(idesc, type, flag)
- register struct inodesc *idesc;
+ struct inodesc *idesc;
char *type;
int flag;
{
- register struct dinode *dp;
+ struct dinode *dp;
#if defined(ACLS) && defined(AFS_HPUX_ENV)
struct inodesc cidesc;
#endif /* ACLS */
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))
findname(idesc)
struct inodesc *idesc;
{
- register struct direct *dirp = idesc->id_dirp;
+ struct direct *dirp = idesc->id_dirp;
if (dirp->d_ino != idesc->id_parent)
return (KEEPON);
findino(idesc)
struct inodesc *idesc;
{
- register struct direct *dirp = idesc->id_dirp;
+ struct direct *dirp = idesc->id_dirp;
if (dirp->d_ino == 0)
return (KEEPON);
pinode(ino)
ino_t ino;
{
- register struct dinode *dp;
- register char *p;
+ struct dinode *dp;
+ char *p;
struct passwd *pw;
char *ctime();
+ time_t t;
printf(" I=%u ", ino);
if (ino < ROOTINO || ino > maxino)
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);
#endif
- p = ctime(&dp->di_mtime);
+ t = dp->di_mtime;
+ p = ctime(&t);
printf("MTIME=%12.12s %4.4s ", p + 4, p + 20);
}
#endif /* VICE */
case FSTATE:
#if defined(ACLS) && defined(AFS_HPUX_ENV)
- /*
+ /*
* Keep the continuation inode info
*/
if (statemap[ino] & HASCINODE)
case DSTATE:
#if defined(ACLS) && defined(AFS_HPUX_ENV)
- /*
+ /*
* Keep the continuation inode info
*/
if (statemap[ino] & HASCINODE)
ino_t request;
int type;
{
- register ino_t ino;
- register struct dinode *dp;
+ ino_t ino;
+ struct dinode *dp;
if (request == 0)
request = ROOTINO;
extern int pass4check();
struct dinode *dp;
- memset((char *)&idesc, 0, sizeof(struct inodesc));
+ memset(&idesc, 0, sizeof(struct inodesc));
idesc.id_type = ADDR;
idesc.id_func = pass4check;
idesc.id_number = ino;
git://git.openafs.org / openafs.git / blobdiff