BSD 4_4_Lite1 release

[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 a803497..f1c1758 100644 (file)
--- a/usr/src/sbin/fsck/inode.c
+++ b/usr/src/sbin/fsck/inode.c
@@ -1,12 +1,38 @@
 /*
 /*

- * Copyright (c) 1980, 1986 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1986, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)inode.c    5.23 (Berkeley) %G%";
+static char sccsid[] = "@(#)inode.c    8.4 (Berkeley) 4/18/94";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -29,12 +55,15 @@ ckinode(dp, idesc)
        long ret, n, ndb, offset;
        struct dinode dino;
        quad_t remsize, sizepb;
        long ret, n, ndb, offset;
        struct dinode dino;
        quad_t remsize, sizepb;

+       mode_t mode;

 
        if (idesc->id_fix != IGNORE)
                idesc->id_fix = DONTKNOW;
        idesc->id_entryno = 0;
        idesc->id_filesize = dp->di_size;
 
        if (idesc->id_fix != IGNORE)
                idesc->id_fix = DONTKNOW;
        idesc->id_entryno = 0;
        idesc->id_filesize = dp->di_size;

-       if ((dp->di_mode & IFMT) == IFBLK || (dp->di_mode & IFMT) == IFCHR)
+       mode = dp->di_mode & IFMT;
+       if (mode == IFBLK || mode == IFCHR || (mode == IFLNK &&
+           dp->di_size < sblock.fs_maxsymlinklen))

                return (KEEPON);
        dino = *dp;
        ndb = howmany(dino.di_size, sblock.fs_bsize);
                return (KEEPON);
        dino = *dp;
        ndb = howmany(dino.di_size, sblock.fs_bsize);


@@ -116,17 +145,16 @@ iblock(idesc, ilevel, isize)
        for (ap = bp->b_un.b_indir; ap < aplim; ap++) {
                if (*ap) {
                        idesc->id_blkno = *ap;
        for (ap = bp->b_un.b_indir; ap < aplim; ap++) {
                if (*ap) {
                        idesc->id_blkno = *ap;

-                       if (ilevel == 0) {
+                       if (ilevel == 0)

                                n = (*func)(idesc);
                                n = (*func)(idesc);

-                       } else {
+                       else

                                n = iblock(idesc, ilevel, isize);
                                n = iblock(idesc, ilevel, isize);

-                               isize -= sizepb;
-                       }

                        if (n & STOP) {
                                bp->b_flags &= ~B_INUSE;
                                return (n);
                        }
                }
                        if (n & STOP) {
                                bp->b_flags &= ~B_INUSE;
                                return (n);
                        }
                }

+               isize -= sizepb;

        }
        bp->b_flags &= ~B_INUSE;
        return (KEEPON);
        }
        bp->b_flags &= ~B_INUSE;
        return (KEEPON);


@@ -182,7 +210,7 @@ ginode(inumber)
                errexit("bad inode number %d to ginode\n", inumber);
        if (startinum == 0 ||
            inumber < startinum || inumber >= startinum + INOPB(&sblock)) {
                errexit("bad inode number %d to ginode\n", inumber);
        if (startinum == 0 ||
            inumber < startinum || inumber >= startinum + INOPB(&sblock)) {

-               iblk = itod(&sblock, inumber);
+               iblk = ino_to_fsba(&sblock, inumber);

                if (pbp != 0)
                        pbp->b_flags &= ~B_INUSE;
                pbp = getdatablk(iblk, sblock.fs_bsize);
                if (pbp != 0)
                        pbp->b_flags &= ~B_INUSE;
                pbp = getdatablk(iblk, sblock.fs_bsize);


@@ -211,7 +239,7 @@ getnextinode(inumber)
                errexit("bad inode number %d to nextinode\n", inumber);
        if (inumber >= lastinum) {
                readcnt++;
                errexit("bad inode number %d to nextinode\n", inumber);
        if (inumber >= lastinum) {
                readcnt++;

-               dblk = fsbtodb(&sblock, itod(&sblock, lastinum));
+               dblk = fsbtodb(&sblock, ino_to_fsba(&sblock, lastinum));

                if (readcnt % readpercg == 0) {
                        size = partialsize;
                        lastinum += partialcnt;
                if (readcnt % readpercg == 0) {
                        size = partialsize;
                        lastinum += partialcnt;


@@ -409,7 +437,7 @@ pinode(ino)
                printf("%u ", (unsigned)dp->di_uid);
        printf("MODE=%o\n", dp->di_mode);
        if (preen)
                printf("%u ", (unsigned)dp->di_uid);
        printf("MODE=%o\n", dp->di_mode);
        if (preen)

-               printf("%s: ", devname);
+               printf("%s: ", cdevname);

        printf("SIZE=%qu ", dp->di_size);
        p = ctime(&dp->di_mtime.ts_sec);
        printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);
        printf("SIZE=%qu ", dp->di_size);
        p = ctime(&dp->di_mtime.ts_sec);
        printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);


@@ -487,6 +515,8 @@ allocino(request, type)
        dp->di_blocks = btodb(sblock.fs_fsize);
        n_files++;
        inodirty();
        dp->di_blocks = btodb(sblock.fs_fsize);
        n_files++;
        inodirty();

+       if (newinofmt)
+               typemap[ino] = IFTODT(type);

        return (ino);
 }
 
        return (ino);
 }