Remove UFS support

It has been unused/untested/unmaintained for a decade now, and its
4-clause BSD licence poses problem.

* configure.ac (default_static): Remove ufs.
* Makefile (prog-subdirs): Remove ufs, ufs-fsck and ufs-utils.
* NEWS, TODO: doc/hurd.texi, doc/navigating: Remove UFS notes.
* ufs: Remove directory
* ufs-fsck: Remove directory
* ufs-utils: Remove directory
* bsdfsck: Remove directory

14 files changed, 0 insertions, 4756 deletions

diff --git a/bsdfsck/Makefile b/bsdfsck/Makefile
deleted file mode 100644
index 4e237e98..00000000
--- a/bsdfsck/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# 
-#   Copyright (C) 1994, 1995, 2012 Free Software Foundation
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2, or (at
-#   your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := bsdfsck
-makemode := utility
-
-SRCS = dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
-	pass5.c setup.c utilities.c # preen.c
-OBJS = dir.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o \
-	pass5.o setup.o utilities.o tables.o # preen.o
-target = bsdfsck
-
-vpath tables.c ../ufs
-
-include ../Makeconf
-
diff --git a/bsdfsck/dir.c b/bsdfsck/dir.c
deleted file mode 100644
index e63473ae..00000000
--- a/bsdfsck/dir.c
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)dir.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: dir.c,v 1.5 1994/11/04 21:54:56 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-#include <stdlib.h>
-#include <string.h>
-#include "fsck.h"
-
-char	*lfname = "lost+found";
-int	lfmode = 01777;
-struct	dirtemplate emptydir = { 0, DIRBLKSIZ };
-struct	dirtemplate dirhead = {
-	0, 12, DT_DIR, 1, ".",
-	0, DIRBLKSIZ - 12, DT_DIR, 2, ".."
-};
-struct	odirtemplate odirhead = {
-	0, 12, 1, ".",
-	0, DIRBLKSIZ - 12, 2, ".."
-};
-
-struct direct	*fsck_readdir();
-struct bufarea	*getdirblk();
-
-/*
- * Propagate connected state through the tree.
- */
-propagate()
-{
-	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.
- */
-dirscan(idesc)
-	register struct inodesc *idesc;
-{
-	register struct direct *dp;
-	register struct bufarea *bp;
-	int dsize, n;
-	long blksiz;
-	char dbuf[DIRBLKSIZ];
-
-	if (idesc->id_type != DATA)
-		errexit("wrong type to dirscan %d\n", 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 (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;
-		bcopy((char *)dp, dbuf, (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 (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);
-			bcopy(dbuf, bp->b_un.b_buf + idesc->id_loc - dsize,
-			    (size_t)dsize);
-			dirty(bp);
-			sbdirty();
-		}
-		if (n & STOP) 
-			return (n);
-	}
-	return (idesc->id_filesize > 0 ? KEEPON : STOP);
-}
-
-/*
- * get next entry in a directory.
- */
-struct direct *
-fsck_readdir(idesc)
-	register struct inodesc *idesc;
-{
-	register struct direct *dp, *ndp;
-	register struct bufarea *bp;
-	long size, blksiz, fix, dploc;
-
-	blksiz = idesc->id_numfrags * sblock.fs_fsize;
-	bp = getdirblk(idesc->id_blkno, blksiz);
-	if (idesc->id_loc % DIRBLKSIZ == 0 && idesc->id_filesize > 0 &&
-	    idesc->id_loc < blksiz) {
-		dp = (struct direct *)(bp->b_un.b_buf + idesc->id_loc);
-		if (dircheck(idesc, dp))
-			goto dpok;
-		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);
-		idesc->id_loc += DIRBLKSIZ;
-		idesc->id_filesize -= DIRBLKSIZ;
-		return (dp);
-	}
-dpok:
-	if (idesc->id_filesize <= 0 || idesc->id_loc >= blksiz)
-		return NULL;
-	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);
-	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);
-		idesc->id_loc += size;
-		idesc->id_filesize -= size;
-		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);
-}
-
-/*
- * Verify that a directory entry is valid.
- * This is a superset of the checks made in the kernel.
- */
-dircheck(idesc, dp)
-	struct inodesc *idesc;
-	register struct direct *dp;
-{
-	register int size;
-	register char *cp;
-	u_char namlen, type;
-	int spaceleft;
-	spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ);
-
- 	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);
-}
-
-direrror(ino, errmesg)
-	ino_t ino;
-	char *errmesg;
-{
-
-	fileerror(ino, ino, errmesg);
-}
-
-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");
-	getpathname(pathbuf, cwd, ino);
-	if (ino < ROOTINO || ino > maxino) {
-		pfatal("NAME=%s\n", pathbuf);
-		return;
-	}
-	dp = ginode(ino);
-	if (ftypeok(dp))
-		pfatal("%s=%s\n",
-		    (DI_MODE(dp) & IFMT) == IFDIR ? "DIR" : "FILE", pathbuf);
-	else
-		pfatal("NAME=%s\n", pathbuf);
-}
-
-adjust(idesc, lcnt)
-	register struct inodesc *idesc;
-	short lcnt;
-{
-	register struct dinode *dp;
-
-	dp = ginode(idesc->id_number);
-	if (dp->di_nlink == lcnt) {
-		if (linkup(idesc->id_number, (ino_t)0) == 0)
-			clri(idesc, "UNREF", 0);
-	} else {
-		pwarn("LINK COUNT %s", (lfdir == idesc->id_number) ? lfname :
-			((DI_MODE(dp) & IFMT) == IFDIR ? "DIR" : "FILE"));
-		pinode(idesc->id_number);
-		printf(" COUNT %d SHOULD BE %d",
-			dp->di_nlink, dp->di_nlink - lcnt);
-		if (preen) {
-			if (lcnt < 0) {
-				printf("\n");
-				pfatal("LINK COUNT INCREASING");
-			}
-			printf(" (ADJUSTED)\n");
-		}
-		if (preen || reply("ADJUST") == 1) {
-			dp->di_nlink -= lcnt;
-			inodirty();
-		}
-	}
-}
-
-mkentry(idesc)
-	struct inodesc *idesc;
-{
-	register struct direct *dirp = idesc->id_dirp;
-	struct direct newent;
-	int newlen, oldlen;
-
-	newent.d_namlen = strlen(idesc->id_name);
-	newlen = DIRSIZ(0, &newent);
-	if (dirp->d_ino != 0)
-		oldlen = DIRSIZ(0, dirp);
-	else
-		oldlen = 0;
-	if (dirp->d_reclen - oldlen < newlen)
-		return (KEEPON);
-	newent.d_reclen = dirp->d_reclen - oldlen;
-	dirp->d_reclen = oldlen;
-	dirp = (struct direct *)(((char *)dirp) + oldlen);
-	dirp->d_ino = idesc->id_parent;	/* ino to be entered is in id_parent */
-	if (newinofmt) {
-		dirp->d_type = typemap[idesc->id_parent];
-		dirp->d_namlen = newent.d_namlen;
-	} else {
-#		if (BYTE_ORDER == LITTLE_ENDIAN)
-			dirp->d_type = newent.d_namlen;
-			dirp->d_namlen = 0;
-#		else
-			dirp->d_type = 0;
-			dirp->d_namlen = newent.d_namlen;
-#		endif
-	}
-	dirp->d_reclen = newent.d_reclen;
-	bcopy(idesc->id_name, dirp->d_name, (size_t)newent.d_namlen + 1);
-	return (ALTERED|STOP);
-}
-
-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))
-		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);
-}
-
-linkup(orphan, parentdir)
-	ino_t orphan;
-	ino_t parentdir;
-{
-	register struct dinode *dp;
-	int lostdir;
-	ino_t oldlfdir;
-	struct inodesc idesc;
-	char tempname[BUFSIZ];
-	extern int pass4check();
-
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	dp = ginode(orphan);
-	lostdir = (DI_MODE(dp) & IFMT) == IFDIR;
-	pwarn("UNREF %s ", lostdir ? "DIR" : "FILE");
-	pinode(orphan);
-	if (preen && dp->di_size == 0)
-		return (0);
-	if (preen)
-		printf(" (RECONNECTED)\n");
-	else
-		if (reply("RECONNECT") == 0)
-			return (0);
-	if (lfdir == 0) {
-		dp = ginode(ROOTINO);
-		idesc.id_name = lfname;
-		idesc.id_type = DATA;
-		idesc.id_func = findino;
-		idesc.id_number = ROOTINO;
-		if ((ckinode(dp, &idesc) & FOUND) != 0) {
-			lfdir = idesc.id_parent;
-		} else {
-			pwarn("NO lost+found DIRECTORY");
-			if (preen || reply("CREATE")) {
-				lfdir = allocdir(ROOTINO, (ino_t)0, lfmode);
-				if (lfdir != 0) {
-					if (makeentry(ROOTINO, lfdir, lfname) != 0) {
-						if (preen)
-							printf(" (CREATED)\n");
-					} else {
-						freedir(lfdir, ROOTINO);
-						lfdir = 0;
-						if (preen)
-							printf("\n");
-					}
-				}
-			}
-		}
-		if (lfdir == 0) {
-			pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY");
-			printf("\n\n");
-			return (0);
-		}
-	}
-	dp = ginode(lfdir);
-	if ((DI_MODE(dp) & IFMT) != IFDIR) {
-		pfatal("lost+found IS NOT A DIRECTORY");
-		if (reply("REALLOCATE") == 0)
-			return (0);
-		oldlfdir = lfdir;
-		if ((lfdir = allocdir(ROOTINO, (ino_t)0, lfmode)) == 0) {
-			pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
-			return (0);
-		}
-		if ((changeino(ROOTINO, lfname, lfdir) & ALTERED) == 0) {
-			pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n");
-			return (0);
-		}
-		inodirty();
-		idesc.id_type = ADDR;
-		idesc.id_func = pass4check;
-		idesc.id_number = oldlfdir;
-		adjust(&idesc, lncntp[oldlfdir] + 1);
-		lncntp[oldlfdir] = 0;
-		dp = ginode(lfdir);
-	}
-	if (statemap[lfdir] != DFOUND) {
-		pfatal("SORRY. NO lost+found DIRECTORY\n\n");
-		return (0);
-	}
-	(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 (lostdir) {
-		if ((changeino(orphan, "..", lfdir) & ALTERED) == 0 &&
-		    parentdir != (ino_t)-1)
-			(void)makeentry(orphan, lfdir, "..");
-		dp = ginode(lfdir);
-		dp->di_nlink++;
-		inodirty();
-		lncntp[lfdir]++;
-		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);
-}
-
-/*
- * fix an entry in a directory.
- */
-changeino(dir, name, newnum)
-	ino_t dir;
-	char *name;
-	ino_t newnum;
-{
-	struct inodesc idesc;
-
-	bzero((char *)&idesc, 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
- */
-makeentry(parent, ino, name)
-	ino_t parent, ino;
-	char *name;
-{
-	struct dinode *dp;
-	struct inodesc idesc;
-	char pathbuf[MAXPATHLEN + 1];
-	
-	if (parent < ROOTINO || parent >= maxino ||
-	    ino < ROOTINO || ino >= maxino)
-		return (0);
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	idesc.id_type = DATA;
-	idesc.id_func = mkentry;
-	idesc.id_number = parent;
-	idesc.id_parent = ino;	/* this is the inode to enter */
-	idesc.id_fix = DONTKNOW;
-	idesc.id_name = name;
-	dp = ginode(parent);
-	if (dp->di_size % DIRBLKSIZ) {
-		dp->di_size = roundup(dp->di_size, DIRBLKSIZ);
-		inodirty();
-	}
-	if ((ckinode(dp, &idesc) & ALTERED) != 0)
-		return (1);
-	getpathname(pathbuf, parent, parent);
-	dp = ginode(parent);
-	if (expanddir(dp, pathbuf) == 0)
-		return (0);
-	return (ckinode(dp, &idesc) & ALTERED);
-}
-
-/*
- * Attempt to expand the size of a directory
- */
-expanddir(dp, name)
-	register struct dinode *dp;
-	char *name;
-{
-	daddr_t lastbn, newblk;
-	register struct bufarea *bp;
-	char *cp, firstblk[DIRBLKSIZ];
-
-	lastbn = lblkno(&sblock, dp->di_size);
-	if (lastbn >= NDADDR - 1 || dp->di_db[lastbn] == 0 || dp->di_size == 0)
-		return (0);
-	if ((newblk = allocblk(sblock.fs_frag)) == 0)
-		return (0);
-	dp->di_db[lastbn + 1] = dp->di_db[lastbn];
-	dp->di_db[lastbn] = newblk;
-	dp->di_size += sblock.fs_bsize;
-	dp->di_blocks += btodb(sblock.fs_bsize);
-	bp = getdirblk(dp->di_db[lastbn + 1],
-		(long)dblksize(&sblock, dp, lastbn + 1));
-	if (bp->b_errs)
-		goto bad;
-	bcopy(bp->b_un.b_buf, firstblk, DIRBLKSIZ);
-	bp = getdirblk(newblk, sblock.fs_bsize);
-	if (bp->b_errs)
-		goto bad;
-	bcopy(firstblk, bp->b_un.b_buf, 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);
-	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);
-	pwarn("NO SPACE LEFT IN %s", name);
-	if (preen)
-		printf(" (EXPANDED)\n");
-	else if (reply("EXPAND") == 0)
-		goto bad;
-	dirty(bp);
-	inodirty();
-	return (1);
-bad:
-	dp->di_db[lastbn] = dp->di_db[lastbn + 1];
-	dp->di_db[lastbn + 1] = 0;
-	dp->di_size -= sblock.fs_bsize;
-	dp->di_blocks -= btodb(sblock.fs_bsize);
-	freeblk(newblk, sblock.fs_frag);
-	return (0);
-}
-
-/*
- * allocate a new directory
- */
-allocdir(parent, request, mode)
-	ino_t parent, request;
-	int mode;
-{
-	ino_t ino;
-	char *cp;
-	struct dinode *dp;
-	register struct bufarea *bp;
-	struct dirtemplate *dirp;
-
-	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);
-	bp = getdirblk(dp->di_db[0], sblock.fs_fsize);
-	if (bp->b_errs) {
-		freeino(ino);
-		return (0);
-	}
-	bcopy((char *)dirp, bp->b_un.b_buf, sizeof(struct dirtemplate));
-	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);
-	dirty(bp);
-	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);
-	}
-	cacheino(dp, ino);
-	statemap[ino] = statemap[parent];
-	if (statemap[ino] == DSTATE) {
-		lncntp[ino] = dp->di_nlink;
-		lncntp[parent]++;
-	}
-	dp = ginode(parent);
-	dp->di_nlink++;
-	inodirty();
-	return (ino);
-}
-
-/*
- * free a directory inode
- */
-freedir(ino, parent)
-	ino_t ino, parent;
-{
-	struct dinode *dp;
-
-	if (ino != parent) {
-		dp = ginode(parent);
-		dp->di_nlink--;
-		inodirty();
-	}
-	freeino(ino);
-}
-
-/*
- * generate a temporary name for the lost+found directory.
- */
-lftempname(bufp, ino)
-	char *bufp;
-	ino_t ino;
-{
-	register ino_t in;
-	register char *cp;
-	int namlen;
-
-	cp = bufp + 2;
-	for (in = maxino; in > 0; in /= 10)
-		cp++;
-	*--cp = 0;
-	namlen = cp - bufp;
-	in = ino;
-	while (cp > bufp) {
-		*--cp = (in % 10) + '0';
-		in /= 10;
-	}
-	*cp = '#';
-	return (namlen);
-}
-
-/*
- * Get a directory block.
- * Insure that it is held until another is requested.
- */
-struct bufarea *
-getdirblk(blkno, size)
-	daddr_t blkno;
-	long size;
-{
-
-	if (pdirbp != 0)
-		pdirbp->b_flags &= ~B_INUSE;
-	pdirbp = getdatablk(blkno, size);
-	return (pdirbp);
-}
diff --git a/bsdfsck/fsck.h b/bsdfsck/fsck.h
deleted file mode 100644
index 04bb7698..00000000
--- a/bsdfsck/fsck.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * 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.
- *
- *	from: @(#)fsck.h	8.1 (Berkeley) 6/5/93
- *	$Id: fsck.h,v 1.10 1994/10/05 17:09:06 mib Exp $
- */
-
-/* Begin GNU Hurd */
-
-/* GNU ufs doesn't define struct direct, but fsck needs it. */
-#define direct directory_entry
-
-/* For GNU Hurd: the ufs DIRSIZ macro is different than the BSD 
-   4.4 version that fsck expects.  So we provide here the BSD version. */
-#undef DIRSIZ
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#define DIRSIZ(oldfmt, dp) \
-    ((oldfmt) ? \
-    ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_type+1 + 3) &~ 3)) : \
-    ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3)))
-#else
-#define DIRSIZ(oldfmt, dp) \
-    ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
-#endif
-
-/* GNU ufs has no need of struct dirtemplate; so provide the 
-   BSD version here. */
-/*
- * Template for manipulating directories.
- * Should use struct direct's, but the name field
- * is MAXNAMLEN - 1, and this just won't do.
- */
-struct dirtemplate {
-	u_long	dot_ino;
-	short	dot_reclen;
-	u_char	dot_type;
-	u_char	dot_namlen;
-	char	dot_name[4];		/* must be multiple of 4 */
-	u_long	dotdot_ino;
-	short	dotdot_reclen;
-	u_char	dotdot_type;
-	u_char	dotdot_namlen;
-	char	dotdot_name[4];		/* ditto */
-};
-/*
- * This is the old format of directories, sanz type element.
- */
-struct odirtemplate {
-	u_long	dot_ino;
-	short	dot_reclen;
-	u_short	dot_namlen;
-	char	dot_name[4];		/* must be multiple of 4 */
-	u_long	dotdot_ino;
-	short	dotdot_reclen;
-	u_short	dotdot_namlen;
-	char	dotdot_name[4];		/* ditto */
-};
-
-/* These shouldn't be used by anyone, but fsck seems to need it */
-#define DEV_BSIZE 512
-#define MAXPATHLEN 1024
-
-/* Provide mode from struct dinode * */
-#define DI_MODE(dp) (((dp)->di_modeh << 16) | (dp)->di_model)
-
-#define NBBY 8
-
-#define MAXPHYS (64 * 1024)
-
-/* The fsck code in setup.c sets the fs_csp table which ufs doesn't want.
-   So here is the fs_cs macro from ufs for use when that table is real. */
-#undef fs_cs
-#define fs_cs(fs, indx) \
-	fs_csp[(indx) >> (fs)->fs_csshift][(indx) & ~(fs)->fs_csmask]
-
-#define dblksize(fs, dip, lbn) \
-	(((lbn) >= NDADDR || (dip)->di_size >= ((lbn) + 1) << (fs)->fs_bshift) \
-	    ? (fs)->fs_bsize \
-	    : (fragroundup(fs, blkoff(fs, (dip)->di_size))))
-
-/* Don't include dirent.h lest we get confused, but we still want this. */
-#define IFTODT(mode) (((mode) & 0170000) >> 12)
-#define DT_DIR IFTODT (IFDIR)
-
-/* missing macros */
-
-/* Convert bytes to disk blocks */
-#define btodb(bytes) ((bytes) / DEV_BSIZE)
-
-
-
-/* End GNU Hurd additions */	
-
-
-#define	MAXDUP		10	/* limit on dup blks (per inode) */
-#define	MAXBAD		10	/* limit on bad blks (per inode) */
-#define	MAXBUFSPACE	40*1024	/* maximum space to allocate to buffers */
-#define	INOBUFSIZE	56*1024	/* size of buffer to read inodes in pass1 */
-
-#ifndef BUFSIZ
-#define BUFSIZ 1024
-#endif
-
-#define	USTATE	01		/* inode not allocated */
-#define	FSTATE	02		/* inode is file */
-#define	DSTATE	03		/* inode is directory */
-#define	DFOUND	04		/* directory found during descent */
-#define	DCLEAR	05		/* directory is to be cleared */
-#define	FCLEAR	06		/* file is to be cleared */
-
-/*
- * buffer cache structure.
- */
-struct bufarea {
-	struct bufarea	*b_next;		/* free list queue */
-	struct bufarea	*b_prev;		/* free list queue */
-	daddr_t	b_bno;
-	int	b_size;
-	int	b_errs;
-	int	b_flags;
-	union {
-		char	*b_buf;			/* buffer space */
-		daddr_t	*b_indir;		/* indirect block */
-		struct	fs *b_fs;		/* super block */
-		struct	cg *b_cg;		/* cylinder group */
-		struct	dinode *b_dinode;	/* inode block */
-	} b_un;
-	char	b_dirty;
-};
-
-#define	B_INUSE 1
-
-#define	MINBUFS		5	/* minimum number of buffers required */
-struct bufarea bufhead;		/* head of list of other blks in filesys */
-struct bufarea sblk;		/* file system superblock */
-struct bufarea cgblk;		/* cylinder group blocks */
-struct bufarea *pdirbp;		/* current directory contents */
-struct bufarea *pbp;		/* current inode block */
-struct bufarea *getdatablk();
-
-#define	dirty(bp)	(bp)->b_dirty = 1
-#define	initbarea(bp) \
-	(bp)->b_dirty = 0; \
-	(bp)->b_bno = (daddr_t)-1; \
-	(bp)->b_flags = 0;
-
-#define	sbdirty()	sblk.b_dirty = 1
-#define	cgdirty()	cgblk.b_dirty = 1
-#define	sblock		(*sblk.b_un.b_fs)
-#define	cgrp		(*cgblk.b_un.b_cg)
-
-enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE};
-
-struct inodesc {
-	enum fixstate id_fix;	/* policy on fixing errors */
-	int (*id_func)();	/* function to be applied to blocks of inode */
-	ino_t id_number;	/* inode number described */
-	ino_t id_parent;	/* for DATA nodes, their parent */
-	daddr_t id_blkno;	/* current block number being examined */
-	int id_numfrags;	/* number of frags contained in block */
-	quad_t id_filesize;	/* for DATA nodes, the size of the directory */
-	int id_loc;		/* for DATA nodes, current location in dir */
-	int id_entryno;		/* for DATA nodes, current entry number */
-	struct direct *id_dirp;	/* for DATA nodes, ptr to current entry */
-	char *id_name;		/* for DATA nodes, name to find or enter */
-	char id_type;		/* type of descriptor, DATA or ADDR */
-};
-/* file types */
-#define	DATA	1
-#define	ADDR	2
-
-/*
- * Linked list of duplicate blocks.
- * 
- * The list is composed of two parts. The first part of the
- * list (from duplist through the node pointed to by muldup)
- * contains a single copy of each duplicate block that has been 
- * found. The second part of the list (from muldup to the end)
- * contains duplicate blocks that have been found more than once.
- * To check if a block has been found as a duplicate it is only
- * necessary to search from duplist through muldup. To find the 
- * total number of times that a block has been found as a duplicate
- * the entire list must be searched for occurrences of the block
- * in question. The following diagram shows a sample list where
- * w (found twice), x (found once), y (found three times), and z
- * (found once) are duplicate block numbers:
- *
- *    w -> y -> x -> z -> y -> w -> y
- *    ^		     ^
- *    |		     |
- * duplist	  muldup
- */
-struct dups {
-	struct dups *next;
-	daddr_t dup;
-};
-struct dups *duplist;		/* head of dup list */
-struct dups *muldup;		/* end of unique duplicate dup block numbers */
-
-/*
- * Linked list of inodes with zero link counts.
- */
-struct zlncnt {
-	struct zlncnt *next;
-	ino_t zlncnt;
-};
-struct zlncnt *zlnhead;		/* head of zero link count list */
-
-/*
- * Inode cache data structures.
- */
-struct inoinfo {
-	struct	inoinfo *i_nexthash;	/* next entry in hash chain */
-	ino_t	i_number;		/* inode number of this entry */
-	ino_t	i_parent;		/* inode number of parent */
-	ino_t	i_dotdot;		/* inode number of `..' */
-	size_t	i_isize;		/* size of inode */
-	u_int	i_numblks;		/* size of block array in bytes */
-	daddr_t	i_blks[1];		/* actually longer */
-} **inphead, **inpsort;
-long numdirs, listmax, inplast;
-
-char	*cdevname;		/* name of device being checked */
-long	dev_bsize;		/* computed value of DEV_BSIZE */
-long	secsize;		/* actual disk sector size */
-char	nflag;			/* assume a no response */
-char	yflag;			/* assume a yes response */
-int	bflag;			/* location of alternate super block */
-int	debug;			/* output debugging info */
-int	cvtlevel;		/* convert to newer file system format */
-int	doinglevel1;		/* converting to new cylinder group format */
-int	doinglevel2;		/* converting to new inode format */
-int	newinofmt;		/* filesystem has new inode format */
-char	preen;			/* just fix normal inconsistencies */
-char	hotroot;		/* checking root device */
-char	havesb;			/* superblock has been read */
-int	fsmodified;		/* 1 => write done to file system */
-int	fsreadfd;		/* file descriptor for reading file system */
-int	fswritefd;		/* file descriptor for writing file system */
-
-daddr_t	maxfsblock;		/* number of blocks in the file system */
-char	*blockmap;		/* ptr to primary blk allocation map */
-ino_t	maxino;			/* number of inodes in file system */
-ino_t	lastino;		/* last inode in use */
-char	*statemap;		/* ptr to inode state table */
-char	*typemap;		/* ptr to inode type table */
-short	*lncntp;		/* ptr to link count table */
-
-ino_t	lfdir;			/* lost & found directory inode number */
-char	*lfname;		/* lost & found directory name */
-int	lfmode;			/* lost & found directory creation mode */
-
-daddr_t	n_blks;			/* number of blocks in use */
-daddr_t	n_files;		/* number of files in use */
-
-#define	clearinode(dp)	(*(dp) = zino)
-struct	dinode zino;
-
-#define	setbmap(blkno)	setbit(blockmap, blkno)
-#define	testbmap(blkno)	isset(blockmap, blkno)
-#define	clrbmap(blkno)	clrbit(blockmap, blkno)
-
-#define	STOP	0x01
-#define	SKIP	0x02
-#define	KEEPON	0x04
-#define	ALTERED	0x08
-#define	FOUND	0x10
-
-time_t time();
-struct dinode *ginode();
-struct inoinfo *getinoinfo();
-void getblk();
-ino_t allocino();
-int findino();
diff --git a/bsdfsck/inode.c b/bsdfsck/inode.c
deleted file mode 100644
index 7b48aef6..00000000
--- a/bsdfsck/inode.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)inode.c	8.4 (Berkeley) 4/18/94";*/
-static char *rcsid = "$Id: inode.c,v 1.6 1994/10/05 17:05:30 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-#ifndef SMALL
-#include <pwd.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include "fsck.h"
-
-static ino_t startinum;
-
-ckinode(dp, idesc)
-	struct dinode *dp;
-	register struct inodesc *idesc;
-{
-	register daddr_t *ap;
-	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;
-	mode = DI_MODE(dp) & IFMT;
-	if (mode == IFBLK || mode == IFCHR
-	    || (mode == IFLNK && sblock.fs_maxsymlinklen != -1 &&
-		(dp->di_size < sblock.fs_maxsymlinklen
-		 || (sblock.fs_maxsymlinklen == 0 && dp->di_blocks == 0))))
-		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)
-			idesc->id_numfrags =
-				numfrags(&sblock, fragroundup(&sblock, offset));
-		else
-			idesc->id_numfrags = sblock.fs_frag;
-		if (*ap == 0)
-			continue;
-		idesc->id_blkno = *ap;
-		if (idesc->id_type == ADDR)
-			ret = (*idesc->id_func)(idesc);
-		else
-			ret = dirscan(idesc);
-		if (ret & STOP)
-			return (ret);
-	}
-	idesc->id_numfrags = sblock.fs_frag;
-	remsize = dino.di_size - sblock.fs_bsize * NDADDR;
-	sizepb = sblock.fs_bsize;
-	for (ap = &dino.di_ib[0], n = 1; n <= NIADDR; ap++, n++) {
-		if (*ap) {
-			idesc->id_blkno = *ap;
-			ret = iblock(idesc, n, remsize);
-			if (ret & STOP)
-				return (ret);
-		}
-		sizepb *= NINDIR(&sblock);
-		remsize -= sizepb;
-	}
-	/* GNU Hurd extension. */
-	if (dino.di_trans && idesc->id_type == ADDR)
-	  {
-	    idesc->id_blkno = dino.di_trans;
-	    idesc->id_numfrags = sblock.fs_frag;
-	    return (*idesc->id_func)(idesc);
-	  }
-	return (KEEPON);
-}
-
-iblock(idesc, ilevel, isize)
-	struct inodesc *idesc;
-	long ilevel;
-	quad_t isize;
-{
-	register daddr_t *ap;
-	register daddr_t *aplim;
-	register struct bufarea *bp;
-	int i, n, (*func)(), nif;
-	quad_t sizepb;
-	char buf[BUFSIZ];
-	extern int dirscan(), pass1check();
-
-	if (idesc->id_type == ADDR) {
-		func = idesc->id_func;
-		if (((n = (*func)(idesc)) & KEEPON) == 0)
-			return (n);
-	} else
-		func = dirscan;
-	if (chkrange(idesc->id_blkno, idesc->id_numfrags))
-		return (SKIP);
-	bp = getdatablk(idesc->id_blkno, sblock.fs_bsize);
-	ilevel--;
-	for (sizepb = sblock.fs_bsize, i = 0; i < ilevel; i++)
-		sizepb *= NINDIR(&sblock);
-	nif = howmany(isize , sizepb);
-	if (nif > NINDIR(&sblock))
-		nif = NINDIR(&sblock);
-	if (idesc->id_func == pass1check && nif < NINDIR(&sblock)) {
-		aplim = &bp->b_un.b_indir[NINDIR(&sblock)];
-		for (ap = &bp->b_un.b_indir[nif]; ap < aplim; ap++) {
-			if (*ap == 0)
-				continue;
-			(void)sprintf(buf, "PARTIALLY TRUNCATED INODE I=%lu",
-				idesc->id_number);
-			if (dofix(idesc, buf)) {
-				*ap = 0;
-				dirty(bp);
-			}
-		}
-		flush(fswritefd, bp);
-	}
-	aplim = &bp->b_un.b_indir[nif];
-	for (ap = bp->b_un.b_indir; ap < aplim; ap++) {
-		if (*ap) {
-			idesc->id_blkno = *ap;
-			if (ilevel == 0)
-				n = (*func)(idesc);
-			else
-				n = iblock(idesc, ilevel, isize);
-			if (n & STOP) {
-				bp->b_flags &= ~B_INUSE;
-				return (n);
-			}
-		}
-		isize -= sizepb;
-	}
-	bp->b_flags &= ~B_INUSE;
-	return (KEEPON);
-}
-
-/*
- * Check that a block in a legal block number.
- * Return 0 if in range, 1 if out of range.
- */
-chkrange(blk, cnt)
-	daddr_t blk;
-	int cnt;
-{
-	register int c;
-
-	if ((unsigned)(blk + cnt) > maxfsblock)
-		return (1);
-	c = dtog(&sblock, blk);
-	if (blk < cgdmin(&sblock, c)) {
-		if ((blk + cnt) > cgsblock(&sblock, c)) {
-			if (debug) {
-				printf("blk %ld < cgdmin %ld;",
-				    blk, cgdmin(&sblock, c));
-				printf(" blk + cnt %ld > cgsbase %ld\n",
-				    blk + cnt, cgsblock(&sblock, c));
-			}
-			return (1);
-		}
-	} else {
-		if ((blk + cnt) > cgbase(&sblock, c+1)) {
-			if (debug)  {
-				printf("blk %ld >= cgdmin %ld;",
-				    blk, cgdmin(&sblock, c));
-				printf(" blk + cnt %ld > sblock.fs_fpg %ld\n",
-				    blk+cnt, sblock.fs_fpg);
-			}
-			return (1);
-		}
-	}
-	return (0);
-}
-
-/*
- * General purpose interface for reading inodes.
- */
-struct dinode *
-ginode(inumber)
-	ino_t inumber;
-{
-	daddr_t iblk;
-
-	if (inumber < ROOTINO || inumber > maxino)
-		errexit("bad inode number %d to ginode\n", inumber);
-	if (startinum == 0 ||
-	    inumber < startinum || inumber >= startinum + INOPB(&sblock)) {
-		iblk = ino_to_fsba(&sblock, inumber);
-		if (pbp != 0)
-			pbp->b_flags &= ~B_INUSE;
-		pbp = getdatablk(iblk, sblock.fs_bsize);
-		startinum = (inumber / INOPB(&sblock)) * INOPB(&sblock);
-	}
-	return (&pbp->b_un.b_dinode[inumber % INOPB(&sblock)]);
-}
-
-/*
- * Special purpose version of ginode used to optimize first pass
- * over all the inodes in numerical order.
- */
-ino_t nextino, lastinum;
-long readcnt, readpercg, fullcnt, inobufsize, partialcnt, partialsize;
-struct dinode *inodebuf;
-
-struct dinode *
-getnextinode(inumber)
-	ino_t inumber;
-{
-	long size;
-	daddr_t dblk;
-	static struct dinode *dp;
-
-	if (inumber != nextino++ || inumber > maxino)
-		errexit("bad inode number %d to nextinode\n", inumber);
-	if (inumber >= lastinum) {
-		readcnt++;
-		dblk = fsbtodb(&sblock, ino_to_fsba(&sblock, lastinum));
-		if (readcnt % readpercg == 0) {
-			size = partialsize;
-			lastinum += partialcnt;
-		} else {
-			size = inobufsize;
-			lastinum += fullcnt;
-		}
-		(void)bread(fsreadfd, (char *)inodebuf, dblk, size); /* ??? */
-		dp = inodebuf;
-	}
-	return (dp++);
-}
-
-resetinodebuf()
-{
-
-	startinum = 0;
-	nextino = 0;
-	lastinum = 0;
-	readcnt = 0;
-	inobufsize = blkroundup(&sblock, INOBUFSIZE);
-	fullcnt = inobufsize / sizeof(struct dinode);
-	readpercg = sblock.fs_ipg / fullcnt;
-	partialcnt = sblock.fs_ipg % fullcnt;
-	partialsize = partialcnt * sizeof(struct dinode);
-	if (partialcnt != 0) {
-		readpercg++;
-	} else {
-		partialcnt = fullcnt;
-		partialsize = inobufsize;
-	}
-	if (inodebuf == NULL &&
-	    (inodebuf = (struct dinode *)malloc((unsigned)inobufsize)) == NULL)
-		errexit("Cannot allocate space for inode buffer\n");
-	while (nextino < ROOTINO)
-		(void)getnextinode(nextino);
-}
-
-freeinodebuf()
-{
-
-	if (inodebuf != NULL)
-		free((char *)inodebuf);
-	inodebuf = NULL;
-}
-
-/*
- * Routines to maintain information about directory inodes.
- * This is built during the first pass and used during the
- * second and third passes.
- *
- * Enter inodes into the cache.
- */
-cacheino(dp, inumber)
-	register struct dinode *dp;
-	ino_t inumber;
-{
-	register struct inoinfo *inp;
-	struct inoinfo **inpp;
-	unsigned int blks;
-
-	blks = howmany(dp->di_size, sblock.fs_bsize);
-	if (blks > NDADDR)
-		blks = NDADDR + NIADDR;
-	inp = (struct inoinfo *)
-		malloc(sizeof(*inp) + (blks - 1) * sizeof(daddr_t));
-	if (inp == NULL)
-		return;
-	inpp = &inphead[inumber % numdirs];
-	inp->i_nexthash = *inpp;
-	*inpp = inp;
-	inp->i_parent = (ino_t)0;
-	inp->i_dotdot = (ino_t)0;
-	inp->i_number = inumber;
-	inp->i_isize = dp->di_size;
-	inp->i_numblks = blks * sizeof(daddr_t);
-	bcopy((char *)&dp->di_db[0], (char *)&inp->i_blks[0],
-	    (size_t)inp->i_numblks);
-	if (inplast == listmax) {
-		listmax += 100;
-		inpsort = (struct inoinfo **)realloc((char *)inpsort,
-		    (unsigned)listmax * sizeof(struct inoinfo *));
-		if (inpsort == NULL)
-			errexit("cannot increase directory list");
-	}
-	inpsort[inplast++] = inp;
-}
-
-/*
- * Look up an inode cache structure.
- */
-struct inoinfo *
-getinoinfo(inumber)
-	ino_t inumber;
-{
-	register struct inoinfo *inp;
-
-	for (inp = inphead[inumber % numdirs]; inp; inp = inp->i_nexthash) {
-		if (inp->i_number != inumber)
-			continue;
-		return (inp);
-	}
-	errexit("cannot find inode %d\n", inumber);
-	return ((struct inoinfo *)0);
-}
-
-/*
- * Clean up all the inode cache structure.
- */
-inocleanup()
-{
-	register struct inoinfo **inpp;
-
-	if (inphead == NULL)
-		return;
-	for (inpp = &inpsort[inplast - 1]; inpp >= inpsort; inpp--)
-		free((char *)(*inpp));
-	free((char *)inphead);
-	free((char *)inpsort);
-	inphead = inpsort = NULL;
-}
-	
-inodirty()
-{
-	
-	dirty(pbp);
-}
-
-clri(idesc, type, flag)
-	register struct inodesc *idesc;
-	char *type;
-	int flag;
-{
-	register struct dinode *dp;
-
-	dp = ginode(idesc->id_number);
-	if (flag == 1) {
-		pwarn("%s %s", type,
-		    (DI_MODE(dp) & IFMT) == IFDIR ? "DIR" : "FILE");
-		pinode(idesc->id_number);
-	}
-	if (preen || reply("CLEAR") == 1) {
-		if (preen)
-			printf(" (CLEARED)\n");
-		n_files--;
-		(void)ckinode(dp, idesc);
-		clearinode(dp);
-		statemap[idesc->id_number] = USTATE;
-		inodirty();
-	}
-}
-
-findname(idesc)
-	struct inodesc *idesc;
-{
-	register struct direct *dirp = idesc->id_dirp;
-
-	if (dirp->d_ino != idesc->id_parent)
-		return (KEEPON);
-	bcopy(dirp->d_name, idesc->id_name, (size_t)dirp->d_namlen + 1);
-	return (STOP|FOUND);
-}
-
-findino(idesc)
-	struct inodesc *idesc;
-{
-	register struct direct *dirp = idesc->id_dirp;
-
-	if (dirp->d_ino == 0)
-		return (KEEPON);
-	if (strcmp(dirp->d_name, idesc->id_name) == 0 &&
-	    dirp->d_ino >= ROOTINO && dirp->d_ino <= maxino) {
-		idesc->id_parent = dirp->d_ino;
-		return (STOP|FOUND);
-	}
-	return (KEEPON);
-}
-
-pinode(ino)
-	ino_t ino;
-{
-	register struct dinode *dp;
-	register char *p;
-	struct passwd *pw;
-	char *ctime();
-
-	printf(" I=%lu ", ino);
-	if (ino < ROOTINO || ino > maxino)
-		return;
-	dp = ginode(ino);
-	printf(" OWNER=");
-#ifndef SMALL
-	if ((pw = getpwuid((int)dp->di_uid)) != 0)
-		printf("%s ", pw->pw_name);
-	else
-#endif
-		printf("%u ", (unsigned)dp->di_uid);
-	printf("MODE=%o\n", DI_MODE(dp));
-	if (preen)
-		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]);
-}
-
-blkerror(ino, type, blk)
-	ino_t ino;
-	char *type;
-	daddr_t blk;
-{
-
-	pfatal("%ld %s I=%lu", blk, type, ino);
-	printf("\n");
-	switch (statemap[ino]) {
-
-	case FSTATE:
-		statemap[ino] = FCLEAR;
-		return;
-
-	case DSTATE:
-		statemap[ino] = DCLEAR;
-		return;
-
-	case FCLEAR:
-	case DCLEAR:
-		return;
-
-	default:
-		errexit("BAD STATE %d TO BLKERR", statemap[ino]);
-		/* NOTREACHED */
-	}
-}
-
-/*
- * allocate an unused inode
- */
-ino_t
-allocino(request, type)
-	ino_t request;
-	int type;
-{
-	register ino_t ino;
-	register struct dinode *dp;
-
-	if (request == 0)
-		request = ROOTINO;
-	else if (statemap[request] != USTATE)
-		return (0);
-	for (ino = request; ino < maxino; ino++)
-		if (statemap[ino] == USTATE)
-			break;
-	if (ino == maxino)
-		return (0);
-	switch (type & IFMT) {
-	case IFDIR:
-		statemap[ino] = DSTATE;
-		break;
-	case IFREG:
-	case IFLNK:
-		statemap[ino] = FSTATE;
-		break;
-	default:
-		return (0);
-	}
-	dp = ginode(ino);
-	dp->di_db[0] = allocblk((long)1);
-	if (dp->di_db[0] == 0) {
-		statemap[ino] = USTATE;
-		return (0);
-	}
-#if 0
-	dp->di_mode = type;
-#else
-	dp->di_modeh = (type & 0xffff0000) >> 16;
-	dp->di_model = (type & 0x0000ffff);
-#endif	
-	(void)time(&dp->di_atime.ts_sec);
-	dp->di_mtime = dp->di_ctime = dp->di_atime;
-	dp->di_size = sblock.fs_fsize;
-	dp->di_blocks = btodb(sblock.fs_fsize);
-	n_files++;
-	inodirty();
-	if (newinofmt)
-		typemap[ino] = IFTODT(type);
-	return (ino);
-}
-
-/*
- * deallocate an inode
- */
-freeino(ino)
-	ino_t ino;
-{
-	struct inodesc idesc;
-	extern int pass4check();
-	struct dinode *dp;
-
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	idesc.id_type = ADDR;
-	idesc.id_func = pass4check;
-	idesc.id_number = ino;
-	dp = ginode(ino);
-	(void)ckinode(dp, &idesc);
-	clearinode(dp);
-	inodirty();
-	statemap[ino] = USTATE;
-	n_files--;
-}
diff --git a/bsdfsck/main.c b/bsdfsck/main.c
deleted file mode 100644
index adf84f74..00000000
--- a/bsdfsck/main.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * 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
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)main.c	8.2 (Berkeley) 1/23/94";*/
-static char *rcsid = "$Id: main.c,v 1.4 1994/08/26 18:06:30 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-/*#include <sys/mount.h> */
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-/* #include <fstab.h> */
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include "fsck.h"
-
-void	catch(), catchquit(), voidquit();
-int	returntosingle;
-
-/* GNU Hurd patch */
-#define blockcheck(a) (a)
-
-main(argc, argv)
-	int	argc;
-	char	*argv[];
-{
-	int ch;
-	int ret, maxrun = 0;
-	extern int docheck(), checkfilesys();
-	extern char *optarg;
-/*	extern char *blockcheck(); */
-	extern int optind;
-
-	sync();
-	while ((ch = getopt(argc, argv, "dpnNyYb:c:l:m:")) != EOF) {
-		switch (ch) {
-		case 'p':
-			preen++;
-			break;
-
-		case 'b':
-			bflag = argtoi('b', "number", optarg, 10);
-			printf("Alternate super block location: %d\n", bflag);
-			break;
-
-		case 'c':
-			cvtlevel = argtoi('c', "conversion level", optarg, 10);
-			break;
-		
-		case 'd':
-			debug++;
-			break;
-
-		case 'l':
-			maxrun = argtoi('l', "number", optarg, 10);
-			break;
-
-		case 'm':
-			lfmode = argtoi('m', "mode", optarg, 8);
-			if (lfmode &~ 07777)
-				errexit("bad mode to -m: %o\n", lfmode);
-			printf("** lost+found creation mode %o\n", lfmode);
-			break;
-
-		case 'n':
-		case 'N':
-			nflag++;
-			yflag = 0;
-			break;
-
-		case 'y':
-		case 'Y':
-			yflag++;
-			nflag = 0;
-			break;
-
-		default:
-			errexit("%c option?\n", ch);
-		}
-	}
-	argc -= optind;
-	argv += optind;
-	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-		(void)signal(SIGINT, catch);
-	if (preen)
-		(void)signal(SIGQUIT, catchquit);
-	if (argc) {
-		while (argc-- > 0)
-			(void)checkfilesys(blockcheck(*argv++), 0, 0L, 0);
-		exit(0);
-	}
-	fprintf (stderr, "You must explicitly name the filesystem to check\n");
-	exit (1);
-#if 0
-	ret = checkfstab(preen, maxrun, docheck, checkfilesys);
-	if (returntosingle)
-		exit(2);
-	exit(ret);
-#endif
-}
-
-argtoi(flag, req, str, base)
-	int flag;
-	char *req, *str;
-	int base;
-{
-	char *cp;
-	int ret;
-
-	ret = (int)strtol(str, &cp, base);
-	if (cp == str || *cp)
-		errexit("-%c flag requires a %s\n", flag, req);
-	return (ret);
-}
-
-#if 0
-/*
- * Determine whether a filesystem should be checked.
- */
-docheck(fsp)
-	register struct fstab *fsp;
-{
-
-	if (strcmp(fsp->fs_vfstype, "ufs") ||
-	    (strcmp(fsp->fs_type, FSTAB_RW) &&
-	     strcmp(fsp->fs_type, FSTAB_RO)) ||
-	    fsp->fs_passno == 0)
-		return (0);
-	return (1);
-}
-#endif
-
-/*
- * Check the specified filesystem.
- */
-/* ARGSUSED */
-checkfilesys(filesys, mntpt, auxdata, child)
-	char *filesys, *mntpt;
-	long auxdata;
-{
-	daddr_t n_ffree, n_bfree;
-	struct dups *dp;
-	struct zlncnt *zlnp;
-	int cylno;
-
-	if (preen && child)
-		(void)signal(SIGQUIT, voidquit);
-	cdevname = filesys;
-	if (debug && preen)
-		pwarn("starting\n");
-	if (setup(filesys) == 0) {
-		if (preen)
-			pfatal("CAN'T CHECK FILE SYSTEM.");
-		return (0);
-	}
-	/*
-	 * 1: scan inodes tallying blocks used
-	 */
-	if (preen == 0) {
-		printf("** Last Mounted on %s\n", sblock.fs_fsmnt);
-#if 0
-		if (hotroot)
-			printf("** Root file system\n");
-#endif
-		printf("** Phase 1 - Check Blocks and Sizes\n");
-	}
-	pass1();
-
-	/*
-	 * 1b: locate first references to duplicates, if any
-	 */
-	if (duplist) {
-		if (preen)
-			pfatal("INTERNAL ERROR: dups with -p");
-		printf("** Phase 1b - Rescan For More DUPS\n");
-		pass1b();
-	}
-
-	/*
-	 * 2: traverse directories from root to mark all connected directories
-	 */
-	if (preen == 0)
-		printf("** Phase 2 - Check Pathnames\n");
-	pass2();
-
-	/*
-	 * 3: scan inodes looking for disconnected directories
-	 */
-	if (preen == 0)
-		printf("** Phase 3 - Check Connectivity\n");
-	pass3();
-
-	/*
-	 * 4: scan inodes looking for disconnected files; check reference counts
-	 */
-	if (preen == 0)
-		printf("** Phase 4 - Check Reference Counts\n");
-	pass4();
-
-	/*
-	 * 5: check and repair resource counts in cylinder groups
-	 */
-	if (preen == 0)
-		printf("** Phase 5 - Check Cyl groups\n");
-	pass5();
-
-	/*
-	 * print out summary statistics
-	 */
-	n_ffree = sblock.fs_cstotal.cs_nffree;
-	n_bfree = sblock.fs_cstotal.cs_nbfree;
-	pwarn("%ld files, %ld used, %ld free ",
-	    n_files, n_blks, n_ffree + sblock.fs_frag * n_bfree);
-	printf("(%ld frags, %ld blocks, %d.%d%% fragmentation)\n",
-	    n_ffree, n_bfree, (n_ffree * 100) / sblock.fs_dsize,
-	    ((n_ffree * 1000 + sblock.fs_dsize / 2) / sblock.fs_dsize) % 10);
-	if (debug &&
-	    (n_files -= maxino - ROOTINO - sblock.fs_cstotal.cs_nifree))
-		printf("%ld files missing\n", n_files);
-	if (debug) {
-		n_blks += sblock.fs_ncg *
-			(cgdmin(&sblock, 0) - cgsblock(&sblock, 0));
-		n_blks += cgsblock(&sblock, 0) - cgbase(&sblock, 0);
-		n_blks += howmany(sblock.fs_cssize, sblock.fs_fsize);
-		if (n_blks -= maxfsblock - (n_ffree + sblock.fs_frag * n_bfree))
-			printf("%ld blocks missing\n", n_blks);
-		if (duplist != NULL) {
-			printf("The following duplicate blocks remain:");
-			for (dp = duplist; dp; dp = dp->next)
-				printf(" %ld,", dp->dup);
-			printf("\n");
-		}
-		if (zlnhead != NULL) {
-			printf("The following zero link count inodes remain:");
-			for (zlnp = zlnhead; zlnp; zlnp = zlnp->next)
-				printf(" %lu,", zlnp->zlncnt);
-			printf("\n");
-		}
-	}
-	zlnhead = (struct zlncnt *)0;
-	duplist = (struct dups *)0;
-	muldup = (struct dups *)0;
-	inocleanup();
-	if (fsmodified) {
-		(void)time(&sblock.fs_time);
-		sbdirty();
-	}
-	if (cvtlevel && sblk.b_dirty) {
-		/* 
-		 * Write out the duplicate super blocks
-		 */
-		for (cylno = 0; cylno < sblock.fs_ncg; cylno++)
-			bwrite(fswritefd, (char *)&sblock,
-			    fsbtodb(&sblock, cgsblock(&sblock, cylno)), SBSIZE);
-	}
-	ckfini();
-	free(blockmap);
-	free(statemap);
-	free((char *)lncntp);
-	if (!fsmodified)
-		return (0);
-	if (!preen)
-		printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");
-#if 0
-	if (hotroot) {
-		struct statfs stfs_buf;
-		/*
-		 * We modified the root.  Do a mount update on
-		 * it, unless it is read-write, so we can continue.
-		 */
-		if (statfs("/", &stfs_buf) == 0) {
-			long flags = stfs_buf.f_flags;
-			struct ufs_args args;
-			int ret;
-
-			if (flags & MNT_RDONLY) {
-				args.fspec = 0;
-				args.export.ex_flags = 0;
-				args.export.ex_root = 0;
-				flags |= MNT_UPDATE | MNT_RELOAD;
-				ret = mount(MOUNT_UFS, "/", flags, &args);
-				if (ret == 0)
-					return(0);
-			}
-		}
-		if (!preen)
-			printf("\n***** REBOOT NOW *****\n");
-		sync();
-		return (4);
-	}
-#endif
-	return (0);
-}
diff --git a/bsdfsck/pass1.c b/bsdfsck/pass1.c
deleted file mode 100644
index 46b0e109..00000000
--- a/bsdfsck/pass1.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)pass1.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: pass1.c,v 1.4 1994/10/05 16:53:12 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-#include <stdlib.h>
-#include <string.h>
-#include "fsck.h"
-
-static daddr_t badblk;
-static daddr_t dupblk;
-int pass1check();
-struct dinode *getnextinode();
-
-pass1()
-{
-	ino_t inumber;
-	int c, i, cgd;
-	struct inodesc idesc;
-
-	/*
-	 * Set file system reserved blocks in used block map.
-	 */
-	for (c = 0; c < sblock.fs_ncg; c++) {
-		cgd = cgdmin(&sblock, c);
-		if (c == 0) {
-			i = cgbase(&sblock, c);
-			cgd += howmany(sblock.fs_cssize, sblock.fs_fsize);
-		} else
-			i = cgsblock(&sblock, c);
-		for (; i < cgd; i++)
-			setbmap(i);
-	}
-	/*
-	 * Find all allocated blocks.
-	 */
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	idesc.id_type = ADDR;
-	idesc.id_func = pass1check;
-	inumber = 0;
-	n_files = n_blks = 0;
-	resetinodebuf();
-	for (c = 0; c < sblock.fs_ncg; c++) {
-		for (i = 0; i < sblock.fs_ipg; i++, inumber++) {
-			if (inumber < ROOTINO)
-				continue;
-			checkinode(inumber, &idesc);
-		}
-	}
-	freeinodebuf();
-}
-
-checkinode(inumber, idesc)
-	ino_t inumber;
-	register struct inodesc *idesc;
-{
-	register struct dinode *dp;
-	struct zlncnt *zlnp;
-	int ndb, j;
-	mode_t mode;
-	char *symbuf;
-
-	dp = getnextinode(inumber);
-	mode = DI_MODE(dp) & IFMT;
-	if (mode == 0) {
-		/* Check for DI_TRANS here is a GNU Hurd addition. */
-		if (bcmp((char *)dp->di_db, (char *)zino.di_db,
-			NDADDR * sizeof(daddr_t)) ||
-		    bcmp((char *)dp->di_ib, (char *)zino.di_ib,
-			NIADDR * sizeof(daddr_t)) ||
-		    DI_MODE(dp) || dp->di_size || dp->di_trans) {
-			pfatal("PARTIALLY ALLOCATED INODE I=%lu", inumber);
-			if (reply("CLEAR") == 1) {
-				dp = ginode(inumber);
-				clearinode(dp);
-				inodirty();
-			}
-		}
-		statemap[inumber] = USTATE;
-		return;
-	}
-	lastino = inumber;
-	if (/* dp->di_size < 0 || */
-	    dp->di_size + sblock.fs_bsize - 1 < dp->di_size) {
-		if (debug)
-			printf("bad size %qu:", dp->di_size);
-		goto unknown;
-	}
-	if (!preen && mode == IFMT && reply("HOLD BAD BLOCK") == 1) {
-		dp = ginode(inumber);
-		dp->di_size = sblock.fs_fsize;
-#if 0
-		dp->di_mode = IFREG|0600;
-#else
-		dp->di_modeh = 0;
-		dp->di_model = IFREG|0600;
-#endif		
-		inodirty();
-	}
-	ndb = howmany(dp->di_size, sblock.fs_bsize);
-	if (ndb < 0) {
-		if (debug)
-			printf("bad size %qu ndb %d:",
-				dp->di_size, ndb);
-		goto unknown;
-	}
-	if (mode == IFBLK || mode == IFCHR)
-		ndb++;
-	if (mode == IFLNK) {
-		/*
-		 * Note that the old fastlink format always had di_blocks set
-		 * to 0.  Other than that we no longer use the `spare' field
-		 * (which is now the extended uid) for sanity checking, the
-		 * new format is the same as the old.  We simply ignore the
-		 * conversion altogether.  - mycroft, 19MAY1994
-		 */
-		if (doinglevel2 &&
-		    dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN &&
-		    dp->di_blocks != 0) {
-			symbuf = alloca(secsize);
-			if (bread(fsreadfd, symbuf,
-			    fsbtodb(&sblock, dp->di_db[0]),
-			    (long)secsize) != 0)
-				errexit("cannot read symlink");
-			if (debug) {
-				symbuf[dp->di_size] = 0;
-				printf("convert symlink %d(%s) of size %d\n",
-					inumber, symbuf, (long)dp->di_size);
-			}
-			dp = ginode(inumber);
-			bcopy(symbuf, (caddr_t)dp->di_shortlink,
-			    (long)dp->di_size);
-			dp->di_blocks = 0;
-			inodirty();
-		}
-		/*
-		 * Fake ndb value so direct/indirect block checks below
-		 * will detect any garbage after symlink string.
-		 */
-		if (sblock.fs_maxsymlinklen != -1 &&
-		    (dp->di_size < sblock.fs_maxsymlinklen ||
-		     (sblock.fs_maxsymlinklen == 0 && dp->di_blocks == 0))) {
-			ndb = howmany(dp->di_size, sizeof(daddr_t));
-			if (ndb > NDADDR) {
-				j = ndb - NDADDR;
-				for (ndb = 1; j > 1; j--)
-					ndb *= NINDIR(&sblock);
-				ndb += NDADDR;
-			}
-		}
-	}
-	for (j = ndb; j < NDADDR; j++)
-		if (dp->di_db[j] != 0) {
-			if (debug)
-				printf("bad direct addr: %ld\n", dp->di_db[j]);
-			goto unknown;
-		}
-	for (j = 0, ndb -= NDADDR; ndb > 0; j++)
-		ndb /= NINDIR(&sblock);
-	for (; j < NIADDR; j++)
-		if (dp->di_ib[j] != 0) {
-			if (debug)
-				printf("bad indirect addr: %ld\n",
-					dp->di_ib[j]);
-			goto unknown;
-		}
-	if (ftypeok(dp) == 0)
-		goto unknown;
-	n_files++;
-	lncntp[inumber] = dp->di_nlink;
-	if (dp->di_nlink <= 0) {
-		zlnp = (struct zlncnt *)malloc(sizeof *zlnp);
-		if (zlnp == NULL) {
-			pfatal("LINK COUNT TABLE OVERFLOW");
-			if (reply("CONTINUE") == 0)
-				errexit("");
-		} else {
-			zlnp->zlncnt = inumber;
-			zlnp->next = zlnhead;
-			zlnhead = zlnp;
-		}
-	}
-	if (mode == IFDIR) {
-		if (dp->di_size == 0)
-			statemap[inumber] = DCLEAR;
-		else
-			statemap[inumber] = DSTATE;
-		cacheino(dp, inumber);
-	} else
-		statemap[inumber] = FSTATE;
-	typemap[inumber] = IFTODT(mode);
-	if (doinglevel2 &&
-	    (dp->di_ouid != (u_short)-1 || dp->di_ogid != (u_short)-1)) {
-		dp = ginode(inumber);
-		dp->di_uid = dp->di_ouid;
-		dp->di_ouid = -1;
-		dp->di_gid = dp->di_ogid;
-		dp->di_ogid = -1;
-		inodirty();
-	}
-	badblk = dupblk = 0;
-	idesc->id_number = inumber;
-	(void)ckinode(dp, idesc);
-	idesc->id_entryno *= btodb(sblock.fs_fsize);
-	if (dp->di_blocks != idesc->id_entryno) {
-		pwarn("INCORRECT BLOCK COUNT I=%lu (%ld should be %ld)",
-		    inumber, dp->di_blocks, idesc->id_entryno);
-		if (preen)
-			printf(" (CORRECTED)\n");
-		else if (reply("CORRECT") == 0)
-			return;
-		dp = ginode(inumber);
-		dp->di_blocks = idesc->id_entryno;
-		inodirty();
-	}
-	return;
-unknown:
-	pfatal("UNKNOWN FILE TYPE I=%lu", inumber);
-	statemap[inumber] = FCLEAR;
-	if (reply("CLEAR") == 1) {
-		statemap[inumber] = USTATE;
-		dp = ginode(inumber);
-		clearinode(dp);
-		inodirty();
-	}
-}
-
-pass1check(idesc)
-	register struct inodesc *idesc;
-{
-	int res = KEEPON;
-	int anyout, nfrags;
-	daddr_t blkno = idesc->id_blkno;
-	register struct dups *dlp;
-	struct dups *new;
-
-	if ((anyout = chkrange(blkno, idesc->id_numfrags)) != 0) {
-		blkerror(idesc->id_number, "BAD", blkno);
-		if (badblk++ >= MAXBAD) {
-			pwarn("EXCESSIVE BAD BLKS I=%lu",
-				idesc->id_number);
-			if (preen)
-				printf(" (SKIPPING)\n");
-			else if (reply("CONTINUE") == 0)
-				errexit("");
-			return (STOP);
-		}
-	}
-	for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
-		if (anyout && chkrange(blkno, 1)) {
-			res = SKIP;
-		} else if (!testbmap(blkno)) {
-			n_blks++;
-			setbmap(blkno);
-		} else {
-			blkerror(idesc->id_number, "DUP", blkno);
-			if (dupblk++ >= MAXDUP) {
-				pwarn("EXCESSIVE DUP BLKS I=%lu",
-					idesc->id_number);
-				if (preen)
-					printf(" (SKIPPING)\n");
-				else if (reply("CONTINUE") == 0)
-					errexit("");
-				return (STOP);
-			}
-			new = (struct dups *)malloc(sizeof(struct dups));
-			if (new == NULL) {
-				pfatal("DUP TABLE OVERFLOW.");
-				if (reply("CONTINUE") == 0)
-					errexit("");
-				return (STOP);
-			}
-			new->dup = blkno;
-			if (muldup == 0) {
-				duplist = muldup = new;
-				new->next = 0;
-			} else {
-				new->next = muldup->next;
-				muldup->next = new;
-			}
-			for (dlp = duplist; dlp != muldup; dlp = dlp->next)
-				if (dlp->dup == blkno)
-					break;
-			if (dlp == muldup && dlp->dup != blkno)
-				muldup = new;
-		}
-		/*
-		 * count the number of blocks found in id_entryno
-		 */
-		idesc->id_entryno++;
-	}
-	return (res);
-}
diff --git a/bsdfsck/pass1b.c b/bsdfsck/pass1b.c
deleted file mode 100644
index f5aadc06..00000000
--- a/bsdfsck/pass1b.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)pass1b.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: pass1b.c,v 1.2 1994/08/23 20:01:24 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-#include <string.h>
-#include "fsck.h"
-
-int	pass1bcheck();
-static  struct dups *duphead;
-
-pass1b()
-{
-	register int c, i;
-	register struct dinode *dp;
-	struct inodesc idesc;
-	ino_t inumber;
-
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	idesc.id_type = ADDR;
-	idesc.id_func = pass1bcheck;
-	duphead = duplist;
-	inumber = 0;
-	for (c = 0; c < sblock.fs_ncg; c++) {
-		for (i = 0; i < sblock.fs_ipg; i++, inumber++) {
-			if (inumber < ROOTINO)
-				continue;
-			dp = ginode(inumber);
-			if (dp == NULL)
-				continue;
-			idesc.id_number = inumber;
-			if (statemap[inumber] != USTATE &&
-			    (ckinode(dp, &idesc) & STOP))
-				return;
-		}
-	}
-}
-
-pass1bcheck(idesc)
-	register struct inodesc *idesc;
-{
-	register struct dups *dlp;
-	int nfrags, res = KEEPON;
-	daddr_t blkno = idesc->id_blkno;
-
-	for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
-		if (chkrange(blkno, 1))
-			res = SKIP;
-		for (dlp = duphead; dlp; dlp = dlp->next) {
-			if (dlp->dup == blkno) {
-				blkerror(idesc->id_number, "DUP", blkno);
-				dlp->dup = duphead->dup;
-				duphead->dup = blkno;
-				duphead = duphead->next;
-			}
-			if (dlp == muldup)
-				break;
-		}
-		if (muldup == 0 || duphead == muldup->next)
-			return (STOP);
-	}
-	return (res);
-}
diff --git a/bsdfsck/pass2.c b/bsdfsck/pass2.c
deleted file mode 100644
index 184106c1..00000000
--- a/bsdfsck/pass2.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)pass2.c	8.2 (Berkeley) 2/27/94";*/
-static char *rcsid = "$Id: pass2.c,v 1.3 1994/08/24 15:11:56 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-#include <stdlib.h>
-#include <string.h>
-#include "fsck.h"
-
-#define MINDIRSIZE	(sizeof (struct dirtemplate))
-
-int	pass2check(), blksort();
-
-pass2()
-{
-	register struct dinode *dp;
-	register struct inoinfo **inpp, *inp;
-	struct inoinfo **inpend;
-	struct inodesc curino;
-	struct dinode dino;
-	char pathbuf[MAXPATHLEN + 1];
-
-	switch (statemap[ROOTINO]) {
-
-	case USTATE:
-		pfatal("ROOT INODE UNALLOCATED");
-		if (reply("ALLOCATE") == 0)
-			errexit("");
-		if (allocdir(ROOTINO, ROOTINO, 0755) != ROOTINO)
-			errexit("CANNOT ALLOCATE ROOT INODE\n");
-		break;
-
-	case DCLEAR:
-		pfatal("DUPS/BAD IN ROOT INODE");
-		if (reply("REALLOCATE")) {
-			freeino(ROOTINO);
-			if (allocdir(ROOTINO, ROOTINO, 0755) != ROOTINO)
-				errexit("CANNOT ALLOCATE ROOT INODE\n");
-			break;
-		}
-		if (reply("CONTINUE") == 0)
-			errexit("");
-		break;
-
-	case FSTATE:
-	case FCLEAR:
-		pfatal("ROOT INODE NOT DIRECTORY");
-		if (reply("REALLOCATE")) {
-			freeino(ROOTINO);
-			if (allocdir(ROOTINO, ROOTINO, 0755) != ROOTINO)
-				errexit("CANNOT ALLOCATE ROOT INODE\n");
-			break;
-		}
-		if (reply("FIX") == 0)
-			errexit("");
-		dp = ginode(ROOTINO);
-#if 0
-		dp->di_mode &= ~IFMT;
-		dp->di_mode |= IFDIR;
-#else
-		dp->di_model &= ~IFMT;
-		dp->di_model |= IFDIR;
-#endif		
-		inodirty();
-		break;
-
-	case DSTATE:
-		break;
-
-	default:
-		errexit("BAD STATE %d FOR ROOT INODE", statemap[ROOTINO]);
-	}
-	statemap[ROOTINO] = DFOUND;
-	/*
-	 * Sort the directory list into disk block order.
-	 */
-	qsort((char *)inpsort, (size_t)inplast, sizeof *inpsort, blksort);
-	/*
-	 * Check the integrity of each directory.
-	 */
-	bzero((char *)&curino, sizeof(struct inodesc));
-	curino.id_type = DATA;
-	curino.id_func = pass2check;
-	dp = &dino;
-	inpend = &inpsort[inplast];
-	for (inpp = inpsort; inpp < inpend; inpp++) {
-		inp = *inpp;
-		if (inp->i_isize == 0)
-			continue;
-		if (inp->i_isize < MINDIRSIZE) {
-			direrror(inp->i_number, "DIRECTORY TOO SHORT");
-			inp->i_isize = roundup(MINDIRSIZE, DIRBLKSIZ);
-			if (reply("FIX") == 1) {
-				dp = ginode(inp->i_number);
-				dp->di_size = inp->i_isize;
-				inodirty();
-				dp = &dino;
-			}
-		} else if ((inp->i_isize & (DIRBLKSIZ - 1)) != 0) {
-			getpathname(pathbuf, inp->i_number, inp->i_number);
-			pwarn("DIRECTORY %s: LENGTH %d NOT MULTIPLE OF %d",
-				pathbuf, inp->i_isize, DIRBLKSIZ);
-			if (preen)
-				printf(" (ADJUSTED)\n");
-			inp->i_isize = roundup(inp->i_isize, DIRBLKSIZ);
-			if (preen || reply("ADJUST") == 1) {
-				dp = ginode(inp->i_number);
-				dp->di_size = roundup(inp->i_isize, DIRBLKSIZ);
-				inodirty();
-				dp = &dino;
-			}
-		}
-		bzero((char *)&dino, sizeof(struct dinode));
-#if 0
-		dino.di_mode = IFDIR;
-#else
-		dino.di_modeh = 0;
-		dino.di_model = IFDIR;
-#endif
-		dp->di_size = inp->i_isize;
-		bcopy((char *)&inp->i_blks[0], (char *)&dp->di_db[0],
-			(size_t)inp->i_numblks);
-		curino.id_number = inp->i_number;
-		curino.id_parent = inp->i_parent;
-		(void)ckinode(dp, &curino);
-	}
-	/*
-	 * Now that the parents of all directories have been found,
-	 * make another pass to verify the value of `..'
-	 */
-	for (inpp = inpsort; inpp < inpend; inpp++) {
-		inp = *inpp;
-		if (inp->i_parent == 0 || inp->i_isize == 0)
-			continue;
-		if (statemap[inp->i_parent] == DFOUND &&
-		    statemap[inp->i_number] == DSTATE)
-			statemap[inp->i_number] = DFOUND;
-		if (inp->i_dotdot == inp->i_parent ||
-		    inp->i_dotdot == (ino_t)-1)
-			continue;
-		if (inp->i_dotdot == 0) {
-			inp->i_dotdot = inp->i_parent;
-			fileerror(inp->i_parent, inp->i_number, "MISSING '..'");
-			if (reply("FIX") == 0)
-				continue;
-			(void)makeentry(inp->i_number, inp->i_parent, "..");
-			lncntp[inp->i_parent]--;
-			continue;
-		}
-		fileerror(inp->i_parent, inp->i_number,
-		    "BAD INODE NUMBER FOR '..'");
-		if (reply("FIX") == 0)
-			continue;
-		lncntp[inp->i_dotdot]++;
-		lncntp[inp->i_parent]--;
-		inp->i_dotdot = inp->i_parent;
-		(void)changeino(inp->i_number, "..", inp->i_parent);
-	}
-	/*
-	 * Mark all the directories that can be found from the root.
-	 */
-	propagate();
-}
-
-pass2check(idesc)
-	struct inodesc *idesc;
-{
-	register struct direct *dirp = idesc->id_dirp;
-	register struct inoinfo *inp;
-	int n, entrysize, ret = 0;
-	struct dinode *dp;
-	char *errmsg;
-	struct direct proto;
-	char namebuf[MAXPATHLEN + 1];
-	char pathbuf[MAXPATHLEN + 1];
-
-	/*
-	 * If converting, set directory entry type.
-	 */
-	if (doinglevel2 && dirp->d_ino > 0 && dirp->d_ino < maxino) {
-		dirp->d_type = typemap[dirp->d_ino];
-		ret |= ALTERED;
-	}
-	/* 
-	 * check for "."
-	 */
-	if (idesc->id_entryno != 0)
-		goto chk1;
-	if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") == 0) {
-		if (dirp->d_ino != idesc->id_number) {
-			direrror(idesc->id_number, "BAD INODE NUMBER FOR '.'");
-			dirp->d_ino = idesc->id_number;
-			if (reply("FIX") == 1)
-				ret |= ALTERED;
-		}
-		if (newinofmt && dirp->d_type != DT_DIR) {
-			direrror(idesc->id_number, "BAD TYPE VALUE FOR '.'");
-			dirp->d_type = DT_DIR;
-			if (reply("FIX") == 1)
-				ret |= ALTERED;
-		}
-		goto chk1;
-	}
-	direrror(idesc->id_number, "MISSING '.'");
-	proto.d_ino = idesc->id_number;
-	if (newinofmt)
-		proto.d_type = DT_DIR;
-	else
-		proto.d_type = 0;
-	proto.d_namlen = 1;
-	(void)strcpy(proto.d_name, ".");
-	entrysize = DIRSIZ(0, &proto);
-	if (dirp->d_ino != 0 && strcmp(dirp->d_name, "..") != 0) {
-		pfatal("CANNOT FIX, FIRST ENTRY IN DIRECTORY CONTAINS %s\n",
-			dirp->d_name);
-	} else if (dirp->d_reclen < entrysize) {
-		pfatal("CANNOT FIX, INSUFFICIENT SPACE TO ADD '.'\n");
-	} else if (dirp->d_reclen < 2 * entrysize) {
-		proto.d_reclen = dirp->d_reclen;
-		bcopy((char *)&proto, (char *)dirp, (size_t)entrysize);
-		if (reply("FIX") == 1)
-			ret |= ALTERED;
-	} else {
-		n = dirp->d_reclen - entrysize;
-		proto.d_reclen = entrysize;
-		bcopy((char *)&proto, (char *)dirp, (size_t)entrysize);
-		idesc->id_entryno++;
-		lncntp[dirp->d_ino]--;
-		dirp = (struct direct *)((char *)(dirp) + entrysize);
-		bzero((char *)dirp, (size_t)n);
-		dirp->d_reclen = n;
-		if (reply("FIX") == 1)
-			ret |= ALTERED;
-	}
-chk1:
-	if (idesc->id_entryno > 1)
-		goto chk2;
-	inp = getinoinfo(idesc->id_number);
-	proto.d_ino = inp->i_parent;
-	if (newinofmt)
-		proto.d_type = DT_DIR;
-	else
-		proto.d_type = 0;
-	proto.d_namlen = 2;
-	(void)strcpy(proto.d_name, "..");
-	entrysize = DIRSIZ(0, &proto);
-	if (idesc->id_entryno == 0) {
-		n = DIRSIZ(0, dirp);
-		if (dirp->d_reclen < n + entrysize)
-			goto chk2;
-		proto.d_reclen = dirp->d_reclen - n;
-		dirp->d_reclen = n;
-		idesc->id_entryno++;
-		lncntp[dirp->d_ino]--;
-		dirp = (struct direct *)((char *)(dirp) + n);
-		bzero((char *)dirp, (size_t)proto.d_reclen);
-		dirp->d_reclen = proto.d_reclen;
-	}
-	if (dirp->d_ino != 0 && strcmp(dirp->d_name, "..") == 0) {
-		inp->i_dotdot = dirp->d_ino;
-		if (newinofmt && dirp->d_type != DT_DIR) {
-			direrror(idesc->id_number, "BAD TYPE VALUE FOR '..'");
-			dirp->d_type = DT_DIR;
-			if (reply("FIX") == 1)
-				ret |= ALTERED;
-		}
-		goto chk2;
-	}
-	if (dirp->d_ino != 0 && strcmp(dirp->d_name, ".") != 0) {
-		fileerror(inp->i_parent, idesc->id_number, "MISSING '..'");
-		pfatal("CANNOT FIX, SECOND ENTRY IN DIRECTORY CONTAINS %s\n",
-			dirp->d_name);
-		inp->i_dotdot = (ino_t)-1;
-	} else if (dirp->d_reclen < entrysize) {
-		fileerror(inp->i_parent, idesc->id_number, "MISSING '..'");
-		pfatal("CANNOT FIX, INSUFFICIENT SPACE TO ADD '..'\n");
-		inp->i_dotdot = (ino_t)-1;
-	} else if (inp->i_parent != 0) {
-		/*
-		 * We know the parent, so fix now.
-		 */
-		inp->i_dotdot = inp->i_parent;
-		fileerror(inp->i_parent, idesc->id_number, "MISSING '..'");
-		proto.d_reclen = dirp->d_reclen;
-		bcopy((char *)&proto, (char *)dirp, (size_t)entrysize);
-		if (reply("FIX") == 1)
-			ret |= ALTERED;
-	}
-	idesc->id_entryno++;
-	if (dirp->d_ino != 0)
-		lncntp[dirp->d_ino]--;
-	return (ret|KEEPON);
-chk2:
-	if (dirp->d_ino == 0)
-		return (ret|KEEPON);
-	if (dirp->d_namlen <= 2 &&
-	    dirp->d_name[0] == '.' &&
-	    idesc->id_entryno >= 2) {
-		if (dirp->d_namlen == 1) {
-			direrror(idesc->id_number, "EXTRA '.' ENTRY");
-			dirp->d_ino = 0;
-			if (reply("FIX") == 1)
-				ret |= ALTERED;
-			return (KEEPON | ret);
-		}
-		if (dirp->d_name[1] == '.') {
-			direrror(idesc->id_number, "EXTRA '..' ENTRY");
-			dirp->d_ino = 0;
-			if (reply("FIX") == 1)
-				ret |= ALTERED;
-			return (KEEPON | ret);
-		}
-	}
-	idesc->id_entryno++;
-	n = 0;
-	if (dirp->d_ino > maxino) {
-		fileerror(idesc->id_number, dirp->d_ino, "I OUT OF RANGE");
-		n = reply("REMOVE");
-	} else {
-again:
-		switch (statemap[dirp->d_ino]) {
-		case USTATE:
-			if (idesc->id_entryno <= 2)
-				break;
-			fileerror(idesc->id_number, dirp->d_ino, "UNALLOCATED");
-			n = reply("REMOVE");
-			break;
-
-		case DCLEAR:
-		case FCLEAR:
-			if (idesc->id_entryno <= 2)
-				break;
-			if (statemap[dirp->d_ino] == FCLEAR)
-				errmsg = "DUP/BAD";
-			else if (!preen)
-				errmsg = "ZERO LENGTH DIRECTORY";
-			else {
-				n = 1;
-				break;
-			}
-			fileerror(idesc->id_number, dirp->d_ino, errmsg);
-			if ((n = reply("REMOVE")) == 1)
-				break;
-			dp = ginode(dirp->d_ino);
-			statemap[dirp->d_ino] =
-			    (DI_MODE(dp) & IFMT) == IFDIR ? DSTATE : FSTATE;
-			lncntp[dirp->d_ino] = dp->di_nlink;
-			goto again;
-
-		case DSTATE:
-			if (statemap[idesc->id_number] == DFOUND)
-				statemap[dirp->d_ino] = DFOUND;
-			/* fall through */
-
-		case DFOUND:
-			inp = getinoinfo(dirp->d_ino);
-			if (inp->i_parent != 0 && idesc->id_entryno > 2) {
-				getpathname(pathbuf, idesc->id_number,
-				    idesc->id_number);
-				getpathname(namebuf, dirp->d_ino, dirp->d_ino);
-				pwarn("%s %s %s\n", pathbuf,
-				    "IS AN EXTRANEOUS HARD LINK TO DIRECTORY",
-				    namebuf);
-				if (preen)
-					printf(" (IGNORED)\n");
-				else if ((n = reply("REMOVE")) == 1)
-					break;
-			}
-			if (idesc->id_entryno > 2)
-				inp->i_parent = idesc->id_number;
-			/* fall through */
-
-		case FSTATE:
-			if (newinofmt && dirp->d_type != typemap[dirp->d_ino]) {
-				fileerror(idesc->id_number, dirp->d_ino,
-				    "BAD TYPE VALUE");
-				dirp->d_type = typemap[dirp->d_ino];
-				if (reply("FIX") == 1)
-					ret |= ALTERED;
-			}
-			lncntp[dirp->d_ino]--;
-			break;
-
-		default:
-			errexit("BAD STATE %d FOR INODE I=%d",
-			    statemap[dirp->d_ino], dirp->d_ino);
-		}
-	}
-	if (n == 0)
-		return (ret|KEEPON);
-	dirp->d_ino = 0;
-	return (ret|KEEPON|ALTERED);
-}
-
-/*
- * Routine to sort disk blocks.
- */
-blksort(inpp1, inpp2)
-	struct inoinfo **inpp1, **inpp2;
-{
-
-	return ((*inpp1)->i_blks[0] - (*inpp2)->i_blks[0]);
-}
diff --git a/bsdfsck/pass3.c b/bsdfsck/pass3.c
deleted file mode 100644
index 78fb6a96..00000000
--- a/bsdfsck/pass3.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)pass3.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: pass3.c,v 1.2 1994/08/23 20:02:13 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-#include "fsck.h"
-
-pass3()
-{
-	register struct inoinfo **inpp, *inp;
-	ino_t orphan;
-	int loopcnt;
-
-	for (inpp = &inpsort[inplast - 1]; inpp >= inpsort; inpp--) {
-		inp = *inpp;
-		if (inp->i_number == ROOTINO ||
-		    !(inp->i_parent == 0 || statemap[inp->i_number] == DSTATE))
-			continue;
-		if (statemap[inp->i_number] == DCLEAR)
-			continue;
-		for (loopcnt = 0; ; loopcnt++) {
-			orphan = inp->i_number;
-			if (inp->i_parent == 0 ||
-			    statemap[inp->i_parent] != DSTATE ||
-			    loopcnt > numdirs)
-				break;
-			inp = getinoinfo(inp->i_parent);
-		}
-		(void)linkup(orphan, inp->i_dotdot);
-		inp->i_parent = inp->i_dotdot = lfdir;
-		lncntp[lfdir]--;
-		statemap[orphan] = DFOUND;
-		propagate();
-	}
-}
diff --git a/bsdfsck/pass4.c b/bsdfsck/pass4.c
deleted file mode 100644
index 449c96ab..00000000
--- a/bsdfsck/pass4.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)pass4.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: pass4.c,v 1.2 1994/08/23 20:02:28 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-#include <stdlib.h>
-#include <string.h>
-#include "fsck.h"
-
-int	pass4check();
-
-pass4()
-{
-	register ino_t inumber;
-	register struct zlncnt *zlnp;
-	struct dinode *dp;
-	struct inodesc idesc;
-	int n;
-
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	idesc.id_type = ADDR;
-	idesc.id_func = pass4check;
-	for (inumber = ROOTINO; inumber <= lastino; inumber++) {
-		idesc.id_number = inumber;
-		switch (statemap[inumber]) {
-
-		case FSTATE:
-		case DFOUND:
-			n = lncntp[inumber];
-			if (n)
-				adjust(&idesc, (short)n);
-			else {
-				for (zlnp = zlnhead; zlnp; zlnp = zlnp->next)
-					if (zlnp->zlncnt == inumber) {
-						zlnp->zlncnt = zlnhead->zlncnt;
-						zlnp = zlnhead;
-						zlnhead = zlnhead->next;
-						free((char *)zlnp);
-						clri(&idesc, "UNREF", 1);
-						break;
-					}
-			}
-			break;
-
-		case DSTATE:
-			clri(&idesc, "UNREF", 1);
-			break;
-
-		case DCLEAR:
-			dp = ginode(inumber);
-			if (dp->di_size == 0) {
-				clri(&idesc, "ZERO LENGTH", 1);
-				break;
-			}
-			/* fall through */
-		case FCLEAR:
-			clri(&idesc, "BAD/DUP", 1);
-			break;
-
-		case USTATE:
-			break;
-
-		default:
-			errexit("BAD STATE %d FOR INODE I=%d",
-			    statemap[inumber], inumber);
-		}
-	}
-}
-
-pass4check(idesc)
-	register struct inodesc *idesc;
-{
-	register struct dups *dlp;
-	int nfrags, res = KEEPON;
-	daddr_t blkno = idesc->id_blkno;
-
-	for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
-		if (chkrange(blkno, 1)) {
-			res = SKIP;
-		} else if (testbmap(blkno)) {
-			for (dlp = duplist; dlp; dlp = dlp->next) {
-				if (dlp->dup != blkno)
-					continue;
-				dlp->dup = duplist->dup;
-				dlp = duplist;
-				duplist = duplist->next;
-				free((char *)dlp);
-				break;
-			}
-			if (dlp == 0) {
-				clrbmap(blkno);
-				n_blks--;
-			}
-		}
-	}
-	return (res);
-}
diff --git a/bsdfsck/pass5.c b/bsdfsck/pass5.c
deleted file mode 100644
index 11877f9d..00000000
--- a/bsdfsck/pass5.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)pass5.c	8.2 (Berkeley) 2/2/94";*/
-static char *rcsid = "$Id: pass5.c,v 1.3 1994/08/26 18:03:07 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-#include <string.h>
-#include "fsck.h"
-
-/* From ../ufs/subr.c: */
-
-/*
- * Update the frsum fields to reflect addition or deletion 
- * of some frags.
- */
-void
-ffs_fragacct(fs, fragmap, fraglist, cnt)
-        struct fs *fs;
-	int fragmap;
-	long fraglist[];
-	int cnt;
-{
-	int inblk;
-	register int field, subfield;
-	register int siz, pos;
-
-	inblk = (int)(fragtbl[fs->fs_frag][fragmap]) << 1;
-	fragmap <<= 1;
-	for (siz = 1; siz < fs->fs_frag; siz++) {
-		if ((inblk & (1 << (siz + (fs->fs_frag % NBBY)))) == 0)
-			continue;
-		field = around[siz];
-		subfield = inside[siz];
-		for (pos = siz; pos <= fs->fs_frag; pos++) {
-			if ((fragmap & field) == subfield) {
-				fraglist[siz] += cnt;
-				pos += siz;
-				field <<= siz;
-				subfield <<= siz;
-			}
-			field <<= 1;
-			subfield <<= 1;
-		}
-	}
-}
-
-
-pass5()
-{
-	int c, blk, frags, basesize, sumsize, mapsize, savednrpos;
-	register struct fs *fs = &sblock;
-	register struct cg *cg = &cgrp;
-	daddr_t dbase, dmax;
-	register daddr_t d;
-	register long i, j;
-	struct csum *cs;
-	struct csum cstotal;
-	struct inodesc idesc[3];
-	char buf[MAXBSIZE];
-	register struct cg *newcg = (struct cg *)buf;
-	struct ocg *ocg = (struct ocg *)buf;
-
-	bzero((char *)newcg, (size_t)fs->fs_cgsize);
-	newcg->cg_niblk = fs->fs_ipg;
-	if (cvtlevel > 3) {
-		if (fs->fs_maxcontig < 2 && fs->fs_contigsumsize > 0) {
-			if (preen)
-				pwarn("DELETING CLUSTERING MAPS\n");
-			if (preen || reply("DELETE CLUSTERING MAPS")) {
-				fs->fs_contigsumsize = 0;
-				doinglevel1 = 1;
-				sbdirty();
-			}
-		}
-		if (fs->fs_maxcontig > 1) {
-			char *doit = 0;
-
-			if (fs->fs_contigsumsize < 1) {
-				doit = "CREAT";
-			} else if (fs->fs_contigsumsize < fs->fs_maxcontig &&
-				   fs->fs_contigsumsize < FS_MAXCONTIG) {
-				doit = "EXPAND";
-			}
-			if (doit) {
-				i = fs->fs_contigsumsize;
-				fs->fs_contigsumsize =
-				    MIN(fs->fs_maxcontig, FS_MAXCONTIG);
-				if (CGSIZE(fs) > fs->fs_bsize) {
-					pwarn("CANNOT %s CLUSTER MAPS\n", doit);
-					fs->fs_contigsumsize = i;
-				} else if (preen ||
-				    reply("CREATE CLUSTER MAPS")) {
-					if (preen)
-						pwarn("%sING CLUSTER MAPS\n",
-						    doit);
-					fs->fs_cgsize =
-					    fragroundup(fs, CGSIZE(fs));
-					doinglevel1 = 1;
-					sbdirty();
-				}
-			}
-		}
-	}
-	switch ((int)fs->fs_postblformat) {
-
-	case FS_42POSTBLFMT:
-		basesize = (char *)(&ocg->cg_btot[0]) - (char *)(&ocg->cg_link);
-		sumsize = &ocg->cg_iused[0] - (char *)(&ocg->cg_btot[0]);
-		mapsize = &ocg->cg_free[howmany(fs->fs_fpg, NBBY)] -
-			(u_char *)&ocg->cg_iused[0];
-		ocg->cg_magic = CG_MAGIC;
-		savednrpos = fs->fs_nrpos;
-		fs->fs_nrpos = 8;
-		break;
-
-	case FS_DYNAMICPOSTBLFMT:
-		newcg->cg_btotoff =
-		     &newcg->cg_space[0] - (u_char *)(&newcg->cg_link);
-		newcg->cg_boff =
-		    newcg->cg_btotoff + fs->fs_cpg * sizeof(long);
-		newcg->cg_iusedoff = newcg->cg_boff + 
-		    fs->fs_cpg * fs->fs_nrpos * sizeof(short);
-		newcg->cg_freeoff =
-		    newcg->cg_iusedoff + howmany(fs->fs_ipg, NBBY);
-		if (fs->fs_contigsumsize <= 0) {
-			newcg->cg_nextfreeoff = newcg->cg_freeoff +
-			    howmany(fs->fs_cpg * fs->fs_spc / NSPF(fs), NBBY);
-		} else {
-			newcg->cg_clustersumoff = newcg->cg_freeoff +
-			    howmany(fs->fs_cpg * fs->fs_spc / NSPF(fs), NBBY) -
-			    sizeof(long);
-			newcg->cg_clustersumoff =
-			    roundup(newcg->cg_clustersumoff, sizeof(long));
-			newcg->cg_clusteroff = newcg->cg_clustersumoff +
-			    (fs->fs_contigsumsize + 1) * sizeof(long);
-			newcg->cg_nextfreeoff = newcg->cg_clusteroff +
-			    howmany(fs->fs_cpg * fs->fs_spc / NSPB(fs), NBBY);
-		}
-		newcg->cg_magic = CG_MAGIC;
-		basesize = &newcg->cg_space[0] - (u_char *)(&newcg->cg_link);
-		sumsize = newcg->cg_iusedoff - newcg->cg_btotoff;
-		mapsize = newcg->cg_nextfreeoff - newcg->cg_iusedoff;
-		break;
-
-	default:
-		errexit("UNKNOWN ROTATIONAL TABLE FORMAT %d\n",
-			fs->fs_postblformat);
-	}
-	bzero((char *)&idesc[0], sizeof idesc);
-	for (i = 0; i < 3; i++) {
-		idesc[i].id_type = ADDR;
-		if (doinglevel2)
-			idesc[i].id_fix = FIX;
-	}
-	bzero((char *)&cstotal, sizeof(struct csum));
-	j = blknum(fs, fs->fs_size + fs->fs_frag - 1);
-	for (i = fs->fs_size; i < j; i++)
-		setbmap(i);
-	for (c = 0; c < fs->fs_ncg; c++) {
-		getblk(&cgblk, cgtod(fs, c), fs->fs_cgsize);
-		if (!cg_chkmagic(cg))
-			pfatal("CG %d: BAD MAGIC NUMBER\n", c);
-		dbase = cgbase(fs, c);
-		dmax = dbase + fs->fs_fpg;
-		if (dmax > fs->fs_size)
-			dmax = fs->fs_size;
-		newcg->cg_time = cg->cg_time;
-		newcg->cg_cgx = c;
-		if (c == fs->fs_ncg - 1)
-			newcg->cg_ncyl = fs->fs_ncyl % fs->fs_cpg;
-		else
-			newcg->cg_ncyl = fs->fs_cpg;
-		newcg->cg_ndblk = dmax - dbase;
-		if (fs->fs_contigsumsize > 0)
-			newcg->cg_nclusterblks = newcg->cg_ndblk / fs->fs_frag;
-		newcg->cg_cs.cs_ndir = 0;
-		newcg->cg_cs.cs_nffree = 0;
-		newcg->cg_cs.cs_nbfree = 0;
-		newcg->cg_cs.cs_nifree = fs->fs_ipg;
-		if (cg->cg_rotor < newcg->cg_ndblk)
-			newcg->cg_rotor = cg->cg_rotor;
-		else
-			newcg->cg_rotor = 0;
-		if (cg->cg_frotor < newcg->cg_ndblk)
-			newcg->cg_frotor = cg->cg_frotor;
-		else
-			newcg->cg_frotor = 0;
-		if (cg->cg_irotor < newcg->cg_niblk)
-			newcg->cg_irotor = cg->cg_irotor;
-		else
-			newcg->cg_irotor = 0;
-		bzero((char *)&newcg->cg_frsum[0], sizeof newcg->cg_frsum);
-		bzero((char *)&cg_blktot(newcg)[0],
-		      (size_t)(sumsize + mapsize));
-		if (fs->fs_postblformat == FS_42POSTBLFMT)
-			ocg->cg_magic = CG_MAGIC;
-		j = fs->fs_ipg * c;
-		for (i = 0; i < fs->fs_ipg; j++, i++) {
-			switch (statemap[j]) {
-
-			case USTATE:
-				break;
-
-			case DSTATE:
-			case DCLEAR:
-			case DFOUND:
-				newcg->cg_cs.cs_ndir++;
-				/* fall through */
-
-			case FSTATE:
-			case FCLEAR:
-				newcg->cg_cs.cs_nifree--;
-				setbit(cg_inosused(newcg), i);
-				break;
-
-			default:
-				if (j < ROOTINO)
-					break;
-				errexit("BAD STATE %d FOR INODE I=%d",
-				    statemap[j], j);
-			}
-		}
-		if (c == 0)
-			for (i = 0; i < ROOTINO; i++) {
-				setbit(cg_inosused(newcg), i);
-				newcg->cg_cs.cs_nifree--;
-			}
-		for (i = 0, d = dbase;
-		     d < dmax;
-		     d += fs->fs_frag, i += fs->fs_frag) {
-			frags = 0;
-			for (j = 0; j < fs->fs_frag; j++) {
-				if (testbmap(d + j))
-					continue;
-				setbit(cg_blksfree(newcg), i + j);
-				frags++;
-			}
-			if (frags == fs->fs_frag) {
-				newcg->cg_cs.cs_nbfree++;
-				j = cbtocylno(fs, i);
-				cg_blktot(newcg)[j]++;
-				cg_blks(fs, newcg, j)[cbtorpos(fs, i)]++;
-				if (fs->fs_contigsumsize > 0)
-					setbit(cg_clustersfree(newcg),
-					    i / fs->fs_frag);
-			} else if (frags > 0) {
-				newcg->cg_cs.cs_nffree += frags;
-				blk = blkmap(fs, cg_blksfree(newcg), i);
-				ffs_fragacct(fs, blk, newcg->cg_frsum, 1);
-			}
-		}
-		if (fs->fs_contigsumsize > 0) {
-			long *sump = cg_clustersum(newcg);
-			u_char *mapp = cg_clustersfree(newcg);
-			int map = *mapp++;
-			int bit = 1;
-			int run = 0;
-
-			for (i = 0; i < newcg->cg_nclusterblks; i++) {
-				if ((map & bit) != 0) {
-					run++;
-				} else if (run != 0) {
-					if (run > fs->fs_contigsumsize)
-						run = fs->fs_contigsumsize;
-					sump[run]++;
-					run = 0;
-				}
-				if ((i & (NBBY - 1)) != (NBBY - 1)) {
-					bit <<= 1;
-				} else {
-					map = *mapp++;
-					bit = 1;
-				}
-			}
-			if (run != 0) {
-				if (run > fs->fs_contigsumsize)
-					run = fs->fs_contigsumsize;
-				sump[run]++;
-			}
-		}
-		cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
-		cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree;
-		cstotal.cs_nifree += newcg->cg_cs.cs_nifree;
-		cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
-		cs = &fs->fs_cs(fs, c);
-		if (bcmp((char *)&newcg->cg_cs, (char *)cs, sizeof *cs) != 0 &&
-		    dofix(&idesc[0], "FREE BLK COUNT(S) WRONG IN SUPERBLK")) {
-			bcopy((char *)&newcg->cg_cs, (char *)cs, sizeof *cs);
-			sbdirty();
-		}
-		if (doinglevel1) {
-			bcopy((char *)newcg, (char *)cg, (size_t)fs->fs_cgsize);
-			cgdirty();
-			continue;
-		}
-		if (bcmp(cg_inosused(newcg),
-			 cg_inosused(cg), mapsize) != 0 &&
-		    dofix(&idesc[1], "BLK(S) MISSING IN BIT MAPS")) {
-			bcopy(cg_inosused(newcg), cg_inosused(cg),
-			      (size_t)mapsize);
-			cgdirty();
-		}
-		if ((bcmp((char *)newcg, (char *)cg, basesize) != 0 ||
-		     bcmp((char *)&cg_blktot(newcg)[0],
-			  (char *)&cg_blktot(cg)[0], sumsize) != 0) &&
-		    dofix(&idesc[2], "SUMMARY INFORMATION BAD")) {
-			bcopy((char *)newcg, (char *)cg, (size_t)basesize);
-			bcopy((char *)&cg_blktot(newcg)[0],
-			      (char *)&cg_blktot(cg)[0], (size_t)sumsize);
-			cgdirty();
-		}
-	}
-	if (fs->fs_postblformat == FS_42POSTBLFMT)
-		fs->fs_nrpos = savednrpos;
-	if (bcmp((char *)&cstotal, (char *)&fs->fs_cstotal, sizeof *cs) != 0
-	    && dofix(&idesc[0], "FREE BLK COUNT(S) WRONG IN SUPERBLK")) {
-		bcopy((char *)&cstotal, (char *)&fs->fs_cstotal, sizeof *cs);
-		fs->fs_ronly = 0;
-		fs->fs_fmod = 0;
-		sbdirty();
-	}
-}
diff --git a/bsdfsck/preen.c b/bsdfsck/preen.c
deleted file mode 100644
index 5650f900..00000000
--- a/bsdfsck/preen.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1990, 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
-/*static char sccsid[] = "from: @(#)preen.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: preen.c,v 1.1 1994/08/23 19:29:25 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <fstab.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-char	*rawname(), *unrawname(), *blockcheck();
-
-struct part {
-	struct	part *next;		/* forward link of partitions on disk */
-	char	*name;			/* device name */
-	char	*fsname;		/* mounted filesystem name */
-	long	auxdata;		/* auxiliary data for application */
-} *badlist, **badnext = &badlist;
-
-struct disk {
-	char	*name;			/* disk base name */
-	struct	disk *next;		/* forward link for list of disks */
-	struct	part *part;		/* head of list of partitions on disk */
-	int	pid;			/* If != 0, pid of proc working on */
-} *disks;
-
-int	nrun, ndisks;
-char	hotroot;
-
-checkfstab(preen, maxrun, docheck, chkit)
-	int preen, maxrun;
-	int (*docheck)(), (*chkit)();
-{
-	register struct fstab *fsp;
-	register struct disk *dk, *nextdisk;
-	register struct part *pt;
-	int ret, pid, retcode, passno, sumstatus, status;
-	long auxdata;
-	char *name;
-
-	sumstatus = 0;
-	for (passno = 1; passno <= 2; passno++) {
-		if (setfsent() == 0) {
-			fprintf(stderr, "Can't open checklist file: %s\n",
-			    _PATH_FSTAB);
-			return (8);
-		}
-		while ((fsp = getfsent()) != 0) {
-			if ((auxdata = (*docheck)(fsp)) == 0)
-				continue;
-			if (preen == 0 || passno == 1 && fsp->fs_passno == 1) {
-				if (name = blockcheck(fsp->fs_spec)) {
-					if (sumstatus = (*chkit)(name,
-					    fsp->fs_file, auxdata, 0))
-						return (sumstatus);
-				} else if (preen)
-					return (8);
-			} else if (passno == 2 && fsp->fs_passno > 1) {
-				if ((name = blockcheck(fsp->fs_spec)) == NULL) {
-					fprintf(stderr, "BAD DISK NAME %s\n",
-						fsp->fs_spec);
-					sumstatus |= 8;
-					continue;
-				}
-				addpart(name, fsp->fs_file, auxdata);
-			}
-		}
-		if (preen == 0)
-			return (0);
-	}
-	if (preen) {
-		if (maxrun == 0)
-			maxrun = ndisks;
-		if (maxrun > ndisks)
-			maxrun = ndisks;
-		nextdisk = disks;
-		for (passno = 0; passno < maxrun; ++passno) {
-			while (ret = startdisk(nextdisk, chkit) && nrun > 0)
-				sleep(10);
-			if (ret)
-				return (ret);
-			nextdisk = nextdisk->next;
-		}
-		while ((pid = wait(&status)) != -1) {
-			for (dk = disks; dk; dk = dk->next)
-				if (dk->pid == pid)
-					break;
-			if (dk == 0) {
-				printf("Unknown pid %d\n", pid);
-				continue;
-			}
-			if (WIFEXITED(status))
-				retcode = WEXITSTATUS(status);
-			else
-				retcode = 0;
-			if (WIFSIGNALED(status)) {
-				printf("%s (%s): EXITED WITH SIGNAL %d\n",
-					dk->part->name, dk->part->fsname,
-					WTERMSIG(status));
-				retcode = 8;
-			}
-			if (retcode != 0) {
-				sumstatus |= retcode;
-				*badnext = dk->part;
-				badnext = &dk->part->next;
-				dk->part = dk->part->next;
-				*badnext = NULL;
-			} else
-				dk->part = dk->part->next;
-			dk->pid = 0;
-			nrun--;
-			if (dk->part == NULL)
-				ndisks--;
-
-			if (nextdisk == NULL) {
-				if (dk->part) {
-					while (ret = startdisk(dk, chkit) &&
-					    nrun > 0)
-						sleep(10);
-					if (ret)
-						return (ret);
-				}
-			} else if (nrun < maxrun && nrun < ndisks) {
-				for ( ;; ) {
-					if ((nextdisk = nextdisk->next) == NULL)
-						nextdisk = disks;
-					if (nextdisk->part != NULL &&
-					    nextdisk->pid == 0)
-						break;
-				}
-				while (ret = startdisk(nextdisk, chkit) &&
-				    nrun > 0)
-					sleep(10);
-				if (ret)
-					return (ret);
-			}
-		}
-	}
-	if (sumstatus) {
-		if (badlist == 0)
-			return (sumstatus);
-		fprintf(stderr, "THE FOLLOWING FILE SYSTEM%s HAD AN %s\n\t",
-			badlist->next ? "S" : "", "UNEXPECTED INCONSISTENCY:");
-		for (pt = badlist; pt; pt = pt->next)
-			fprintf(stderr, "%s (%s)%s", pt->name, pt->fsname,
-			    pt->next ? ", " : "\n");
-		return (sumstatus);
-	}
-	(void)endfsent();
-	return (0);
-}
-
-struct disk *
-finddisk(name)
-	char *name;
-{
-	register struct disk *dk, **dkp;
-	register char *p;
-	size_t len;
-
-	for (p = name + strlen(name) - 1; p >= name; --p)
-		if (isdigit(*p)) {
-			len = p - name + 1;
-			break;
-		}
-	if (p < name)
-		len = strlen(name);
-
-	for (dk = disks, dkp = &disks; dk; dkp = &dk->next, dk = dk->next) {
-		if (strncmp(dk->name, name, len) == 0 &&
-		    dk->name[len] == 0)
-			return (dk);
-	}
-	if ((*dkp = (struct disk *)malloc(sizeof(struct disk))) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	dk = *dkp;
-	if ((dk->name = malloc(len + 1)) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	(void)strncpy(dk->name, name, len);
-	dk->name[len] = '\0';
-	dk->part = NULL;
-	dk->next = NULL;
-	dk->pid = 0;
-	ndisks++;
-	return (dk);
-}
-
-addpart(name, fsname, auxdata)
-	char *name, *fsname;
-	long auxdata;
-{
-	struct disk *dk = finddisk(name);
-	register struct part *pt, **ppt = &dk->part;
-
-	for (pt = dk->part; pt; ppt = &pt->next, pt = pt->next)
-		if (strcmp(pt->name, name) == 0) {
-			printf("%s in fstab more than once!\n", name);
-			return;
-		}
-	if ((*ppt = (struct part *)malloc(sizeof(struct part))) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	pt = *ppt;
-	if ((pt->name = malloc(strlen(name) + 1)) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	(void)strcpy(pt->name, name);
-	if ((pt->fsname = malloc(strlen(fsname) + 1)) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	(void)strcpy(pt->fsname, fsname);
-	pt->next = NULL;
-	pt->auxdata = auxdata;
-}
-
-startdisk(dk, checkit)
-	register struct disk *dk;
-	int (*checkit)();
-{
-	register struct part *pt = dk->part;
-
-	dk->pid = fork();
-	if (dk->pid < 0) {
-		perror("fork");
-		return (8);
-	}
-	if (dk->pid == 0)
-		exit((*checkit)(pt->name, pt->fsname, pt->auxdata, 1));
-	nrun++;
-	return (0);
-}
-
-char *
-blockcheck(name)
-	char *name;
-{
-	struct stat stslash, stblock, stchar;
-	char *raw;
-	int retried = 0;
-
-	hotroot = 0;
-	if (stat("/", &stslash) < 0) {
-		perror("/");
-		printf("Can't stat root\n");
-		return (0);
-	}
-retry:
-	if (stat(name, &stblock) < 0) {
-		perror(name);
-		printf("Can't stat %s\n", name);
-		return (0);
-	}
-	if ((stblock.st_mode & S_IFMT) == S_IFBLK) {
-		if (stslash.st_dev == stblock.st_rdev)
-			hotroot++;
-		raw = rawname(name);
-		if (stat(raw, &stchar) < 0) {
-			perror(raw);
-			printf("Can't stat %s\n", raw);
-			return (name);
-		}
-		if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
-			return (raw);
-		} else {
-			printf("%s is not a character device\n", raw);
-			return (name);
-		}
-	} else if ((stblock.st_mode & S_IFMT) == S_IFCHR && !retried) {
-		name = unrawname(name);
-		retried++;
-		goto retry;
-	}
-	printf("Can't make sense out of name %s\n", name);
-	return (0);
-}
-
-char *
-unrawname(name)
-	char *name;
-{
-	char *dp;
-	struct stat stb;
-
-	if ((dp = rindex(name, '/')) == 0)
-		return (name);
-	if (stat(name, &stb) < 0)
-		return (name);
-	if ((stb.st_mode & S_IFMT) != S_IFCHR)
-		return (name);
-	if (dp[1] != 'r')
-		return (name);
-	(void)strcpy(&dp[1], &dp[2]);
-	return (name);
-}
-
-char *
-rawname(name)
-	char *name;
-{
-	static char rawbuf[32];
-	char *dp;
-
-	if ((dp = rindex(name, '/')) == 0)
-		return (0);
-	*dp = 0;
-	(void)strcpy(rawbuf, name);
-	*dp = '/';
-	(void)strcat(rawbuf, "/r");
-	(void)strcat(rawbuf, &dp[1]);
-	return (rawbuf);
-}
diff --git a/bsdfsck/setup.c b/bsdfsck/setup.c
deleted file mode 100644
index f65ade47..00000000
--- a/bsdfsck/setup.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)setup.c	8.2 (Berkeley) 2/21/94";*/
-static char *rcsid = "$Id: setup.c,v 1.3 1994/08/25 15:22:35 mib Exp $";
-#endif /* not lint */
-
-#define DKTYPENAMES
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-/* #include <sys/disklabel.h> */
-#include <sys/file.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "fsck.h"
-
-struct bufarea asblk;
-#define altsblock (*asblk.b_un.b_fs)
-#define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
-
-struct	disklabel *getdisklabel();
-
-setup(dev)
-	char *dev;
-{
-	long cg, size, asked, i, j;
-	long bmapsize;
-/*	struct disklabel *lp; */
-	off_t sizepb;
-	struct stat statb;
-	struct fs proto;
-
-	havesb = 0;
-	fswritefd = -1;
-	if (stat(dev, &statb) < 0) {
-		printf("Can't stat %s: %s\n", dev, strerror(errno));
-		return (0);
-	}
-	if ((statb.st_mode & S_IFMT) != S_IFCHR) {
-		pfatal("%s is not a character device", dev);
-		if (reply("CONTINUE") == 0)
-			return (0);
-	}
-	if ((fsreadfd = open(dev, O_RDONLY)) < 0) {
-		printf("Can't open %s: %s\n", dev, strerror(errno));
-		return (0);
-	}
-	if (preen == 0)
-		printf("** %s", dev);
-	if (nflag || (fswritefd = open(dev, O_WRONLY)) < 0) {
-		fswritefd = -1;
-		if (preen)
-			pfatal("NO WRITE ACCESS");
-		printf(" (NO WRITE)");
-	}
-	if (preen == 0)
-		printf("\n");
-	fsmodified = 0;
-	lfdir = 0;
-	initbarea(&sblk);
-	initbarea(&asblk);
-	sblk.b_un.b_buf = malloc(SBSIZE);
-	asblk.b_un.b_buf = malloc(SBSIZE);
-	if (sblk.b_un.b_buf == NULL || asblk.b_un.b_buf == NULL)
-		errexit("cannot allocate space for superblock\n");
-#if 0
-	if (lp = getdisklabel((char *)NULL, fsreadfd))
-		dev_bsize = secsize = lp->d_secsize;
-	else
-#endif
-		dev_bsize = secsize = DEV_BSIZE;
-	/*
-	 * Read in the superblock, looking for alternates if necessary
-	 */
-	if (readsb(1) == 0) {
-		if (bflag || preen || calcsb(dev, fsreadfd, &proto) == 0)
-			return(0);
-		if (reply("LOOK FOR ALTERNATE SUPERBLOCKS") == 0)
-			return (0);
-		for (cg = 0; cg < proto.fs_ncg; cg++) {
-			bflag = fsbtodb(&proto, cgsblock(&proto, cg));
-			if (readsb(0) != 0)
-				break;
-		}
-		if (cg >= proto.fs_ncg) {
-			printf("%s %s\n%s %s\n%s %s\n",
-				"SEARCH FOR ALTERNATE SUPER-BLOCK",
-				"FAILED. YOU MUST USE THE",
-				"-b OPTION TO FSCK TO SPECIFY THE",
-				"LOCATION OF AN ALTERNATE",
-				"SUPER-BLOCK TO SUPPLY NEEDED",
-				"INFORMATION; SEE fsck(8).");
-			return(0);
-		}
-		pwarn("USING ALTERNATE SUPERBLOCK AT %d\n", bflag);
-	}
-	maxfsblock = sblock.fs_size;
-	maxino = sblock.fs_ncg * sblock.fs_ipg;
-	/*
-	 * Check and potentially fix certain fields in the super block.
-	 */
-	if (sblock.fs_optim != FS_OPTTIME && sblock.fs_optim != FS_OPTSPACE) {
-		pfatal("UNDEFINED OPTIMIZATION IN SUPERBLOCK");
-		if (reply("SET TO DEFAULT") == 1) {
-			sblock.fs_optim = FS_OPTTIME;
-			sbdirty();
-		}
-	}
-	if ((sblock.fs_minfree < 0 || sblock.fs_minfree > 99)) {
-		pfatal("IMPOSSIBLE MINFREE=%d IN SUPERBLOCK",
-			sblock.fs_minfree);
-		if (reply("SET TO DEFAULT") == 1) {
-			sblock.fs_minfree = 10;
-			sbdirty();
-		}
-	}
-	if (sblock.fs_interleave < 1 || 
-	    sblock.fs_interleave > sblock.fs_nsect) {
-		pwarn("IMPOSSIBLE INTERLEAVE=%d IN SUPERBLOCK",
-			sblock.fs_interleave);
-		sblock.fs_interleave = 1;
-		if (preen)
-			printf(" (FIXED)\n");
-		if (preen || reply("SET TO DEFAULT") == 1) {
-			sbdirty();
-			dirty(&asblk);
-		}
-	}
-	if (sblock.fs_npsect < sblock.fs_nsect || 
-	    sblock.fs_npsect > sblock.fs_nsect*2) {
-		pwarn("IMPOSSIBLE NPSECT=%d IN SUPERBLOCK",
-			sblock.fs_npsect);
-		sblock.fs_npsect = sblock.fs_nsect;
-		if (preen)
-			printf(" (FIXED)\n");
-		if (preen || reply("SET TO DEFAULT") == 1) {
-			sbdirty();
-			dirty(&asblk);
-		}
-	}
-	if (sblock.fs_inodefmt >= FS_44INODEFMT) {
-		newinofmt = 1;
-	} else {
-		sblock.fs_qbmask = ~sblock.fs_bmask;
-		sblock.fs_qfmask = ~sblock.fs_fmask;
-		newinofmt = 0;
-	}
-	/*
-	 * Convert to new inode format.
-	 */
-	if (cvtlevel >= 2 && sblock.fs_inodefmt < FS_44INODEFMT) {
-		if (preen)
-			pwarn("CONVERTING TO NEW INODE FORMAT\n");
-		else if (!reply("CONVERT TO NEW INODE FORMAT"))
-			return(0);
-		doinglevel2++;
-		sblock.fs_inodefmt = FS_44INODEFMT;
-		sizepb = sblock.fs_bsize;
-		sblock.fs_maxfilesize = sblock.fs_bsize * NDADDR - 1;
-		for (i = 0; i < NIADDR; i++) {
-			sizepb *= NINDIR(&sblock);
-			sblock.fs_maxfilesize += sizepb;
-		}
-		sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
-		sblock.fs_qbmask = ~sblock.fs_bmask;
-		sblock.fs_qfmask = ~sblock.fs_fmask;
-		sbdirty();
-		dirty(&asblk);
-	}
-	/*
-	 * Convert to new cylinder group format.
-	 */
-	if (cvtlevel >= 1 && sblock.fs_postblformat == FS_42POSTBLFMT) {
-		if (preen)
-			pwarn("CONVERTING TO NEW CYLINDER GROUP FORMAT\n");
-		else if (!reply("CONVERT TO NEW CYLINDER GROUP FORMAT"))
-			return(0);
-		doinglevel1++;
-		sblock.fs_postblformat = FS_DYNAMICPOSTBLFMT;
-		sblock.fs_nrpos = 8;
-		sblock.fs_postbloff =
-		    (char *)(&sblock.fs_opostbl[0][0]) -
-		    (char *)(&sblock.fs_link);
-		sblock.fs_rotbloff = &sblock.fs_space[0] -
-		    (u_char *)(&sblock.fs_link);
-		sblock.fs_cgsize =
-			fragroundup(&sblock, CGSIZE(&sblock));
-		sbdirty();
-		dirty(&asblk);
-	}
-	if (asblk.b_dirty && !bflag) {
-		bcopy((char *)&sblock, (char *)&altsblock,
-			(size_t)sblock.fs_sbsize);
-		flush(fswritefd, &asblk);
-	}
-	/*
-	 * read in the summary info.
-	 */
-	asked = 0;
-	for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize, j++) {
-		size = sblock.fs_cssize - i < sblock.fs_bsize ?
-		    sblock.fs_cssize - i : sblock.fs_bsize;
-		sblock.fs_csp[j] = (struct csum *)calloc(1, (unsigned)size);
-		if (bread(fsreadfd, (char *)sblock.fs_csp[j],
-		    fsbtodb(&sblock, sblock.fs_csaddr + j * sblock.fs_frag),
-		    size) != 0 && !asked) {
-			pfatal("BAD SUMMARY INFORMATION");
-			if (reply("CONTINUE") == 0)
-				errexit("");
-			asked++;
-		}
-	}
-	/*
-	 * allocate and initialize the necessary maps
-	 */
-	bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(short));
-	blockmap = calloc((unsigned)bmapsize, sizeof (char));
-	if (blockmap == NULL) {
-		printf("cannot alloc %u bytes for blockmap\n",
-		    (unsigned)bmapsize);
-		goto badsb;
-	}
-	statemap = calloc((unsigned)(maxino + 1), sizeof(char));
-	if (statemap == NULL) {
-		printf("cannot alloc %u bytes for statemap\n",
-		    (unsigned)(maxino + 1));
-		goto badsb;
-	}
-	typemap = calloc((unsigned)(maxino + 1), sizeof(char));
-	if (typemap == NULL) {
-		printf("cannot alloc %u bytes for typemap\n",
-		    (unsigned)(maxino + 1));
-		goto badsb;
-	}
-	lncntp = (short *)calloc((unsigned)(maxino + 1), sizeof(short));
-	if (lncntp == NULL) {
-		printf("cannot alloc %u bytes for lncntp\n", 
-		    (unsigned)(maxino + 1) * sizeof(short));
-		goto badsb;
-	}
-	numdirs = sblock.fs_cstotal.cs_ndir;
-	inplast = 0;
-	listmax = numdirs + 10;
-	inpsort = (struct inoinfo **)calloc((unsigned)listmax,
-	    sizeof(struct inoinfo *));
-	inphead = (struct inoinfo **)calloc((unsigned)numdirs,
-	    sizeof(struct inoinfo *));
-	if (inpsort == NULL || inphead == NULL) {
-		printf("cannot alloc %u bytes for inphead\n", 
-		    (unsigned)numdirs * sizeof(struct inoinfo *));
-		goto badsb;
-	}
-	bufinit();
-	return (1);
-
-badsb:
-	ckfini();
-	return (0);
-}
-
-/*
- * Read in the super block and its summary info.
- */
-readsb(listerr)
-	int listerr;
-{
-	daddr_t super = bflag ? bflag : SBOFF / dev_bsize;
-
-	if (bread(fsreadfd, (char *)&sblock, super, (long)SBSIZE) != 0)
-		return (0);
-	sblk.b_bno = super;
-	sblk.b_size = SBSIZE;
-	/*
-	 * run a few consistency checks of the super block
-	 */
-	if (sblock.fs_magic != FS_MAGIC)
-		{ badsb(listerr, "MAGIC NUMBER WRONG"); return (0); }
-	if (sblock.fs_ncg < 1)
-		{ badsb(listerr, "NCG OUT OF RANGE"); return (0); }
-	if (sblock.fs_cpg < 1)
-		{ badsb(listerr, "CPG OUT OF RANGE"); return (0); }
-	if (sblock.fs_ncg * sblock.fs_cpg < sblock.fs_ncyl ||
-	    (sblock.fs_ncg - 1) * sblock.fs_cpg >= sblock.fs_ncyl)
-		{ badsb(listerr, "NCYL LESS THAN NCG*CPG"); return (0); }
-	if (sblock.fs_sbsize > SBSIZE)
-		{ badsb(listerr, "SIZE PREPOSTEROUSLY LARGE"); return (0); }
-	/*
-	 * Compute block size that the filesystem is based on,
-	 * according to fsbtodb, and adjust superblock block number
-	 * so we can tell if this is an alternate later.
-	 */
-	super *= dev_bsize;
-	dev_bsize = sblock.fs_fsize / fsbtodb(&sblock, 1);
-	sblk.b_bno = super / dev_bsize;
-	if (bflag) {
-		havesb = 1;
-		return (1);
-	}
-	/*
-	 * Set all possible fields that could differ, then do check
-	 * of whole super block against an alternate super block.
-	 * When an alternate super-block is specified this check is skipped.
-	 */
-	getblk(&asblk, cgsblock(&sblock, sblock.fs_ncg - 1), sblock.fs_sbsize);
-	if (asblk.b_errs)
-		return (0);
-	altsblock.fs_link = sblock.fs_link;
-	altsblock.fs_rlink = sblock.fs_rlink;
-	altsblock.fs_time = sblock.fs_time;
-	altsblock.fs_cstotal = sblock.fs_cstotal;
-	altsblock.fs_cgrotor = sblock.fs_cgrotor;
-	altsblock.fs_fmod = sblock.fs_fmod;
-	altsblock.fs_clean = sblock.fs_clean;
-	altsblock.fs_ronly = sblock.fs_ronly;
-	altsblock.fs_flags = sblock.fs_flags;
-	altsblock.fs_maxcontig = sblock.fs_maxcontig;
-	altsblock.fs_minfree = sblock.fs_minfree;
-	altsblock.fs_optim = sblock.fs_optim;
-	altsblock.fs_rotdelay = sblock.fs_rotdelay;
-	altsblock.fs_maxbpg = sblock.fs_maxbpg;
-	bcopy((char *)sblock.fs_csp, (char *)altsblock.fs_csp,
-		sizeof sblock.fs_csp);
-	bcopy((char *)sblock.fs_fsmnt, (char *)altsblock.fs_fsmnt,
-		sizeof sblock.fs_fsmnt);
-	bcopy((char *)sblock.fs_sparecon, (char *)altsblock.fs_sparecon,
-		sizeof sblock.fs_sparecon);
-	/*
-	 * The following should not have to be copied.
-	 */
-	altsblock.fs_fsbtodb = sblock.fs_fsbtodb;
-	altsblock.fs_interleave = sblock.fs_interleave;
-	altsblock.fs_npsect = sblock.fs_npsect;
-	altsblock.fs_nrpos = sblock.fs_nrpos;
-	altsblock.fs_qbmask = sblock.fs_qbmask;
-	altsblock.fs_qfmask = sblock.fs_qfmask;
-	altsblock.fs_state = sblock.fs_state;
-	altsblock.fs_maxfilesize = sblock.fs_maxfilesize;
-	if (bcmp((char *)&sblock, (char *)&altsblock, (int)sblock.fs_sbsize)) {
-		badsb(listerr,
-		"VALUES IN SUPER BLOCK DISAGREE WITH THOSE IN FIRST ALTERNATE");
-		return (0);
-	}
-	havesb = 1;
-	return (1);
-}
-
-badsb(listerr, s)
-	int listerr;
-	char *s;
-{
-
-	if (!listerr)
-		return;
-	if (preen)
-		printf("%s: ", cdevname);
-	pfatal("BAD SUPER BLOCK: %s\n", s);
-}
-
-/* XXX */
-calcsb (dev, devfd, fs)
-     char *dev;
-     int devfd;
-     struct fs *fs;
-{
-  return 0;
-}
-
-#if 0
-/*
- * Calculate a prototype superblock based on information in the disk label.
- * When done the cgsblock macro can be calculated and the fs_ncg field
- * can be used. Do NOT attempt to use other macros without verifying that
- * their needed information is available!
- */
-calcsb(dev, devfd, fs)
-	char *dev;
-	int devfd;
-	register struct fs *fs;
-{
-	register struct disklabel *lp;
-	register struct partition *pp;
-	register char *cp;
-	int i;
-
-	cp = index(dev, '\0') - 1;
-	if (cp == (char *)-1 || (*cp < 'a' || *cp > 'h') && !isdigit(*cp)) {
-		pfatal("%s: CANNOT FIGURE OUT FILE SYSTEM PARTITION\n", dev);
-		return (0);
-	}
-	lp = getdisklabel(dev, devfd);
-	if (isdigit(*cp))
-		pp = &lp->d_partitions[0];
-	else
-		pp = &lp->d_partitions[*cp - 'a'];
-	if (pp->p_fstype != FS_BSDFFS) {
-		pfatal("%s: NOT LABELED AS A BSD FILE SYSTEM (%s)\n",
-			dev, pp->p_fstype < FSMAXTYPES ?
-			fstypenames[pp->p_fstype] : "unknown");
-		return (0);
-	}
-	bzero((char *)fs, sizeof(struct fs));
-	fs->fs_fsize = pp->p_fsize;
-	fs->fs_frag = pp->p_frag;
-	fs->fs_cpg = pp->p_cpg;
-	fs->fs_size = pp->p_size;
-	fs->fs_ntrak = lp->d_ntracks;
-	fs->fs_nsect = lp->d_nsectors;
-	fs->fs_spc = lp->d_secpercyl;
-	fs->fs_nspf = fs->fs_fsize / lp->d_secsize;
-	fs->fs_sblkno = roundup(
-		howmany(lp->d_bbsize + lp->d_sbsize, fs->fs_fsize),
-		fs->fs_frag);
-	fs->fs_cgmask = 0xffffffff;
-	for (i = fs->fs_ntrak; i > 1; i >>= 1)
-		fs->fs_cgmask <<= 1;
-	if (!POWEROF2(fs->fs_ntrak))
-		fs->fs_cgmask <<= 1;
-	fs->fs_cgoffset = roundup(
-		howmany(fs->fs_nsect, NSPF(fs)), fs->fs_frag);
-	fs->fs_fpg = (fs->fs_cpg * fs->fs_spc) / NSPF(fs);
-	fs->fs_ncg = howmany(fs->fs_size / fs->fs_spc, fs->fs_cpg);
-	for (fs->fs_fsbtodb = 0, i = NSPF(fs); i > 1; i >>= 1)
-		fs->fs_fsbtodb++;
-	dev_bsize = lp->d_secsize;
-	return (1);
-}
-
-struct disklabel *
-getdisklabel(s, fd)
-	char *s;
-	int	fd;
-{
-	static struct disklabel lab;
-
-	if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) {
-		if (s == NULL)
-			return ((struct disklabel *)NULL);
-		pwarn("ioctl (GCINFO): %s\n", strerror(errno));
-		errexit("%s: can't read disk label\n", s);
-	}
-	return (&lab);
-}
-#endif
diff --git a/bsdfsck/utilities.c b/bsdfsck/utilities.c
deleted file mode 100644
index 1c281b1b..00000000
--- a/bsdfsck/utilities.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * 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
-/*static char sccsid[] = "from: @(#)utilities.c	8.1 (Berkeley) 6/5/93";*/
-static char *rcsid = "$Id: utilities.c,v 1.2 1994/08/23 20:18:15 mib Exp $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include "../ufs/dinode.h"
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "fsck.h"
-
-long	diskreads, totalreads;	/* Disk cache statistics */
-
-ftypeok(dp)
-	struct dinode *dp;
-{
-	switch (DI_MODE(dp) & IFMT) {
-
-	case IFDIR:
-	case IFREG:
-	case IFBLK:
-	case IFCHR:
-	case IFLNK:
-	case IFSOCK:
-	case IFIFO:
-		return (1);
-
-	default:
-		if (debug)
-			printf("bad file type 0%o\n", DI_MODE(dp));
-		return (0);
-	}
-}
-
-reply(question)
-	char *question;
-{
-	int persevere;
-	char c;
-
-	if (preen)
-		pfatal("INTERNAL ERROR: GOT TO reply()");
-	persevere = !strcmp(question, "CONTINUE");
-	printf("\n");
-	if (!persevere && (nflag || fswritefd < 0)) {
-		printf("%s? no\n\n", question);
-		return (0);
-	}
-	if (yflag || (persevere && nflag)) {
-		printf("%s? yes\n\n", question);
-		return (1);
-	}
-	do	{
-		printf("%s? [yn] ", question);
-		(void) fflush(stdout);
-		c = getc(stdin);
-		while (c != '\n' && getc(stdin) != '\n')
-			if (feof(stdin))
-				return (0);
-	} while (c != 'y' && c != 'Y' && c != 'n' && c != 'N');
-	printf("\n");
-	if (c == 'y' || c == 'Y')
-		return (1);
-	return (0);
-}
-
-/*
- * Malloc buffers and set up cache.
- */
-bufinit()
-{
-	register struct bufarea *bp;
-	long bufcnt, i;
-	char *bufp;
-
-	pbp = pdirbp = (struct bufarea *)0;
-	bufp = malloc((unsigned int)sblock.fs_bsize);
-	if (bufp == 0)
-		errexit("cannot allocate buffer pool\n");
-	cgblk.b_un.b_buf = bufp;
-	initbarea(&cgblk);
-	bufhead.b_next = bufhead.b_prev = &bufhead;
-	bufcnt = MAXBUFSPACE / sblock.fs_bsize;
-	if (bufcnt < MINBUFS)
-		bufcnt = MINBUFS;
-	for (i = 0; i < bufcnt; i++) {
-		bp = (struct bufarea *)malloc(sizeof(struct bufarea));
-		bufp = malloc((unsigned int)sblock.fs_bsize);
-		if (bp == NULL || bufp == NULL) {
-			if (i >= MINBUFS)
-				break;
-			errexit("cannot allocate buffer pool\n");
-		}
-		bp->b_un.b_buf = bufp;
-		bp->b_prev = &bufhead;
-		bp->b_next = bufhead.b_next;
-		bufhead.b_next->b_prev = bp;
-		bufhead.b_next = bp;
-		initbarea(bp);
-	}
-	bufhead.b_size = i;	/* save number of buffers */
-}
-
-/*
- * Manage a cache of directory blocks.
- */
-struct bufarea *
-getdatablk(blkno, size)
-	daddr_t blkno;
-	long size;
-{
-	register struct bufarea *bp;
-
-	for (bp = bufhead.b_next; bp != &bufhead; bp = bp->b_next)
-		if (bp->b_bno == fsbtodb(&sblock, blkno))
-			goto foundit;
-	for (bp = bufhead.b_prev; bp != &bufhead; bp = bp->b_prev)
-		if ((bp->b_flags & B_INUSE) == 0)
-			break;
-	if (bp == &bufhead)
-		errexit("deadlocked buffer pool\n");
-	getblk(bp, blkno, size);
-	/* fall through */
-foundit:
-	totalreads++;
-	bp->b_prev->b_next = bp->b_next;
-	bp->b_next->b_prev = bp->b_prev;
-	bp->b_prev = &bufhead;
-	bp->b_next = bufhead.b_next;
-	bufhead.b_next->b_prev = bp;
-	bufhead.b_next = bp;
-	bp->b_flags |= B_INUSE;
-	return (bp);
-}
-
-void
-getblk(bp, blk, size)
-	register struct bufarea *bp;
-	daddr_t blk;
-	long size;
-{
-	daddr_t dblk;
-
-	dblk = fsbtodb(&sblock, blk);
-	if (bp->b_bno != dblk) {
-		flush(fswritefd, bp);
-		diskreads++;
-		bp->b_errs = bread(fsreadfd, bp->b_un.b_buf, dblk, size);
-		bp->b_bno = dblk;
-		bp->b_size = size;
-	}
-}
-
-flush(fd, bp)
-	int fd;
-	register struct bufarea *bp;
-{
-	register int i, j;
-
-	if (!bp->b_dirty)
-		return;
-	if (bp->b_errs != 0)
-		pfatal("WRITING %sZERO'ED BLOCK %d TO DISK\n",
-		    (bp->b_errs == bp->b_size / dev_bsize) ? "" : "PARTIALLY ",
-		    bp->b_bno);
-	bp->b_dirty = 0;
-	bp->b_errs = 0;
-	bwrite(fd, bp->b_un.b_buf, bp->b_bno, (long)bp->b_size);
-	if (bp != &sblk)
-		return;
-	for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize, j++) {
-		bwrite(fswritefd, (char *)sblock.fs_csp[j],
-		    fsbtodb(&sblock, sblock.fs_csaddr + j * sblock.fs_frag),
-		    sblock.fs_cssize - i < sblock.fs_bsize ?
-		    sblock.fs_cssize - i : sblock.fs_bsize);
-	}
-}
-
-rwerror(mesg, blk)
-	char *mesg;
-	daddr_t blk;
-{
-
-	if (preen == 0)
-		printf("\n");
-	pfatal("CANNOT %s: BLK %ld", mesg, blk);
-	if (reply("CONTINUE") == 0)
-		errexit("Program terminated\n");
-}
-
-ckfini()
-{
-	register struct bufarea *bp, *nbp;
-	int cnt = 0;
-
-	if (fswritefd < 0) {
-		(void)close(fsreadfd);
-		return;
-	}
-	flush(fswritefd, &sblk);
-	if (havesb && sblk.b_bno != SBOFF / dev_bsize &&
-	    !preen && reply("UPDATE STANDARD SUPERBLOCK")) {
-		sblk.b_bno = SBOFF / dev_bsize;
-		sbdirty();
-		flush(fswritefd, &sblk);
-	}
-	flush(fswritefd, &cgblk);
-	free(cgblk.b_un.b_buf);
-	for (bp = bufhead.b_prev; bp && bp != &bufhead; bp = nbp) {
-		cnt++;
-		flush(fswritefd, bp);
-		nbp = bp->b_prev;
-		free(bp->b_un.b_buf);
-		free((char *)bp);
-	}
-	if (bufhead.b_size != cnt)
-		errexit("Panic: lost %d buffers\n", bufhead.b_size - cnt);
-	pbp = pdirbp = (struct bufarea *)0;
-	if (debug)
-		printf("cache missed %ld of %ld (%d%%)\n", diskreads,
-		    totalreads, (int)(diskreads * 100 / totalreads));
-	(void)close(fsreadfd);
-	(void)close(fswritefd);
-}
-
-bread(fd, buf, blk, size)
-	int fd;
-	char *buf;
-	daddr_t blk;
-	long size;
-{
-	char *cp;
-	int i, errs;
-	off_t offset;
-
-	offset = blk;
-	offset *= dev_bsize;
-	if (lseek(fd, offset, 0) < 0)
-		rwerror("SEEK", blk);
-	else if (read(fd, buf, (int)size) == size)
-		return (0);
-	rwerror("READ", blk);
-	if (lseek(fd, offset, 0) < 0)
-		rwerror("SEEK", blk);
-	errs = 0;
-	bzero(buf, (size_t)size);
-	printf("THE FOLLOWING DISK SECTORS COULD NOT BE READ:");
-	for (cp = buf, i = 0; i < size; i += secsize, cp += secsize) {
-		if (read(fd, cp, (int)secsize) != secsize) {
-			(void)lseek(fd, offset + i + secsize, 0);
-			if (secsize != dev_bsize && dev_bsize != 1)
-				printf(" %ld (%ld),",
-				    (blk * dev_bsize + i) / secsize,
-				    blk + i / dev_bsize);
-			else
-				printf(" %ld,", blk + i / dev_bsize);
-			errs++;
-		}
-	}
-	printf("\n");
-	return (errs);
-}
-
-bwrite(fd, buf, blk, size)
-	int fd;
-	char *buf;
-	daddr_t blk;
-	long size;
-{
-	int i;
-	char *cp;
-	off_t offset;
-
-	if (fd < 0)
-		return;
-	offset = blk;
-	offset *= dev_bsize;
-	if (lseek(fd, offset, 0) < 0)
-		rwerror("SEEK", blk);
-	else if (write(fd, buf, (int)size) == size) {
-		fsmodified = 1;
-		return;
-	}
-	rwerror("WRITE", blk);
-	if (lseek(fd, offset, 0) < 0)
-		rwerror("SEEK", blk);
-	printf("THE FOLLOWING SECTORS COULD NOT BE WRITTEN:");
-	for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize)
-		if (write(fd, cp, (int)dev_bsize) != dev_bsize) {
-			(void)lseek(fd, offset + i + dev_bsize, 0);
-			printf(" %ld,", blk + i / dev_bsize);
-		}
-	printf("\n");
-	return;
-}
-
-/*
- * allocate a data block with the specified number of fragments
- */
-allocblk(frags)
-	long frags;
-{
-	register int i, j, k;
-
-	if (frags <= 0 || frags > sblock.fs_frag)
-		return (0);
-	for (i = 0; i < maxfsblock - sblock.fs_frag; i += sblock.fs_frag) {
-		for (j = 0; j <= sblock.fs_frag - frags; j++) {
-			if (testbmap(i + j))
-				continue;
-			for (k = 1; k < frags; k++)
-				if (testbmap(i + j + k))
-					break;
-			if (k < frags) {
-				j += k;
-				continue;
-			}
-			for (k = 0; k < frags; k++)
-				setbmap(i + j + k);
-			n_blks += frags;
-			return (i + j);
-		}
-	}
-	return (0);
-}
-
-/*
- * Free a previously allocated block
- */
-freeblk(blkno, frags)
-	daddr_t blkno;
-	long frags;
-{
-	struct inodesc idesc;
-
-	idesc.id_blkno = blkno;
-	idesc.id_numfrags = frags;
-	(void)pass4check(&idesc);
-}
-
-/*
- * Find a pathname
- */
-getpathname(namebuf, curdir, ino)
-	char *namebuf;
-	ino_t curdir, ino;
-{
-	int len;
-	register char *cp;
-	struct inodesc idesc;
-	static int busy = 0;
-	extern int findname();
-
-	if (curdir == ino && ino == ROOTINO) {
-		(void)strcpy(namebuf, "/");
-		return;
-	}
-	if (busy ||
-	    (statemap[curdir] != DSTATE && statemap[curdir] != DFOUND)) {
-		(void)strcpy(namebuf, "?");
-		return;
-	}
-	busy = 1;
-	bzero((char *)&idesc, sizeof(struct inodesc));
-	idesc.id_type = DATA;
-	idesc.id_fix = IGNORE;
-	cp = &namebuf[MAXPATHLEN - 1];
-	*cp = '\0';
-	if (curdir != ino) {
-		idesc.id_parent = curdir;
-		goto namelookup;
-	}
-	while (ino != ROOTINO) {
-		idesc.id_number = ino;
-		idesc.id_func = findino;
-		idesc.id_name = "..";
-		if ((ckinode(ginode(ino), &idesc) & FOUND) == 0)
-			break;
-	namelookup:
-		idesc.id_number = idesc.id_parent;
-		idesc.id_parent = ino;
-		idesc.id_func = findname;
-		idesc.id_name = namebuf;
-		if ((ckinode(ginode(idesc.id_number), &idesc)&FOUND) == 0)
-			break;
-		len = strlen(namebuf);
-		cp -= len;
-		bcopy(namebuf, cp, (size_t)len);
-		*--cp = '/';
-		if (cp < &namebuf[MAXNAMLEN])
-			break;
-		ino = idesc.id_number;
-	}
-	busy = 0;
-	if (ino != ROOTINO)
-		*--cp = '?';
-	bcopy(cp, namebuf, (size_t)(&namebuf[MAXPATHLEN] - cp));
-}
-
-void
-catch()
-{
-	if (!doinglevel2)
-		ckfini();
-	exit(12);
-}
-
-/*
- * When preening, allow a single quit to signal
- * a special exit after filesystem checks complete
- * so that reboot sequence may be interrupted.
- */
-void
-catchquit()
-{
-	extern returntosingle;
-
-	printf("returning to single-user after filesystem check\n");
-	returntosingle = 1;
-	(void)signal(SIGQUIT, SIG_DFL);
-}
-
-/*
- * Ignore a single quit signal; wait and flush just in case.
- * Used by child processes in preen.
- */
-void
-voidquit()
-{
-
-	sleep(1);
-	(void)signal(SIGQUIT, SIG_IGN);
-	(void)signal(SIGQUIT, SIG_DFL);
-}
-
-/*
- * determine whether an inode should be fixed.
- */
-dofix(idesc, msg)
-	register struct inodesc *idesc;
-	char *msg;
-{
-
-	switch (idesc->id_fix) {
-
-	case DONTKNOW:
-		if (idesc->id_type == DATA)
-			direrror(idesc->id_number, msg);
-		else
-			pwarn(msg);
-		if (preen) {
-			printf(" (SALVAGED)\n");
-			idesc->id_fix = FIX;
-			return (ALTERED);
-		}
-		if (reply("SALVAGE") == 0) {
-			idesc->id_fix = NOFIX;
-			return (0);
-		}
-		idesc->id_fix = FIX;
-		return (ALTERED);
-
-	case FIX:
-		return (ALTERED);
-
-	case NOFIX:
-	case IGNORE:
-		return (0);
-
-	default:
-		errexit("UNKNOWN INODESC FIX MODE %d\n", idesc->id_fix);
-	}
-	/* NOTREACHED */
-}
-
-/* VARARGS1 */
-errexit(s1, s2, s3, s4)
-	char *s1;
-{
-	printf(s1, s2, s3, s4);
-	exit(8);
-}
-
-/*
- * An unexpected inconsistency occurred.
- * Die if preening, otherwise just print message and continue.
- */
-/* VARARGS1 */
-pfatal(s, a1, a2, a3)
-	char *s;
-{
-
-	if (preen) {
-		printf("%s: ", cdevname);
-		printf(s, a1, a2, a3);
-		printf("\n");
-		printf("%s: UNEXPECTED INCONSISTENCY; RUN fsck MANUALLY.\n",
-			cdevname);
-		exit(8);
-	}
-	printf(s, a1, a2, a3);
-}
-
-/*
- * Pwarn just prints a message when not preening,
- * or a warning (preceded by filename) when preening.
- */
-/* VARARGS1 */
-pwarn(s, a1, a2, a3, a4, a5, a6)
-	char *s;
-{
-
-	if (preen)
-		printf("%s: ", cdevname);
-	printf(s, a1, a2, a3, a4, a5, a6);
-}
-
-#ifndef lint
-/*
- * Stub for routines from kernel.
- */
-panic(s)
-	char *s;
-{
-
-	pfatal("INTERNAL INCONSISTENCY:");
-	errexit(s);
-}
-#endif