BSD 4_4_Lite2 release

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

diff --git a/usr/src/sbin/fsck/dir.c b/usr/src/sbin/fsck/dir.c
index 396a190..f9b8b63 100644 (file)
--- a/usr/src/sbin/fsck/dir.c
+++ b/usr/src/sbin/fsck/dir.c
@@ -1,102 +1,153 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1986, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * 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[] = "@(#)dir.c      5.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)dir.c      8.8 (Berkeley) 4/28/95";
+#endif /* not lint */

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

-#include <sys/inode.h>
-#include <sys/fs.h>
-#define KERNEL
-#include <sys/dir.h>
-#undef KERNEL
-#include "fsck.h"
+#include <sys/time.h>
+
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>

 
 

-#define MINDIRSIZE     (sizeof (struct dirtemplate))
+#include <err.h>
+#include <string.h>
+
+#include "fsck.h"

 
 

-char   *endpathname = &pathname[BUFSIZ - 2];

 char   *lfname = "lost+found";
 char   *lfname = "lost+found";

+int    lfmode = 01777;

 struct dirtemplate emptydir = { 0, DIRBLKSIZ };
 struct dirtemplate emptydir = { 0, DIRBLKSIZ };

-struct dirtemplate dirhead = { 0, 12, 1, ".", 0, DIRBLKSIZ - 12, 2, ".." };
-
-DIRECT *fsck_readdir();
+struct dirtemplate dirhead = {
+       0, 12, DT_DIR, 1, ".",
+       0, DIRBLKSIZ - 12, DT_DIR, 2, ".."
+};
+struct odirtemplate odirhead = {
+       0, 12, 1, ".",
+       0, DIRBLKSIZ - 12, 2, ".."
+};
+
+static int chgino __P((struct inodesc *));
+static int dircheck __P((struct inodesc *, struct direct *));
+static int expanddir __P((struct dinode *dp, char *name));
+static void freedir __P((ino_t ino, ino_t parent));
+static struct direct *fsck_readdir __P((struct inodesc *));
+static struct bufarea *getdirblk __P((ufs_daddr_t blkno, long size));
+static int lftempname __P((char *bufp, ino_t ino));
+static int mkentry __P((struct inodesc *));

 
 

-descend(parentino, inumber)
-       struct inodesc *parentino;
-       ino_t inumber;
+/*
+ * Propagate connected state through the tree.
+ */
+void
+propagate()

 {
 {

-       register DINODE *dp;
-       struct inodesc curino;
-
-       bzero((char *)&curino, sizeof(struct inodesc));
-       if (statemap[inumber] != DSTATE)
-               errexit("BAD INODE %d TO DESCEND", statemap[inumber]);
-       statemap[inumber] = DFOUND;
-       dp = ginode(inumber);
-       if (dp->di_size == 0) {
-               direrr(inumber, "ZERO LENGTH DIRECTORY");
-               if (reply("REMOVE") == 1)
-                       statemap[inumber] = DCLEAR;
-               return;
-       }
-       if (dp->di_size < MINDIRSIZE) {
-               direrr(inumber, "DIRECTORY TOO SHORT");
-               dp->di_size = MINDIRSIZE;
-               if (reply("FIX") == 1)
-                       inodirty();
-       }
-       if ((dp->di_size & (DIRBLKSIZ - 1)) != 0) {
-               pwarn("DIRECTORY %s: LENGTH %d NOT MULTIPLE OF %d",
-                       pathname, dp->di_size, DIRBLKSIZ);
-               dp->di_size = roundup(dp->di_size, DIRBLKSIZ);
-               if (preen)
-                       printf(" (ADJUSTED)\n");
-               if (preen || reply("ADJUST") == 1)
-                       inodirty();
-       }
-       curino.id_type = DATA;
-       curino.id_func = parentino->id_func;
-       curino.id_parent = parentino->id_number;
-       curino.id_number = inumber;
-       (void)ckinode(dp, &curino);
-       if (curino.id_entryno < 2) {
-               direrr(inumber, "NULL DIRECTORY");
-               if (reply("REMOVE") == 1)
-                       statemap[inumber] = DCLEAR;
-       }
+       register struct inoinfo **inpp, *inp;
+       struct inoinfo **inpend;
+       long change;
+
+       inpend = &inpsort[inplast];
+       do {
+               change = 0;
+               for (inpp = inpsort; inpp < inpend; inpp++) {
+                       inp = *inpp;
+                       if (inp->i_parent == 0)
+                               continue;
+                       if (statemap[inp->i_parent] == DFOUND &&
+                           statemap[inp->i_number] == DSTATE) {
+                               statemap[inp->i_number] = DFOUND;
+                               change++;
+                       }
+               }
+       } while (change > 0);

 }
 
 }
 

+/*
+ * Scan each entry in a directory block.
+ */
+int

 dirscan(idesc)
        register struct inodesc *idesc;
 {
 dirscan(idesc)
        register struct inodesc *idesc;
 {

-       register DIRECT *dp;
+       register struct direct *dp;
+       register struct bufarea *bp;

        int dsize, n;
        long blksiz;
        char dbuf[DIRBLKSIZ];
 
        if (idesc->id_type != DATA)
        int dsize, n;
        long blksiz;
        char dbuf[DIRBLKSIZ];
 
        if (idesc->id_type != DATA)

-               errexit("wrong type to dirscan %d\n", idesc->id_type);
+               errx(EEXIT, "wrong type to dirscan %d", idesc->id_type);

        if (idesc->id_entryno == 0 &&
            (idesc->id_filesize & (DIRBLKSIZ - 1)) != 0)
                idesc->id_filesize = roundup(idesc->id_filesize, DIRBLKSIZ);
        blksiz = idesc->id_numfrags * sblock.fs_fsize;
        if (idesc->id_entryno == 0 &&
            (idesc->id_filesize & (DIRBLKSIZ - 1)) != 0)
                idesc->id_filesize = roundup(idesc->id_filesize, DIRBLKSIZ);
        blksiz = idesc->id_numfrags * sblock.fs_fsize;

-       if (outrange(idesc->id_blkno, idesc->id_numfrags)) {
+       if (chkrange(idesc->id_blkno, idesc->id_numfrags)) {

                idesc->id_filesize -= blksiz;
                return (SKIP);
        }
        idesc->id_loc = 0;
        for (dp = fsck_readdir(idesc); dp != NULL; dp = fsck_readdir(idesc)) {
                dsize = dp->d_reclen;
                idesc->id_filesize -= blksiz;
                return (SKIP);
        }
        idesc->id_loc = 0;
        for (dp = fsck_readdir(idesc); dp != NULL; dp = fsck_readdir(idesc)) {
                dsize = dp->d_reclen;

-               bcopy((char *)dp, dbuf, dsize);
-               idesc->id_dirp = (DIRECT *)dbuf;
+               memmove(dbuf, dp, (size_t)dsize);
+#              if (BYTE_ORDER == LITTLE_ENDIAN)
+                       if (!newinofmt) {
+                               struct direct *tdp = (struct direct *)dbuf;
+                               u_char tmp;
+
+                               tmp = tdp->d_namlen;
+                               tdp->d_namlen = tdp->d_type;
+                               tdp->d_type = tmp;
+                       }
+#              endif
+               idesc->id_dirp = (struct direct *)dbuf;

                if ((n = (*idesc->id_func)(idesc)) & ALTERED) {
                if ((n = (*idesc->id_func)(idesc)) & ALTERED) {

-                       getblk(&fileblk, idesc->id_blkno, blksiz);
-                       bcopy(dbuf, (char *)dp, dsize);
-                       dirty(&fileblk);
+#                      if (BYTE_ORDER == LITTLE_ENDIAN)
+                               if (!newinofmt && !doinglevel2) {
+                                       struct direct *tdp;
+                                       u_char tmp;
+
+                                       tdp = (struct direct *)dbuf;
+                                       tmp = tdp->d_namlen;
+                                       tdp->d_namlen = tdp->d_type;
+                                       tdp->d_type = tmp;
+                               }
+#                      endif
+                       bp = getdirblk(idesc->id_blkno, blksiz);
+                       memmove(bp->b_un.b_buf + idesc->id_loc - dsize, dbuf,
+                           (size_t)dsize);
+                       dirty(bp);

                        sbdirty();
                }
                if (n & STOP) 
                        sbdirty();
                }
                if (n & STOP) 


@@ -108,47 +159,60 @@ dirscan(idesc)
 /*
  * get next entry in a directory.
  */
 /*
  * get next entry in a directory.
  */

-DIRECT *
+static struct direct *

 fsck_readdir(idesc)
        register struct inodesc *idesc;
 {
 fsck_readdir(idesc)
        register struct inodesc *idesc;
 {

-       register DIRECT *dp, *ndp;
-       long size, blksiz;
+       register struct direct *dp, *ndp;
+       register struct bufarea *bp;
+       long size, blksiz, fix, dploc;

 
        blksiz = idesc->id_numfrags * sblock.fs_fsize;
 
        blksiz = idesc->id_numfrags * sblock.fs_fsize;

-       getblk(&fileblk, idesc->id_blkno, blksiz);
+       bp = getdirblk(idesc->id_blkno, blksiz);

        if (idesc->id_loc % DIRBLKSIZ == 0 && idesc->id_filesize > 0 &&
            idesc->id_loc < blksiz) {
        if (idesc->id_loc % DIRBLKSIZ == 0 && idesc->id_filesize > 0 &&
            idesc->id_loc < blksiz) {

-               dp = (DIRECT *)(dirblk.b_buf + idesc->id_loc);
+               dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);

                if (dircheck(idesc, dp))
                        goto dpok;
                if (dircheck(idesc, dp))
                        goto dpok;

-               idesc->id_loc += DIRBLKSIZ;
-               idesc->id_filesize -= DIRBLKSIZ;
+               if (idesc->id_fix == IGNORE)
+                       return (0);
+               fix = dofix(idesc, "DIRECTORY CORRUPTED");
+               bp = getdirblk(idesc->id_blkno, blksiz);
+               dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);

                dp->d_reclen = DIRBLKSIZ;
                dp->d_ino = 0;
                dp->d_reclen = DIRBLKSIZ;
                dp->d_ino = 0;

+               dp->d_type = 0;

                dp->d_namlen = 0;
                dp->d_name[0] = '\0';
                dp->d_namlen = 0;
                dp->d_name[0] = '\0';

-               if (dofix(idesc, "DIRECTORY CORRUPTED"))
-                       dirty(&fileblk);
+               if (fix)
+                       dirty(bp);
+               idesc->id_loc += DIRBLKSIZ;
+               idesc->id_filesize -= DIRBLKSIZ;

                return (dp);
        }
 dpok:
        if (idesc->id_filesize <= 0 || idesc->id_loc >= blksiz)
                return NULL;
                return (dp);
        }
 dpok:
        if (idesc->id_filesize <= 0 || idesc->id_loc >= blksiz)
                return NULL;

-       dp = (DIRECT *)(dirblk.b_buf + idesc->id_loc);
+       dploc = idesc->id_loc;
+       dp = (struct direct *)(bp->b_un.b_buf + dploc);

        idesc->id_loc += dp->d_reclen;
        idesc->id_filesize -= dp->d_reclen;
        if ((idesc->id_loc % DIRBLKSIZ) == 0)
                return (dp);
        idesc->id_loc += dp->d_reclen;
        idesc->id_filesize -= dp->d_reclen;
        if ((idesc->id_loc % DIRBLKSIZ) == 0)
                return (dp);

-       ndp = (DIRECT *)(dirblk.b_buf + idesc->id_loc);
+       ndp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);

        if (idesc->id_loc < blksiz && idesc->id_filesize > 0 &&
            dircheck(idesc, ndp) == 0) {
                size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
        if (idesc->id_loc < blksiz && idesc->id_filesize > 0 &&
            dircheck(idesc, ndp) == 0) {
                size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);

-               dp->d_reclen += size;

                idesc->id_loc += size;
                idesc->id_filesize -= size;
                idesc->id_loc += size;
                idesc->id_filesize -= size;

-               if (dofix(idesc, "DIRECTORY CORRUPTED"))
-                       dirty(&fileblk);
+               if (idesc->id_fix == IGNORE)
+                       return (0);
+               fix = dofix(idesc, "DIRECTORY CORRUPTED");
+               bp = getdirblk(idesc->id_blkno, blksiz);
+               dp = (struct direct *)(bp->b_un.b_buf + dploc);
+               dp->d_reclen += size;
+               if (fix)
+                       dirty(bp);

        }
        return (dp);
 }
        }
        return (dp);
 }


@@ -157,59 +221,89 @@ dpok:
  * Verify that a directory entry is valid.
  * This is a superset of the checks made in the kernel.
  */
  * Verify that a directory entry is valid.
  * This is a superset of the checks made in the kernel.
  */

+static int

 dircheck(idesc, dp)
        struct inodesc *idesc;
 dircheck(idesc, dp)
        struct inodesc *idesc;

-       register DIRECT *dp;
+       register struct direct *dp;

 {
        register int size;
        register char *cp;
 {
        register int size;
        register char *cp;

+       u_char namlen, type;

        int spaceleft;
 
        int spaceleft;
 

-       size = DIRSIZ(dp);

        spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
        spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);

-       if (dp->d_ino < imax &&
-           dp->d_reclen != 0 &&
-           dp->d_reclen <= spaceleft &&
-           (dp->d_reclen & 0x3) == 0 &&
-           dp->d_reclen >= size &&
-           idesc->id_filesize >= size &&
-           dp->d_namlen <= MAXNAMLEN) {
-               if (dp->d_ino == 0)
-                       return (1);
-               for (cp = dp->d_name, size = 0; size < dp->d_namlen; size++)
-                       if (*cp == 0 || (*cp++ & 0200))
-                               return (0);
-               if (*cp == 0)
-                       return (1);
-       }
-       return (0);
+       if (dp->d_ino >= maxino ||
+           dp->d_reclen == 0 ||
+           dp->d_reclen > spaceleft ||
+           (dp->d_reclen & 0x3) != 0)
+               return (0);
+       if (dp->d_ino == 0)
+               return (1);
+       size = DIRSIZ(!newinofmt, dp);
+#      if (BYTE_ORDER == LITTLE_ENDIAN)
+               if (!newinofmt) {
+                       type = dp->d_namlen;
+                       namlen = dp->d_type;
+               } else {
+                       namlen = dp->d_namlen;
+                       type = dp->d_type;
+               }
+#      else
+               namlen = dp->d_namlen;
+               type = dp->d_type;
+#      endif
+       if (dp->d_reclen < size ||
+           idesc->id_filesize < size ||
+           namlen > MAXNAMLEN ||
+           type > 15)
+               return (0);
+       for (cp = dp->d_name, size = 0; size < namlen; size++)
+               if (*cp == '\0' || (*cp++ == '/'))
+                       return (0);
+       if (*cp != '\0')
+               return (0);
+       return (1);

 }
 
 }
 

-direrr(ino, s)
+void
+direrror(ino, errmesg)

        ino_t ino;
        ino_t ino;

-       char *s;
+       char *errmesg;

 {
 {

-       register DINODE *dp;

 
 

-       pwarn("%s ", s);
+       fileerror(ino, ino, errmesg);
+}
+
+void
+fileerror(cwd, ino, errmesg)
+       ino_t cwd, ino;
+       char *errmesg;
+{
+       register struct dinode *dp;
+       char pathbuf[MAXPATHLEN + 1];
+
+       pwarn("%s ", errmesg);

        pinode(ino);
        printf("\n");
        pinode(ino);
        printf("\n");

-       if (ino < ROOTINO || ino > imax) {
-               pfatal("NAME=%s\n", pathname);
+       getpathname(pathbuf, cwd, ino);
+       if (ino < ROOTINO || ino > maxino) {
+               pfatal("NAME=%s\n", pathbuf);

                return;
        }
        dp = ginode(ino);
        if (ftypeok(dp))
                return;
        }
        dp = ginode(ino);
        if (ftypeok(dp))

-               pfatal("%s=%s\n", DIRCT(dp) ? "DIR" : "FILE", pathname);
+               pfatal("%s=%s\n",
+                   (dp->di_mode & IFMT) == IFDIR ? "DIR" : "FILE", pathbuf);

        else
        else

-               pfatal("NAME=%s\n", pathname);
+               pfatal("NAME=%s\n", pathbuf);

 }
 
 }
 

+void

 adjust(idesc, lcnt)
        register struct inodesc *idesc;
 adjust(idesc, lcnt)
        register struct inodesc *idesc;

-       short lcnt;
+       int lcnt;

 {
 {

-       register DINODE *dp;
+       register struct dinode *dp;

 
        dp = ginode(idesc->id_number);
        if (dp->di_nlink == lcnt) {
 
        dp = ginode(idesc->id_number);
        if (dp->di_nlink == lcnt) {


@@ -217,10 +311,10 @@ adjust(idesc, lcnt)
                        clri(idesc, "UNREF", 0);
        } else {
                pwarn("LINK COUNT %s", (lfdir == idesc->id_number) ? lfname :
                        clri(idesc, "UNREF", 0);
        } else {
                pwarn("LINK COUNT %s", (lfdir == idesc->id_number) ? lfname :

-                       (DIRCT(dp) ? "DIR" : "FILE"));
+                       ((dp->di_mode & IFMT) == IFDIR ? "DIR" : "FILE"));

                pinode(idesc->id_number);
                printf(" COUNT %d SHOULD BE %d",
                pinode(idesc->id_number);
                printf(" COUNT %d SHOULD BE %d",

-                       dp->di_nlink, dp->di_nlink-lcnt);
+                       dp->di_nlink, dp->di_nlink - lcnt);

                if (preen) {
                        if (lcnt < 0) {
                                printf("\n");
                if (preen) {
                        if (lcnt < 0) {
                                printf("\n");


@@ -235,17 +329,18 @@ adjust(idesc, lcnt)
        }
 }
 
        }
 }
 

+static int

 mkentry(idesc)
        struct inodesc *idesc;
 {
 mkentry(idesc)
        struct inodesc *idesc;
 {

-       register DIRECT *dirp = idesc->id_dirp;
-       DIRECT newent;
+       register struct direct *dirp = idesc->id_dirp;
+       struct direct newent;

        int newlen, oldlen;
 
        int newlen, oldlen;
 

-       newent.d_namlen = 11;
-       newlen = DIRSIZ(&newent);
+       newent.d_namlen = strlen(idesc->id_name);
+       newlen = DIRSIZ(0, &newent);

        if (dirp->d_ino != 0)
        if (dirp->d_ino != 0)

-               oldlen = DIRSIZ(dirp);
+               oldlen = DIRSIZ(0, dirp);

        else
                oldlen = 0;
        if (dirp->d_reclen - oldlen < newlen)
        else
                oldlen = 0;
        if (dirp->d_reclen - oldlen < newlen)


@@ -255,36 +350,61 @@ mkentry(idesc)
        dirp = (struct direct *)(((char *)dirp) + oldlen);
        dirp->d_ino = idesc->id_parent; /* ino to be entered is in id_parent */
        dirp->d_reclen = newent.d_reclen;
        dirp = (struct direct *)(((char *)dirp) + oldlen);
        dirp->d_ino = idesc->id_parent; /* ino to be entered is in id_parent */
        dirp->d_reclen = newent.d_reclen;

-       dirp->d_namlen = strlen(idesc->id_name);
-       bcopy(idesc->id_name, dirp->d_name, dirp->d_namlen + 1);
+       if (newinofmt)
+               dirp->d_type = typemap[idesc->id_parent];
+       else
+               dirp->d_type = 0;
+       dirp->d_namlen = newent.d_namlen;
+       memmove(dirp->d_name, idesc->id_name, (size_t)newent.d_namlen + 1);
+#      if (BYTE_ORDER == LITTLE_ENDIAN)
+               /*
+                * If the entry was split, dirscan() will only reverse the byte
+                * order of the original entry, and not the new one, before
+                * writing it back out.  So, we reverse the byte order here if
+                * necessary.
+                */
+               if (oldlen != 0 && !newinofmt && !doinglevel2) {
+                       u_char tmp;
+
+                       tmp = dirp->d_namlen;
+                       dirp->d_namlen = dirp->d_type;
+                       dirp->d_type = tmp;
+               }
+#      endif

        return (ALTERED|STOP);
 }
 
        return (ALTERED|STOP);
 }
 

+static int

 chgino(idesc)
        struct inodesc *idesc;
 {
 chgino(idesc)
        struct inodesc *idesc;
 {

-       register DIRECT *dirp = idesc->id_dirp;
+       register struct direct *dirp = idesc->id_dirp;

 
 

-       if (bcmp(dirp->d_name, idesc->id_name, dirp->d_namlen + 1))
+       if (memcmp(dirp->d_name, idesc->id_name, (int)dirp->d_namlen + 1))

                return (KEEPON);
                return (KEEPON);

-       dirp->d_ino = idesc->id_parent;;
+       dirp->d_ino = idesc->id_parent;
+       if (newinofmt)
+               dirp->d_type = typemap[idesc->id_parent];
+       else
+               dirp->d_type = 0;

        return (ALTERED|STOP);
 }
 
        return (ALTERED|STOP);
 }
 

-linkup(orphan, pdir)
+int
+linkup(orphan, parentdir)

        ino_t orphan;
        ino_t orphan;

-       ino_t pdir;
+       ino_t parentdir;

 {
 {

-       register DINODE *dp;
-       int lostdir, len;
+       register struct dinode *dp;
+       int lostdir;

        ino_t oldlfdir;
        struct inodesc idesc;
        char tempname[BUFSIZ];
        extern int pass4check();
 
        ino_t oldlfdir;
        struct inodesc idesc;
        char tempname[BUFSIZ];
        extern int pass4check();
 

-       bzero((char *)&idesc, sizeof(struct inodesc));
+       memset(&idesc, 0, sizeof(struct inodesc));

        dp = ginode(orphan);
        dp = ginode(orphan);

-       lostdir = DIRCT(dp);
+       lostdir = (dp->di_mode & IFMT) == IFDIR;

        pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");
        pinode(orphan);
        if (preen && dp->di_size == 0)
        pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");
        pinode(orphan);
        if (preen && dp->di_size == 0)


@@ -294,9 +414,6 @@ linkup(orphan, pdir)
        else
                if (reply("RECONNECT") == 0)
                        return (0);
        else
                if (reply("RECONNECT") == 0)
                        return (0);

-       pathp = pathname;
-       *pathp++ = '/';
-       *pathp = '\0';

        if (lfdir == 0) {
                dp = ginode(ROOTINO);
                idesc.id_name = lfname;
        if (lfdir == 0) {
                dp = ginode(ROOTINO);
                idesc.id_name = lfname;


@@ -308,7 +425,7 @@ linkup(orphan, pdir)
                } else {
                        pwarn("NO lost+found DIRECTORY");
                        if (preen || reply("CREATE")) {
                } else {
                        pwarn("NO lost+found DIRECTORY");
                        if (preen || reply("CREATE")) {

-                               lfdir = allocdir(ROOTINO, 0);
+                               lfdir = allocdir(ROOTINO, (ino_t)0, lfmode);

                                if (lfdir != 0) {
                                        if (makeentry(ROOTINO, lfdir, lfname) != 0) {
                                                if (preen)
                                if (lfdir != 0) {
                                        if (makeentry(ROOTINO, lfdir, lfname) != 0) {
                                                if (preen)


@@ -329,21 +446,16 @@ linkup(orphan, pdir)
                }
        }
        dp = ginode(lfdir);
                }
        }
        dp = ginode(lfdir);

-       if (!DIRCT(dp)) {
+       if ((dp->di_mode & IFMT) != IFDIR) {

                pfatal("lost+found IS NOT A DIRECTORY");
                if (reply("REALLOCATE") == 0)
                        return (0);
                oldlfdir = lfdir;
                pfatal("lost+found IS NOT A DIRECTORY");
                if (reply("REALLOCATE") == 0)
                        return (0);
                oldlfdir = lfdir;

-               if ((lfdir = allocdir(ROOTINO, 0)) == 0) {
+               if ((lfdir = allocdir(ROOTINO, (ino_t)0, lfmode)) == 0) {

                        pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
                        return (0);
                }
                        pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
                        return (0);
                }

-               idesc.id_type = DATA;
-               idesc.id_func = chgino;
-               idesc.id_number = ROOTINO;
-               idesc.id_parent = lfdir;        /* new inumber for lost+found */
-               idesc.id_name = lfname;
-               if ((ckinode(ginode(ROOTINO), &idesc) & ALTERED) == 0) {
+               if ((changeino(ROOTINO, lfname, lfdir) & ALTERED) == 0) {

                        pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
                        return (0);
                }
                        pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
                        return (0);
                }


@@ -359,53 +471,67 @@ linkup(orphan, pdir)
                pfatal("SORRY. NO lost+found DIRECTORY\n\n");
                return (0);
        }
                pfatal("SORRY. NO lost+found DIRECTORY\n\n");
                return (0);
        }

-       len = strlen(lfname);
-       bcopy(lfname, pathp, len + 1);
-       pathp += len;
-       len = lftempname(tempname, orphan);
+       (void)lftempname(tempname, orphan);

        if (makeentry(lfdir, orphan, tempname) == 0) {
                pfatal("SORRY. NO SPACE IN lost+found DIRECTORY");
                printf("\n\n");
                return (0);
        }
        lncntp[orphan]--;
        if (makeentry(lfdir, orphan, tempname) == 0) {
                pfatal("SORRY. NO SPACE IN lost+found DIRECTORY");
                printf("\n\n");
                return (0);
        }
        lncntp[orphan]--;

-       *pathp++ = '/';
-       bcopy(tempname, pathp, len + 1);
-       pathp += len;

        if (lostdir) {
        if (lostdir) {

-               dp = ginode(orphan);
-               idesc.id_type = DATA;
-               idesc.id_func = chgino;
-               idesc.id_number = orphan;
-               idesc.id_fix = DONTKNOW;
-               idesc.id_name = "..";
-               idesc.id_parent = lfdir;        /* new value for ".." */
-               (void)ckinode(dp, &idesc);
+               if ((changeino(orphan, "..", lfdir) & ALTERED) == 0 &&
+                   parentdir != (ino_t)-1)
+                       (void)makeentry(orphan, lfdir, "..");

                dp = ginode(lfdir);
                dp->di_nlink++;
                inodirty();
                lncntp[lfdir]++;
                dp = ginode(lfdir);
                dp->di_nlink++;
                inodirty();
                lncntp[lfdir]++;

-               pwarn("DIR I=%u CONNECTED. ", orphan);
-               printf("PARENT WAS I=%u\n", pdir);
+               pwarn("DIR I=%lu CONNECTED. ", orphan);
+               if (parentdir != (ino_t)-1)
+                       printf("PARENT WAS I=%lu\n", parentdir);

                if (preen == 0)
                        printf("\n");
        }
        return (1);
 }
 
                if (preen == 0)
                        printf("\n");
        }
        return (1);
 }
 

+/*
+ * fix an entry in a directory.
+ */
+int
+changeino(dir, name, newnum)
+       ino_t dir;
+       char *name;
+       ino_t newnum;
+{
+       struct inodesc idesc;
+
+       memset(&idesc, 0, sizeof(struct inodesc));
+       idesc.id_type = DATA;
+       idesc.id_func = chgino;
+       idesc.id_number = dir;
+       idesc.id_fix = DONTKNOW;
+       idesc.id_name = name;
+       idesc.id_parent = newnum;       /* new value for name */
+       return (ckinode(ginode(dir), &idesc));
+}
+

 /*
  * make an entry in a directory
  */
 /*
  * make an entry in a directory
  */

+int

 makeentry(parent, ino, name)
        ino_t parent, ino;
        char *name;
 {
 makeentry(parent, ino, name)
        ino_t parent, ino;
        char *name;
 {

-       DINODE *dp;
+       struct dinode *dp;

        struct inodesc idesc;
        struct inodesc idesc;

+       char pathbuf[MAXPATHLEN + 1];

        
        

-       if (parent < ROOTINO || parent >= imax || ino < ROOTINO || ino >= imax)
+       if (parent < ROOTINO || parent >= maxino ||
+           ino < ROOTINO || ino >= maxino)

                return (0);
                return (0);

-       bzero(&idesc, sizeof(struct inodesc));
+       memset(&idesc, 0, sizeof(struct inodesc));

        idesc.id_type = DATA;
        idesc.id_func = mkentry;
        idesc.id_number = parent;
        idesc.id_type = DATA;
        idesc.id_func = mkentry;
        idesc.id_number = parent;


@@ -419,7 +545,9 @@ makeentry(parent, ino, name)
        }
        if ((ckinode(dp, &idesc) & ALTERED) != 0)
                return (1);
        }
        if ((ckinode(dp, &idesc) & ALTERED) != 0)
                return (1);

-       if (expanddir(dp) == 0)
+       getpathname(pathbuf, parent, parent);
+       dp = ginode(parent);
+       if (expanddir(dp, pathbuf) == 0)

                return (0);
        return (ckinode(dp, &idesc) & ALTERED);
 }
                return (0);
        return (ckinode(dp, &idesc) & ALTERED);
 }


@@ -427,14 +555,17 @@ makeentry(parent, ino, name)
 /*
  * Attempt to expand the size of a directory
  */
 /*
  * Attempt to expand the size of a directory
  */

-expanddir(dp)
-       register DINODE *dp;
+static int
+expanddir(dp, name)
+       register struct dinode *dp;
+       char *name;

 {
 {

-       daddr_t lastbn, newblk;
+       ufs_daddr_t lastbn, newblk;
+       register struct bufarea *bp;

        char *cp, firstblk[DIRBLKSIZ];
 
        lastbn = lblkno(&sblock, dp->di_size);
        char *cp, firstblk[DIRBLKSIZ];
 
        lastbn = lblkno(&sblock, dp->di_size);

-       if (lastbn >= NDADDR - 1)
+       if (lastbn >= NDADDR - 1 || dp->di_db[lastbn] == 0 || dp->di_size == 0)

                return (0);
        if ((newblk = allocblk(sblock.fs_frag)) == 0)
                return (0);
                return (0);
        if ((newblk = allocblk(sblock.fs_frag)) == 0)
                return (0);


@@ -442,31 +573,31 @@ expanddir(dp)
        dp->di_db[lastbn] = newblk;
        dp->di_size += sblock.fs_bsize;
        dp->di_blocks += btodb(sblock.fs_bsize);
        dp->di_db[lastbn] = newblk;
        dp->di_size += sblock.fs_bsize;
        dp->di_blocks += btodb(sblock.fs_bsize);

-       getblk(&fileblk, dp->di_db[lastbn + 1],
-           dblksize(&sblock, dp, lastbn + 1));
-       if (fileblk.b_errs != NULL)
+       bp = getdirblk(dp->di_db[lastbn + 1],
+               (long)dblksize(&sblock, dp, lastbn + 1));
+       if (bp->b_errs)

                goto bad;
                goto bad;

-       bcopy(dirblk.b_buf, firstblk, DIRBLKSIZ);
-       getblk(&fileblk, newblk, sblock.fs_bsize);
-       if (fileblk.b_errs != NULL)
+       memmove(firstblk, bp->b_un.b_buf, DIRBLKSIZ);
+       bp = getdirblk(newblk, sblock.fs_bsize);
+       if (bp->b_errs)

                goto bad;
                goto bad;

-       bcopy(firstblk, dirblk.b_buf, DIRBLKSIZ);
-       for (cp = &dirblk.b_buf[DIRBLKSIZ];
-            cp < &dirblk.b_buf[sblock.fs_bsize];
+       memmove(bp->b_un.b_buf, firstblk, DIRBLKSIZ);
+       for (cp = &bp->b_un.b_buf[DIRBLKSIZ];
+            cp < &bp->b_un.b_buf[sblock.fs_bsize];

             cp += DIRBLKSIZ)
             cp += DIRBLKSIZ)

-               bcopy((char *)&emptydir, cp, sizeof emptydir);
-       dirty(&fileblk);
-       getblk(&fileblk, dp->di_db[lastbn + 1],
-           dblksize(&sblock, dp, lastbn + 1));
-       if (fileblk.b_errs != NULL)
+               memmove(cp, &emptydir, sizeof emptydir);
+       dirty(bp);
+       bp = getdirblk(dp->di_db[lastbn + 1],
+               (long)dblksize(&sblock, dp, lastbn + 1));
+       if (bp->b_errs)

                goto bad;
                goto bad;

-       bcopy((char *)&emptydir, dirblk.b_buf, sizeof emptydir);
-       pwarn("NO SPACE LEFT IN %s", pathname);
+       memmove(bp->b_un.b_buf, &emptydir, sizeof emptydir);
+       pwarn("NO SPACE LEFT IN %s", name);

        if (preen)
                printf(" (EXPANDED)\n");
        else if (reply("EXPAND") == 0)
                goto bad;
        if (preen)
                printf(" (EXPANDED)\n");
        else if (reply("EXPAND") == 0)
                goto bad;

-       dirty(&fileblk);
+       dirty(bp);

        inodirty();
        return (1);
 bad:
        inodirty();
        return (1);
 bad:


@@ -481,38 +612,48 @@ bad:
 /*
  * allocate a new directory
  */
 /*
  * allocate a new directory
  */

-allocdir(parent, request)
+ino_t
+allocdir(parent, request, mode)

        ino_t parent, request;
        ino_t parent, request;

+       int mode;

 {
        ino_t ino;
        char *cp;
 {
        ino_t ino;
        char *cp;

-       DINODE *dp;
+       struct dinode *dp;
+       register struct bufarea *bp;
+       struct dirtemplate *dirp;

 
 

-       ino = allocino(request, IFDIR|0755);
-       dirhead.dot_ino = ino;
-       dirhead.dotdot_ino = parent;
+       ino = allocino(request, IFDIR|mode);
+       if (newinofmt)
+               dirp = &dirhead;
+       else
+               dirp = (struct dirtemplate *)&odirhead;
+       dirp->dot_ino = ino;
+       dirp->dotdot_ino = parent;

        dp = ginode(ino);
        dp = ginode(ino);

-       getblk(&fileblk, dp->di_db[0], sblock.fs_fsize);
-       if (fileblk.b_errs != NULL) {
+       bp = getdirblk(dp->di_db[0], sblock.fs_fsize);
+       if (bp->b_errs) {

                freeino(ino);
                return (0);
        }
                freeino(ino);
                return (0);
        }

-       bcopy((char *)&dirhead, dirblk.b_buf, sizeof dirhead);
-       for (cp = &dirblk.b_buf[DIRBLKSIZ];
-            cp < &dirblk.b_buf[sblock.fs_fsize];
+       memmove(bp->b_un.b_buf, dirp, sizeof(struct dirtemplate));
+       for (cp = &bp->b_un.b_buf[DIRBLKSIZ];
+            cp < &bp->b_un.b_buf[sblock.fs_fsize];

             cp += DIRBLKSIZ)
             cp += DIRBLKSIZ)

-               bcopy((char *)&emptydir, cp, sizeof emptydir);
-       dirty(&fileblk);
+               memmove(cp, &emptydir, sizeof emptydir);
+       dirty(bp);

        dp->di_nlink = 2;
        inodirty();
        if (ino == ROOTINO) {
                lncntp[ino] = dp->di_nlink;
        dp->di_nlink = 2;
        inodirty();
        if (ino == ROOTINO) {
                lncntp[ino] = dp->di_nlink;

+               cacheino(dp, ino);

                return(ino);
        }
        if (statemap[parent] != DSTATE && statemap[parent] != DFOUND) {
                freeino(ino);
                return (0);
        }
                return(ino);
        }
        if (statemap[parent] != DSTATE && statemap[parent] != DFOUND) {
                freeino(ino);
                return (0);
        }

+       cacheino(dp, ino);

        statemap[ino] = statemap[parent];
        if (statemap[ino] == DSTATE) {
                lncntp[ino] = dp->di_nlink;
        statemap[ino] = statemap[parent];
        if (statemap[ino] == DSTATE) {
                lncntp[ino] = dp->di_nlink;


@@ -527,10 +668,11 @@ allocdir(parent, request)
 /*
  * free a directory inode
  */
 /*
  * free a directory inode
  */

+static void

 freedir(ino, parent)
        ino_t ino, parent;
 {
 freedir(ino, parent)
        ino_t ino, parent;
 {

-       DINODE *dp;
+       struct dinode *dp;

 
        if (ino != parent) {
                dp = ginode(parent);
 
        if (ino != parent) {
                dp = ginode(parent);


@@ -543,6 +685,7 @@ freedir(ino, parent)
 /*
  * generate a temporary name for the lost+found directory.
  */
 /*
  * generate a temporary name for the lost+found directory.
  */

+static int

 lftempname(bufp, ino)
        char *bufp;
        ino_t ino;
 lftempname(bufp, ino)
        char *bufp;
        ino_t ino;


@@ -552,7 +695,7 @@ lftempname(bufp, ino)
        int namlen;
 
        cp = bufp + 2;
        int namlen;
 
        cp = bufp + 2;

-       for (in = imax; in > 0; in /= 10)
+       for (in = maxino; in > 0; in /= 10)

                cp++;
        *--cp = 0;
        namlen = cp - bufp;
                cp++;
        *--cp = 0;
        namlen = cp - bufp;


@@ -564,3 +707,19 @@ lftempname(bufp, ino)
        *cp = '#';
        return (namlen);
 }
        *cp = '#';
        return (namlen);
 }

+
+/*
+ * Get a directory block.
+ * Insure that it is held until another is requested.
+ */
+static struct bufarea *
+getdirblk(blkno, size)
+       ufs_daddr_t blkno;
+       long size;
+{
+
+       if (pdirbp != 0)
+               pdirbp->b_flags &= ~B_INUSE;
+       pdirbp = getdatablk(blkno, size);
+       return (pdirbp);
+}