make ANSI C compatible

[unix-history] / usr / src / sbin / fsck / inode.c

diff --git a/usr/src/sbin/fsck/inode.c b/usr/src/sbin/fsck/inode.c
index af9ed85..e09195e 100644 (file)
--- a/usr/src/sbin/fsck/inode.c
+++ b/usr/src/sbin/fsck/inode.c
@@ -1,7 +1,14 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+

 #ifndef lint
 #ifndef lint

-static char version[] = "@(#)inode.c   3.8 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)inode.c    5.5 (Berkeley) %G%";
+#endif not lint

 
 

+#include <pwd.h>

 #include <sys/param.h>
 #include <sys/inode.h>
 #include <sys/fs.h>
 #include <sys/param.h>
 #include <sys/inode.h>
 #include <sys/fs.h>


@@ -16,12 +23,12 @@ ckinode(dp, idesc)
        int ret, n, ndb, offset;
        DINODE dino;
 
        int ret, n, ndb, offset;
        DINODE dino;
 

-       if (SPECIAL(dp))
-               return (KEEPON);
-       dino = *dp;

        idesc->id_fix = DONTKNOW;
        idesc->id_entryno = 0;
        idesc->id_filesize = dp->di_size;
        idesc->id_fix = DONTKNOW;
        idesc->id_entryno = 0;
        idesc->id_filesize = dp->di_size;

+       if (SPECIAL(dp))
+               return (KEEPON);
+       dino = *dp;

        ndb = howmany(dino.di_size, sblock.fs_bsize);
        for (ap = &dino.di_db[0]; ap < &dino.di_db[NDADDR]; ap++) {
                if (--ndb == 0 && (offset = blkoff(&sblock, dino.di_size)) != 0)
        ndb = howmany(dino.di_size, sblock.fs_bsize);
        for (ap = &dino.di_db[0]; ap < &dino.di_db[NDADDR]; ap++) {
                if (--ndb == 0 && (offset = blkoff(&sblock, dino.di_size)) != 0)


@@ -61,7 +68,8 @@ iblock(idesc, ilevel, isize)
        register daddr_t *aplim;
        int i, n, (*func)(), nif, sizepb;
        BUFAREA ib;
        register daddr_t *aplim;
        int i, n, (*func)(), nif, sizepb;
        BUFAREA ib;

-       extern int pass1check();
+       char buf[BUFSIZ];
+       extern int dirscan(), pass1check();

 
        if (idesc->id_type == ADDR) {
                func = idesc->id_func;
 
        if (idesc->id_type == ADDR) {
                func = idesc->id_func;


@@ -72,8 +80,7 @@ iblock(idesc, ilevel, isize)
        if (outrange(idesc->id_blkno, idesc->id_numfrags)) /* protect thyself */
                return (SKIP);
        initbarea(&ib);
        if (outrange(idesc->id_blkno, idesc->id_numfrags)) /* protect thyself */
                return (SKIP);
        initbarea(&ib);

-       if (getblk(&ib, idesc->id_blkno, sblock.fs_bsize) == NULL)
-               return (SKIP);
+       getblk(&ib, idesc->id_blkno, sblock.fs_bsize);

        ilevel--;
        for (sizepb = sblock.fs_bsize, i = 0; i < ilevel; i++)
                sizepb *= NINDIR(&sblock);
        ilevel--;
        for (sizepb = sblock.fs_bsize, i = 0; i < ilevel; i++)
                sizepb *= NINDIR(&sblock);


@@ -85,7 +92,9 @@ iblock(idesc, ilevel, isize)
                for (ap = &ib.b_un.b_indir[nif]; ap < aplim; ap++) {
                        if (*ap == 0)
                                continue;
                for (ap = &ib.b_un.b_indir[nif]; ap < aplim; ap++) {
                        if (*ap == 0)
                                continue;

-                       if (dofix(idesc, "PARTIALLY TRUNCATED INODE")) {
+                       (void)sprintf(buf, "PARTIALLY TRUNCATED INODE I=%d",
+                               idesc->id_number);
+                       if (dofix(idesc, buf)) {

                                *ap = 0;
                                dirty(&ib);
                        }
                                *ap = 0;
                                dirty(&ib);
                        }


@@ -146,15 +155,12 @@ ginode(inumber)
        daddr_t iblk;
        static ino_t startinum = 0;     /* blk num of first in raw area */
 
        daddr_t iblk;
        static ino_t startinum = 0;     /* blk num of first in raw area */
 

-

        if (inumber < ROOTINO || inumber > imax)
                errexit("bad inode number %d to ginode\n", inumber);
        if (startinum == 0 ||
            inumber < startinum || inumber >= startinum + INOPB(&sblock)) {
                iblk = itod(&sblock, inumber);
        if (inumber < ROOTINO || inumber > imax)
                errexit("bad inode number %d to ginode\n", inumber);
        if (startinum == 0 ||
            inumber < startinum || inumber >= startinum + INOPB(&sblock)) {
                iblk = itod(&sblock, inumber);

-               if (getblk(&inoblk, iblk, sblock.fs_bsize) == NULL) {
-                       return (NULL);
-               }
+               getblk(&inoblk, iblk, sblock.fs_bsize);

                startinum = (inumber / INOPB(&sblock)) * INOPB(&sblock);
        }
        return (&inoblk.b_un.b_dinode[inumber % INOPB(&sblock)]);
                startinum = (inumber / INOPB(&sblock)) * INOPB(&sblock);
        }
        return (&inoblk.b_un.b_dinode[inumber % INOPB(&sblock)]);


@@ -191,7 +197,7 @@ findname(idesc)
        if (dirp->d_ino != idesc->id_parent)
                return (KEEPON);
        bcopy(dirp->d_name, idesc->id_name, dirp->d_namlen + 1);
        if (dirp->d_ino != idesc->id_parent)
                return (KEEPON);
        bcopy(dirp->d_name, idesc->id_name, dirp->d_namlen + 1);

-       return (STOP);
+       return (STOP|FOUND);

 }
 
 findino(idesc)
 }
 
 findino(idesc)


@@ -204,7 +210,7 @@ findino(idesc)
        if (strcmp(dirp->d_name, idesc->id_name) == 0 &&
            dirp->d_ino >= ROOTINO && dirp->d_ino <= imax) {
                idesc->id_parent = dirp->d_ino;
        if (strcmp(dirp->d_name, idesc->id_name) == 0 &&
            dirp->d_ino >= ROOTINO && dirp->d_ino <= imax) {
                idesc->id_parent = dirp->d_ino;

-               return (STOP);
+               return (STOP|FOUND);

        }
        return (KEEPON);
 }
        }
        return (KEEPON);
 }


@@ -214,7 +220,7 @@ pinode(ino)
 {
        register DINODE *dp;
        register char *p;
 {
        register DINODE *dp;
        register char *p;

-       char uidbuf[BUFSIZ];
+       struct passwd *pw;

        char *ctime();
 
        printf(" I=%u ", ino);
        char *ctime();
 
        printf(" I=%u ", ino);


@@ -222,14 +228,10 @@ pinode(ino)
                return;
        dp = ginode(ino);
        printf(" OWNER=");
                return;
        dp = ginode(ino);
        printf(" OWNER=");

-       if (getpw((int)dp->di_uid, uidbuf) == 0) {
-               for (p = uidbuf; *p != ':'; p++);
-               *p = 0;
-               printf("%s ", uidbuf);
-       }
-       else {
+       if ((pw = getpwuid((int)dp->di_uid)) != 0)
+               printf("%s ", pw->pw_name);
+       else

                printf("%d ", dp->di_uid);
                printf("%d ", dp->di_uid);

-       }

        printf("MODE=%o\n", dp->di_mode);
        if (preen)
                printf("%s: ", devname);
        printf("MODE=%o\n", dp->di_mode);
        if (preen)
                printf("%s: ", devname);