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 6d7f1fd..f9b8b63 100644 (file)
--- a/usr/src/sbin/fsck/dir.c
+++ b/usr/src/sbin/fsck/dir.c
@@ -1,35 +1,77 @@
 /*
 /*

- * 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[] = "@(#)dir.c      5.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)dir.c      8.8 (Berkeley) 4/28/95";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#define KERNEL
-#include <ufs/dir.h>
-#undef KERNEL
-#include <stdlib.h>
+#include <sys/time.h>
+
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
+
+#include <err.h>

 #include <string.h>
 #include <string.h>

+

 #include "fsck.h"
 
 char   *lfname = "lost+found";
 int    lfmode = 01777;
 struct dirtemplate emptydir = { 0, DIRBLKSIZ };
 #include "fsck.h"
 
 char   *lfname = "lost+found";
 int    lfmode = 01777;
 struct dirtemplate emptydir = { 0, DIRBLKSIZ };

-struct dirtemplate dirhead = { 0, 12, 1, ".", 0, DIRBLKSIZ - 12, 2, ".." };
-
-struct direct  *fsck_readdir();
-struct bufarea *getdirblk();
+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 *));

 
 /*
  * Propagate connected state through the tree.
  */
 
 /*
  * Propagate connected state through the tree.
  */

+void

 propagate()
 {
        register struct inoinfo **inpp, *inp;
 propagate()
 {
        register struct inoinfo **inpp, *inp;


@@ -55,6 +97,7 @@ propagate()
 /*
  * Scan each entry in a directory block.
  */
 /*
  * Scan each entry in a directory block.
  */

+int

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


@@ -65,7 +108,7 @@ dirscan(idesc)
        char dbuf[DIRBLKSIZ];
 
        if (idesc->id_type != DATA)
        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);
        if (idesc->id_entryno == 0 &&
            (idesc->id_filesize & (DIRBLKSIZ - 1)) != 0)
                idesc->id_filesize = roundup(idesc->id_filesize, DIRBLKSIZ);


@@ -77,11 +120,32 @@ dirscan(idesc)
        idesc->id_loc = 0;
        for (dp = fsck_readdir(idesc); dp != NULL; dp = fsck_readdir(idesc)) {
                dsize = dp->d_reclen;
        idesc->id_loc = 0;
        for (dp = fsck_readdir(idesc); dp != NULL; dp = fsck_readdir(idesc)) {
                dsize = dp->d_reclen;

-               bcopy((char *)dp, dbuf, (size_t)dsize);
+               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) {
                idesc->id_dirp = (struct direct *)dbuf;
                if ((n = (*idesc->id_func)(idesc)) & ALTERED) {

+#                      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);
                        bp = getdirblk(idesc->id_blkno, blksiz);

-                       bcopy(dbuf, bp->b_un.b_buf + idesc->id_loc - dsize,
+                       memmove(bp->b_un.b_buf + idesc->id_loc - dsize, dbuf,

                            (size_t)dsize);
                        dirty(bp);
                        sbdirty();
                            (size_t)dsize);
                        dirty(bp);
                        sbdirty();


@@ -95,13 +159,13 @@ dirscan(idesc)
 /*
  * get next entry in a directory.
  */
 /*
  * get next entry in a directory.
  */

-struct direct *
+static struct direct *

 fsck_readdir(idesc)
        register struct inodesc *idesc;
 {
        register struct direct *dp, *ndp;
        register struct bufarea *bp;
 fsck_readdir(idesc)
        register struct inodesc *idesc;
 {
        register struct direct *dp, *ndp;
        register struct bufarea *bp;

-       long size, blksiz, fix;
+       long size, blksiz, fix, dploc;

 
        blksiz = idesc->id_numfrags * sblock.fs_fsize;
        bp = getdirblk(idesc->id_blkno, blksiz);
 
        blksiz = idesc->id_numfrags * sblock.fs_fsize;
        bp = getdirblk(idesc->id_blkno, blksiz);


@@ -110,23 +174,27 @@ fsck_readdir(idesc)
                dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);
                if (dircheck(idesc, dp))
                        goto dpok;
                dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);
                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;
                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_type = 0;

                dp->d_namlen = 0;
                dp->d_name[0] = '\0';
                if (fix)
                        dirty(bp);
                dp->d_namlen = 0;
                dp->d_name[0] = '\0';
                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 = (struct direct *)(bp->b_un.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)
        idesc->id_loc += dp->d_reclen;
        idesc->id_filesize -= dp->d_reclen;
        if ((idesc->id_loc % DIRBLKSIZ) == 0)


@@ -137,9 +205,11 @@ dpok:
                size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
                idesc->id_loc += size;
                idesc->id_filesize -= size;
                size = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
                idesc->id_loc += size;
                idesc->id_filesize -= size;

+               if (idesc->id_fix == IGNORE)
+                       return (0);

                fix = dofix(idesc, "DIRECTORY CORRUPTED");
                bp = getdirblk(idesc->id_blkno, blksiz);
                fix = dofix(idesc, "DIRECTORY CORRUPTED");
                bp = getdirblk(idesc->id_blkno, blksiz);

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

                dp->d_reclen += size;
                if (fix)
                        dirty(bp);
                dp->d_reclen += size;
                if (fix)
                        dirty(bp);


@@ -151,34 +221,51 @@ 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;
        register struct direct *dp;
 {
        register int size;
        register char *cp;
 dircheck(idesc, dp)
        struct inodesc *idesc;
        register struct direct *dp;
 {
        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 < maxino &&
-           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++ == '/'))
-                               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);

 }
 
 }
 

+void

 direrror(ino, errmesg)
        ino_t ino;
        char *errmesg;
 direrror(ino, errmesg)
        ino_t ino;
        char *errmesg;


@@ -187,6 +274,7 @@ direrror(ino, errmesg)
        fileerror(ino, ino, errmesg);
 }
 
        fileerror(ino, ino, errmesg);
 }
 

+void

 fileerror(cwd, ino, errmesg)
        ino_t cwd, ino;
        char *errmesg;
 fileerror(cwd, ino, errmesg)
        ino_t cwd, ino;
        char *errmesg;


@@ -210,9 +298,10 @@ fileerror(cwd, ino, errmesg)
                pfatal("NAME=%s\n", pathbuf);
 }
 
                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 struct dinode *dp;
 
 {
        register struct dinode *dp;
 


@@ -240,6 +329,7 @@ adjust(idesc, lcnt)
        }
 }
 
        }
 }
 

+static int

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


@@ -248,9 +338,9 @@ mkentry(idesc)
        int newlen, oldlen;
 
        newent.d_namlen = strlen(idesc->id_name);
        int newlen, oldlen;
 
        newent.d_namlen = strlen(idesc->id_name);

-       newlen = DIRSIZ(&newent);
+       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)


@@ -260,22 +350,47 @@ 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;

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

        dirp->d_namlen = newent.d_namlen;
        dirp->d_namlen = newent.d_namlen;

-       bcopy(idesc->id_name, dirp->d_name, (size_t)dirp->d_namlen + 1);
+       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;
 {
        register struct direct *dirp = idesc->id_dirp;
 
 chgino(idesc)
        struct inodesc *idesc;
 {
        register struct direct *dirp = idesc->id_dirp;
 

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

                return (KEEPON);
        dirp->d_ino = idesc->id_parent;
                return (KEEPON);
        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);
 }
 

+int

 linkup(orphan, parentdir)
        ino_t orphan;
        ino_t parentdir;
 linkup(orphan, parentdir)
        ino_t orphan;
        ino_t parentdir;


@@ -287,7 +402,7 @@ linkup(orphan, parentdir)
        char tempname[BUFSIZ];
        extern int pass4check();
 
        char tempname[BUFSIZ];
        extern int pass4check();
 

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

        dp = ginode(orphan);
        lostdir = (dp->di_mode & IFMT) == IFDIR;
        pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");
        dp = ginode(orphan);
        lostdir = (dp->di_mode & IFMT) == IFDIR;
        pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");


@@ -383,6 +498,7 @@ linkup(orphan, parentdir)
 /*
  * fix an entry in a directory.
  */
 /*
  * fix an entry in a directory.
  */

+int

 changeino(dir, name, newnum)
        ino_t dir;
        char *name;
 changeino(dir, name, newnum)
        ino_t dir;
        char *name;


@@ -390,7 +506,7 @@ changeino(dir, name, newnum)
 {
        struct inodesc idesc;
 
 {
        struct inodesc idesc;
 

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

        idesc.id_type = DATA;
        idesc.id_func = chgino;
        idesc.id_number = dir;
        idesc.id_type = DATA;
        idesc.id_func = chgino;
        idesc.id_number = dir;


@@ -403,6 +519,7 @@ changeino(dir, name, newnum)
 /*
  * 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;


@@ -414,7 +531,7 @@ makeentry(parent, ino, name)
        if (parent < ROOTINO || parent >= maxino ||
            ino < ROOTINO || ino >= maxino)
                return (0);
        if (parent < ROOTINO || parent >= maxino ||
            ino < ROOTINO || ino >= maxino)
                return (0);

-       bzero((char *)&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;


@@ -438,11 +555,12 @@ makeentry(parent, ino, name)
 /*
  * Attempt to expand the size of a directory
  */
 /*
  * Attempt to expand the size of a directory
  */

+static int

 expanddir(dp, name)
        register struct dinode *dp;
        char *name;
 {
 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];
 
        register struct bufarea *bp;
        char *cp, firstblk[DIRBLKSIZ];
 


@@ -459,21 +577,21 @@ expanddir(dp, name)
                (long)dblksize(&sblock, dp, lastbn + 1));
        if (bp->b_errs)
                goto bad;
                (long)dblksize(&sblock, dp, lastbn + 1));
        if (bp->b_errs)
                goto bad;

-       bcopy(bp->b_un.b_buf, firstblk, DIRBLKSIZ);
+       memmove(firstblk, bp->b_un.b_buf, DIRBLKSIZ);

        bp = getdirblk(newblk, sblock.fs_bsize);
        if (bp->b_errs)
                goto bad;
        bp = getdirblk(newblk, sblock.fs_bsize);
        if (bp->b_errs)
                goto bad;

-       bcopy(firstblk, bp->b_un.b_buf, DIRBLKSIZ);
+       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)
        for (cp = &bp->b_un.b_buf[DIRBLKSIZ];
             cp < &bp->b_un.b_buf[sblock.fs_bsize];
             cp += DIRBLKSIZ)

-               bcopy((char *)&emptydir, cp, sizeof emptydir);
+               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;
        dirty(bp);
        bp = getdirblk(dp->di_db[lastbn + 1],
                (long)dblksize(&sblock, dp, lastbn + 1));
        if (bp->b_errs)
                goto bad;

-       bcopy((char *)&emptydir, bp->b_un.b_buf, sizeof emptydir);
+       memmove(bp->b_un.b_buf, &emptydir, sizeof emptydir);

        pwarn("NO SPACE LEFT IN %s", name);
        if (preen)
                printf(" (EXPANDED)\n");
        pwarn("NO SPACE LEFT IN %s", name);
        if (preen)
                printf(" (EXPANDED)\n");


@@ -494,6 +612,7 @@ bad:
 /*
  * allocate a new directory
  */
 /*
  * allocate a new directory
  */

+ino_t

 allocdir(parent, request, mode)
        ino_t parent, request;
        int mode;
 allocdir(parent, request, mode)
        ino_t parent, request;
        int mode;


@@ -502,21 +621,26 @@ allocdir(parent, request, mode)
        char *cp;
        struct dinode *dp;
        register struct bufarea *bp;
        char *cp;
        struct dinode *dp;
        register struct bufarea *bp;

+       struct dirtemplate *dirp;

 
        ino = allocino(request, IFDIR|mode);
 
        ino = allocino(request, IFDIR|mode);

-       dirhead.dot_ino = ino;
-       dirhead.dotdot_ino = parent;
+       if (newinofmt)
+               dirp = &dirhead;
+       else
+               dirp = (struct dirtemplate *)&odirhead;
+       dirp->dot_ino = ino;
+       dirp->dotdot_ino = parent;

        dp = ginode(ino);
        bp = getdirblk(dp->di_db[0], sblock.fs_fsize);
        if (bp->b_errs) {
                freeino(ino);
                return (0);
        }
        dp = ginode(ino);
        bp = getdirblk(dp->di_db[0], sblock.fs_fsize);
        if (bp->b_errs) {
                freeino(ino);
                return (0);
        }

-       bcopy((char *)&dirhead, bp->b_un.b_buf, sizeof dirhead);
+       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)
        for (cp = &bp->b_un.b_buf[DIRBLKSIZ];
             cp < &bp->b_un.b_buf[sblock.fs_fsize];
             cp += DIRBLKSIZ)

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

        dirty(bp);
        dp->di_nlink = 2;
        inodirty();
        dirty(bp);
        dp->di_nlink = 2;
        inodirty();


@@ -544,6 +668,7 @@ allocdir(parent, request, mode)
 /*
  * free a directory inode
  */
 /*
  * free a directory inode
  */

+static void

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


@@ -560,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;


@@ -586,9 +712,9 @@ lftempname(bufp, ino)
  * Get a directory block.
  * Insure that it is held until another is requested.
  */
  * Get a directory block.
  * Insure that it is held until another is requested.
  */

-struct bufarea *
+static struct bufarea *

 getdirblk(blkno, size)
 getdirblk(blkno, size)

-       daddr_t blkno;
+       ufs_daddr_t blkno;

        long size;
 {
 
        long size;
 {