This commit was generated by cvs2svn to compensate for changes in r12048,

which included commits to RCS files with non-trunk default branches.

5 files changed, 1366 insertions, 0 deletions

diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
new file mode 100644
index 0000000..381b817
--- /dev/null
+++ b/sbin/fsdb/Makefile
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/5/93
+
+PROG=	fsdb
+MAN=	fsdb.8
+SRCS=	fsdb.c fsdbutil.c \
+	dir.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
+	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
+CFLAGS+= -I${.CURDIR}/../../sbin/fsck
+LDADD+= -ledit -ltermcap
+.PATH:	${.CURDIR}/../../sbin/fsck ${.CURDIR}/../../sys/ufs/ffs
+
+.include <bsd.prog.mk>
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
new file mode 100644
index 0000000..a44d191
--- /dev/null
+++ b/sbin/fsdb/fsdb.8
@@ -0,0 +1,228 @@
+.\"	$NetBSD: fsdb.8,v 1.2 1995/10/08 23:18:08 thorpej Exp $
+.\"
+.\" Copyright (c) 1995 John T. Kohl
+.\" 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. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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.
+.\"
+.Dd September 14, 1995
+.Dt FSDB 8
+.Os NetBSD
+.Sh NAME
+.Nm fsdb
+.Nd FFS debugging/editing tool
+.Sh SYNOPSIS
+.Nm
+.Op Fl d
+.Fl f Ar fsname
+.Sh DESCRIPTION
+.Nm
+opens 
+.Ar fsname
+(usually a raw disk partition) and runs a command loop
+allowing manipulation of the file system's inode data.  You are prompted
+to enter a command with
+.Ic "fsdb (inum X)>"
+where
+.Va X
+is the currently selected i-number.  The initial selected inode is the
+root of the filesystem (i-number 2).
+The command processor uses the
+.Xr libedit 3
+library, so you can use command line editing to reduce typing if desired.
+When you exit the command loop, the file system superblock is marked
+dirty and any buffered blocks are written to the file system.
+.Pp
+The
+.Fl d
+option enables additional debugging output (which comes primarily from
+.Xr fsck 8 -derived
+code).
+.Sh COMMANDS
+Besides the built-in 
+.Xr libedit 3
+commands,
+.Nm
+supports these commands:
+.Pp
+.Bl -tag -width indent -compact
+.It Cm help
+Print out the list of accepted commands.
+.Pp
+.It Cm inode Ar i-number
+Select inode
+.Ar i-number
+as the new current inode.
+.Pp
+.It Cm back
+Revert to the previously current inode.
+.Pp
+.It Cm clri
+Clear the current inode.
+.Pp
+.It Cm lookup Ar name
+.It Cm cd Ar name
+Find
+.Ar name
+in the current directory and make its inode the current inode.
+.Ar Name
+may be a multi-component name or may begin with slash to indicate that
+the root inode should be used to start the lookup.  If some component
+along the pathname is not found, the last valid directory encountered is
+left as the active inode.
+.br
+This command is valid only if the starting inode is a directory.
+.Pp
+.It Cm active
+.It Cm print
+Print out the active inode.
+.Pp
+.It Cm uplink
+Increment the active inode's link count.
+.Pp
+.It Cm downlink
+Decrement the active inode's link count.
+.Pp
+.It Cm linkcount Ar number
+Set the active inode's link count to
+.Ar number .
+.Pp
+.It Cm ls
+List the current inode's directory entries.  This command is valid only
+if the current inode is a directory. 
+.Pp
+.It Cm rm Ar name
+.It Cm del Ar name
+Remove the entry
+.Ar name
+from the current directory inode.  This command is valid only
+if the current inode is a directory.
+.Pp
+.It Cm ln Ar ino Ar name
+Create a link to inode
+.Ar ino
+under the name
+.Ar name
+in the current directory inode.  This command is valid only
+if the current inode is a directory.
+.Pp
+.It Cm chinum Ar dirslot Ar inum
+Change the i-number in directory entry
+.Ar dirslot
+to
+.Ar inum .
+.Pp
+.It Cm chname Ar dirslot Ar name
+Change the name in directory entry
+.Ar dirslot
+to
+.Ar name .
+This command cannot expand a directory entry.  You can only rename an
+entry if the name will fit into the existing directory slot.
+.Pp
+.It Cm chtype Ar type
+Change the type of the current inode to
+.Ar type .
+.Ar type
+may be one of:
+.Em file ,
+.Em dir ,
+.Em socket ,
+or
+.Em fifo .
+.Pp
+.It Cm chmod Ar mode
+Change the mode bits of the current inode to
+.Ar mode .
+You cannot change the file type with this subcommand; use
+.Ic chtype
+to do that.
+.Pp
+.It Cm chflags Ar flags
+Change the file flags of the current inode to
+.Ar flags .
+.Pp
+.It Cm chown Ar uid
+Change the owner of the current inode to
+.Ar uid .
+.Pp
+.It Cm chgrp Ar gid
+Change the group of the current inode to
+.Ar gid .
+.Pp
+.It Cm chgen Ar gen
+Change the generation number of the current inode to
+.Ar gen .
+.Pp
+.It Cm mtime Ar time
+.It Cm ctime Ar time
+.It Cm atime Ar time
+Change the modification, change, or access time (respectively) on the
+current inode to 
+.Ar time .
+.Ar Time
+should be in the format
+.Em YYYYMMDDHHMMSS[.nsec]
+where
+.Em nsec
+is an optional nanosecond specification.  If no nanoseconds are specified, the
+.Va mtimensec ,
+.Va ctimensec ,
+or
+.Va atimensec 
+field will be set to zero.
+.Pp
+.It Cm quit, Cm q, Cm exit, Em <EOF>
+Exit the program.
+.El
+.Sh SEE ALSO
+.Xr libedit 3 ,
+.Xr fs 5 ,
+.Xr fsck 8 ,
+.Xr clri 8 .
+.Sh BUGS
+Manipulation of ``short'' symlinks doesn't work (in particular, don't
+try changing a symlink's type).
+.br
+You must specify modes as numbers rather than symbolic names.
+.br
+There are a bunch of other things that you might want to do which
+.Nm
+doesn't implement.
+.br
+The
+.Xr libedit 3
+reference page is not yet written.
+.Sh HISTORY
+.Nm
+uses the source code for
+.Xr fsck 8
+to implement most of the file system manipulation code.  The remainder of
+.Nm
+first appeared in NetBSD.
+.Sh WARNING
+Use this tool with extreme caution--you can damage an FFS file system
+beyond what
+.Xr fsck 8
+can repair. 
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
new file mode 100644
index 0000000..8a5ad7b
--- /dev/null
+++ b/sbin/fsdb/fsdb.c
@@ -0,0 +1,865 @@
+/*	$NetBSD: fsdb.c,v 1.2 1995/10/08 23:18:10 thorpej Exp $	*/
+
+/*
+ *  Copyright (c) 1995 John T. Kohl
+ *  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. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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 rcsid[] = "$NetBSD: fsdb.c,v 1.2 1995/10/08 23:18:10 thorpej Exp $";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/mount.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <histedit.h>
+#include <limits.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
+
+#include "fsdb.h"
+#include "fsck.h"
+
+extern char *__progname;	/* from crt0.o */
+
+void usage __P((void));
+int cmdloop __P((void));
+
+void 
+usage()
+{
+	errx(1, "usage: %s [-d] -f <fsname>", __progname);
+}
+
+int returntosingle = 0;
+
+/*
+ * We suck in lots of fsck code, and just pick & choose the stuff we want.
+ *
+ * fsreadfd is set up to read from the file system, fswritefd to write to
+ * the file system.
+ */
+void
+main(argc, argv)
+	int argc;
+	char *argv[];
+{
+	int ch, rval;
+	char *fsys = NULL;
+	struct stat stb;
+
+	while (-1 != (ch = getopt(argc, argv, "f:d"))) {
+		switch (ch) {
+		case 'f':
+			fsys = optarg;
+			break;
+		case 'd':
+			debug++;
+			break;
+		default:
+			usage();
+		}
+	}
+	if (fsys == NULL)
+		usage();
+	if (!setup(fsys))
+		errx(1, "cannot set up file system `%s'", fsys);
+	printf("Editing file system `%s'\nLast Mounted on %s\n", fsys,
+	       sblock.fs_fsmnt);
+	rval = cmdloop();
+	sblock.fs_clean = 0;		/* mark it dirty */
+	sbdirty();
+	ckfini(0);
+	printf("*** FILE SYSTEM MARKED DIRTY\n");
+	printf("*** BE SURE TO RUN FSCK TO CLEAN UP ANY DAMAGE\n");
+	printf("*** IF IT WAS MOUNTED, RE-MOUNT WITH -u -o reload\n");
+	exit(rval);
+}
+
+#define CMDFUNC(func) int func __P((int argc, char *argv[]))
+#define CMDFUNCSTART(func) int func(argc, argv)		\
+				int argc;		\
+				char *argv[];
+
+CMDFUNC(helpfn);
+CMDFUNC(focus);				/* focus on inode */
+CMDFUNC(active);			/* print active inode */
+CMDFUNC(focusname);			/* focus by name */
+CMDFUNC(zapi);				/* clear inode */
+CMDFUNC(uplink);			/* incr link */
+CMDFUNC(downlink);			/* decr link */
+CMDFUNC(linkcount);			/* set link count */
+CMDFUNC(quit);				/* quit */
+CMDFUNC(ls);				/* list directory */
+CMDFUNC(rm);				/* remove name */
+CMDFUNC(ln);				/* add name */
+CMDFUNC(newtype);			/* change type */
+CMDFUNC(chmode);			/* change mode */
+CMDFUNC(chaflags);			/* change flags */
+CMDFUNC(chgen);				/* change generation */
+CMDFUNC(chowner);			/* change owner */
+CMDFUNC(chgroup);			/* Change group */
+CMDFUNC(back);				/* pop back to last ino */
+CMDFUNC(chmtime);			/* Change mtime */
+CMDFUNC(chctime);			/* Change ctime */
+CMDFUNC(chatime);			/* Change atime */
+CMDFUNC(chinum);			/* Change inode # of dirent */
+CMDFUNC(chname);			/* Change dirname of dirent */
+
+struct cmdtable cmds[] = {
+	{ "help", "Print out help", 1, 1, helpfn },
+	{ "?", "Print out help", 1, 1, helpfn },
+	{ "inode", "Set active inode to INUM", 2, 2, focus },
+	{ "clri", "Clear inode INUM", 2, 2, zapi },
+	{ "lookup", "Set active inode by looking up NAME", 2, 2, focusname },
+	{ "cd", "Set active inode by looking up NAME", 2, 2, focusname },
+	{ "back", "Go to previous active inode", 1, 1, back },
+	{ "active", "Print active inode", 1, 1, active },
+	{ "print", "Print active inode", 1, 1, active },
+	{ "uplink", "Increment link count", 1, 1, uplink },
+	{ "downlink", "Decrement link count", 1, 1, downlink },
+	{ "linkcount", "Set link count to COUNT", 2, 2, linkcount },
+	{ "ls", "List current inode as directory", 1, 1, ls },
+	{ "rm", "Remove NAME from current inode directory", 2, 2, rm },
+	{ "del", "Remove NAME from current inode directory", 2, 2, rm },
+	{ "ln", "Hardlink INO into current inode directory as NAME", 3, 3, ln },
+	{ "chinum", "Change dir entry number INDEX to INUM", 3, 3, chinum },
+	{ "chname", "Change dir entry number INDEX to NAME", 3, 3, chname },
+	{ "chtype", "Change type of current inode to TYPE", 2, 2, newtype },
+	{ "chmod", "Change mode of current inode to MODE", 2, 2, chmode },
+	{ "chown", "Change owner of current inode to OWNER", 2, 2, chowner },
+	{ "chgrp", "Change group of current inode to GROUP", 2, 2, chgroup },
+	{ "chflags", "Change flags of current inode to FLAGS", 2, 2, chaflags },
+	{ "chgen", "Change generation number of current inode to GEN", 2, 2, chgen },
+	{ "mtime", "Change mtime of current inode to MTIME", 2, 2, chmtime },
+	{ "ctime", "Change ctime of current inode to CTIME", 2, 2, chctime },
+	{ "atime", "Change atime of current inode to ATIME", 2, 2, chatime },
+	{ "quit", "Exit", 1, 1, quit },
+	{ "q", "Exit", 1, 1, quit },
+	{ "exit", "Exit", 1, 1, quit },
+	{ NULL, 0, 0, 0 },
+};
+
+int
+helpfn(argc, argv)
+	int argc;
+	char *argv[];
+{
+    register struct cmdtable *cmdtp;
+
+    printf("Commands are:\n%-10s %5s %5s   %s\n",
+	   "command", "min argc", "max argc", "what");
+    
+    for (cmdtp = cmds; cmdtp->cmd; cmdtp++)
+	printf("%-10s %5u %5u   %s\n",
+	       cmdtp->cmd, cmdtp->minargc, cmdtp->maxargc, cmdtp->helptxt);
+    return 0;
+}
+
+char *
+prompt(el)
+	EditLine *el;
+{
+    static char pstring[64];
+    snprintf(pstring, sizeof(pstring), "fsdb (inum: %d)> ", curinum);
+    return pstring;
+}
+
+
+int
+cmdloop()
+{
+    char *line;
+    const char *elline;
+    int cmd_argc, rval = 0, known;
+#define scratch known
+    char **cmd_argv;
+    struct cmdtable *cmdp;
+    History *hist;
+    EditLine *elptr;
+
+    curinode = ginode(ROOTINO);
+    curinum = ROOTINO;
+    printactive();
+
+    hist = history_init();
+    history(hist, H_EVENT, 100);	/* 100 elt history buffer */
+
+    elptr = el_init(__progname, stdin, stdout);
+    el_set(elptr, EL_EDITOR, "emacs");
+    el_set(elptr, EL_PROMPT, prompt);
+    el_set(elptr, EL_HIST, history, hist);
+    el_source(elptr, NULL);
+
+    while ((elline = el_gets(elptr, &scratch)) != NULL && scratch != 0) {
+	if (debug)
+	    printf("command `%s'\n", line);
+
+	history(hist, H_ENTER, elline);
+
+	line = strdup(elline);
+	cmd_argv = crack(line, &cmd_argc);
+	/*
+	 * el_parse returns -1 to signal that it's not been handled
+	 * internally.
+	 */
+	if (el_parse(elptr, cmd_argc, cmd_argv) != -1)
+	    continue;
+	if (cmd_argc) {
+	    known = 0;
+	    for (cmdp = cmds; cmdp->cmd; cmdp++) {
+		if (!strcmp(cmdp->cmd, cmd_argv[0])) {
+		    if (cmd_argc >= cmdp->minargc &&
+			cmd_argc <= cmdp->maxargc)
+			rval = (*cmdp->handler)(cmd_argc, cmd_argv);
+		    else
+			rval = argcount(cmdp, cmd_argc, cmd_argv);
+		    known = 1;
+		    break;
+		}
+	    }
+	    if (!known)
+		warnx("unknown command `%s'", cmd_argv[0]), rval = 1;
+	} else
+	    rval = 0;
+	free(line);
+	if (rval < 0)
+	    return rval;
+	if (rval)
+	    warnx("rval was %d", rval);
+    }
+    el_end(elptr);
+    history_end(hist);
+    return rval;
+}
+
+struct dinode *curinode;
+ino_t curinum, ocurrent;
+
+#define GETINUM(ac,inum)    inum = strtoul(argv[ac], &cp, 0); \
+    if (inum < ROOTINO || inum > maxino || cp == argv[ac] || *cp != '\0' ) { \
+	printf("inode %d out of range; range is [%d,%d]\n", \
+	       inum, ROOTINO, maxino); \
+	return 1; \
+    }
+
+/*
+ * Focus on given inode number
+ */
+CMDFUNCSTART(focus)
+{
+    ino_t inum;
+    char *cp;
+
+    GETINUM(1,inum);
+    curinode = ginode(inum);
+    ocurrent = curinum;
+    curinum = inum;
+    printactive();
+    return 0;
+}
+
+CMDFUNCSTART(back)
+{
+    curinum = ocurrent;
+    curinode = ginode(curinum);
+    printactive();
+    return 0;
+}
+
+CMDFUNCSTART(zapi)
+{
+    ino_t inum;
+    struct dinode *dp;
+    char *cp;
+
+    GETINUM(1,inum);
+    dp = ginode(inum);
+    clearinode(dp);
+    inodirty();
+    if (curinode)			/* re-set after potential change */
+	curinode = ginode(curinum);
+    return 0;
+}
+
+CMDFUNCSTART(active)
+{
+    printactive();
+    return 0;
+}
+
+
+CMDFUNCSTART(quit)
+{
+    return -1;
+}
+
+CMDFUNCSTART(uplink)
+{
+    if (!checkactive())
+	return 1;
+    printf("inode %d link count now %d\n", curinum, ++curinode->di_nlink);
+    inodirty();
+    return 0;
+}
+
+CMDFUNCSTART(downlink)
+{
+    if (!checkactive())
+	return 1;
+    printf("inode %d link count now %d\n", curinum, --curinode->di_nlink);
+    inodirty();
+    return 0;
+}
+
+const char *typename[] = {
+    "unknown",
+    "fifo",
+    "char special",
+    "unregistered #3",
+    "directory",
+    "unregistered #5",
+    "blk special",
+    "unregistered #7",
+    "regular",
+    "unregistered #9",
+    "symlink",
+    "unregistered #11",
+    "socket",
+    "unregistered #13",
+    "whiteout",
+};
+    
+int slot;
+
+int
+scannames(idesc)
+	struct inodesc *idesc;
+{
+	register struct direct *dirp = idesc->id_dirp;
+
+	printf("slot %d ino %d reclen %d: %s, `%.*s'\n",
+	       slot++, dirp->d_ino, dirp->d_reclen, typename[dirp->d_type],
+	       dirp->d_namlen, dirp->d_name);
+	return (KEEPON);
+}
+
+CMDFUNCSTART(ls)
+{
+    struct inodesc idesc;
+    checkactivedir();			/* let it go on anyway */
+
+    slot = 0;
+    idesc.id_number = curinum;
+    idesc.id_func = scannames;
+    idesc.id_type = DATA;
+    idesc.id_fix = IGNORE;
+    ckinode(curinode, &idesc);
+    curinode = ginode(curinum);
+
+    return 0;
+}
+
+int findino __P((struct inodesc *idesc)); /* from fsck */
+static int dolookup __P((char *name));
+
+static int
+dolookup(name)
+	char *name;
+{
+    struct inodesc idesc;
+
+    if (!checkactivedir())
+	    return 0;
+    idesc.id_number = curinum;
+    idesc.id_func = findino;
+    idesc.id_name = name;
+    idesc.id_type = DATA;
+    idesc.id_fix = IGNORE;
+    if (ckinode(curinode, &idesc) & FOUND) {
+	curinum = idesc.id_parent;
+	curinode = ginode(curinum);
+	printactive();
+	return 1;
+    } else {
+	warnx("name `%s' not found in current inode directory", name);
+	return 0;
+    }
+}
+
+CMDFUNCSTART(focusname)
+{
+    char *p, *val;
+
+    if (!checkactive())
+	return 1;
+
+    ocurrent = curinum;
+    
+    if (argv[1][0] == '/') {
+	curinum = ROOTINO;
+	curinode = ginode(ROOTINO);
+    } else {
+	if (!checkactivedir())
+	    return 1;
+    }
+    for (p = argv[1]; p != NULL;) {
+	while ((val = strsep(&p, "/")) != NULL && *val == '\0');
+	if (val) {
+	    printf("component `%s': ", val);
+	    fflush(stdout);
+	    if (!dolookup(val)) {
+		curinode = ginode(curinum);
+		return(1);
+	    }
+	}
+    }
+    return 0;
+}
+
+CMDFUNCSTART(ln)
+{
+    ino_t inum;
+    struct dinode *dp;
+    int rval;
+    char *cp;
+
+    GETINUM(1,inum);
+
+    if (!checkactivedir())
+	return 1;
+    rval = makeentry(curinum, inum, argv[2]);
+    if (rval)
+	printf("Ino %d entered as `%s'\n", inum, argv[2]);
+    else
+	printf("could not enter name? weird.\n");
+    curinode = ginode(curinum);
+    return rval;
+}
+
+CMDFUNCSTART(rm)
+{
+    int rval;
+
+    if (!checkactivedir())
+	return 1;
+    rval = changeino(curinum, argv[1], 0);
+    if (rval & ALTERED) {
+	printf("Name `%s' removed\n", argv[1]);
+	return 0;
+    } else {
+	printf("could not remove name? weird.\n");
+	return 1;
+    }
+}
+
+long slotcount, desired;
+
+int
+chinumfunc(idesc)
+	struct inodesc *idesc;
+{
+	register struct direct *dirp = idesc->id_dirp;
+
+	if (slotcount++ == desired) {
+	    dirp->d_ino = idesc->id_parent;
+	    return STOP|ALTERED|FOUND;
+	}
+	return KEEPON;
+}
+
+CMDFUNCSTART(chinum)
+{
+    int rval;
+    char *cp;
+    ino_t inum;
+    struct inodesc idesc;
+    
+    slotcount = 0;
+    if (!checkactivedir())
+	return 1;
+    GETINUM(2,inum);
+
+    desired = strtol(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0' || desired < 0) {
+	printf("invalid slot number `%s'\n", argv[1]);
+	return 1;
+    }
+
+    idesc.id_number = curinum;
+    idesc.id_func = chinumfunc;
+    idesc.id_fix = IGNORE;
+    idesc.id_type = DATA;
+    idesc.id_parent = inum;		/* XXX convenient hiding place */
+
+    if (ckinode(curinode, &idesc) & FOUND)
+	return 0;
+    else {
+	warnx("no %sth slot in current directory", argv[1]);
+	return 1;
+    }
+}
+
+int
+chnamefunc(idesc)
+	struct inodesc *idesc;
+{
+	register struct direct *dirp = idesc->id_dirp;
+	struct direct testdir;
+
+	if (slotcount++ == desired) {
+	    /* will name fit? */
+	    testdir.d_namlen = strlen(idesc->id_name);
+	    if (DIRSIZ(NEWDIRFMT, &testdir) <= dirp->d_reclen) {
+		dirp->d_namlen = testdir.d_namlen;
+		strcpy(dirp->d_name, idesc->id_name);
+		return STOP|ALTERED|FOUND;
+	    } else
+		return STOP|FOUND;	/* won't fit, so give up */
+	}
+	return KEEPON;
+}
+
+CMDFUNCSTART(chname)
+{
+    int rval;
+    char *cp;
+    ino_t inum;
+    struct inodesc idesc;
+    
+    slotcount = 0;
+    if (!checkactivedir())
+	return 1;
+
+    desired = strtoul(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0') {
+	printf("invalid slot number `%s'\n", argv[1]);
+	return 1;
+    }
+
+    idesc.id_number = curinum;
+    idesc.id_func = chnamefunc;
+    idesc.id_fix = IGNORE;
+    idesc.id_type = DATA;
+    idesc.id_name = argv[2];
+
+    rval = ckinode(curinode, &idesc);
+    if ((rval & (FOUND|ALTERED)) == (FOUND|ALTERED))
+	return 0;
+    else if (rval & FOUND) {
+	warnx("new name `%s' does not fit in slot %s\n", argv[2], argv[1]);
+	return 1;
+    } else {
+	warnx("no %sth slot in current directory", argv[1]);
+	return 1;
+    }
+}
+
+struct typemap {
+    const char *typename;
+    int typebits;
+} typenamemap[]  = {
+    {"file", IFREG},
+    {"dir", IFDIR},
+    {"socket", IFSOCK},
+    {"fifo", IFIFO},
+};
+
+CMDFUNCSTART(newtype)
+{
+    int rval = 1;
+    int type;
+    struct typemap *tp;
+
+    if (!checkactive())
+	return 1;
+    type = curinode->di_mode & IFMT;
+    for (tp = typenamemap;
+	 tp < &typenamemap[sizeof(typemap)/sizeof(*typemap)];
+	 tp++) {
+	if (!strcmp(argv[1], tp->typename)) {
+	    printf("setting type to %s\n", tp->typename);
+	    type = tp->typebits;
+	    break;
+	}
+    }
+    if (tp == &typenamemap[sizeof(typemap)/sizeof(*typemap)]) {
+	warnx("type `%s' not known", argv[1]);
+	warnx("try one of `file', `dir', `socket', `fifo'");
+	return 1;
+    }
+    curinode->di_mode &= ~IFMT;
+    curinode->di_mode |= type;
+    inodirty();
+    printactive();
+    return 0;
+}
+
+CMDFUNCSTART(chmode)
+{
+    int rval = 1;
+    long modebits;
+    char *cp;
+
+    if (!checkactive())
+	return 1;
+
+    modebits = strtol(argv[1], &cp, 8);
+    if (cp == argv[1] || *cp != '\0' ) { 
+	warnx("bad modebits `%s'", argv[1]);
+	return 1;
+    }
+    
+    curinode->di_mode &= ~07777;
+    curinode->di_mode |= modebits;
+    inodirty();
+    printactive();
+    return rval;
+}
+
+CMDFUNCSTART(chaflags)
+{
+    int rval = 1;
+    u_long flags;
+    char *cp;
+
+    if (!checkactive())
+	return 1;
+
+    flags = strtoul(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0' ) { 
+	warnx("bad flags `%s'", argv[1]);
+	return 1;
+    }
+    
+    if (flags > UINT_MAX) {
+	warnx("flags set beyond 32-bit range of field (%lx)\n", flags);
+	return(1);
+    }
+    curinode->di_flags = flags;
+    inodirty();
+    printactive();
+    return rval;
+}
+
+CMDFUNCSTART(chgen)
+{
+    int rval = 1;
+    long gen;
+    char *cp;
+
+    if (!checkactive())
+	return 1;
+
+    gen = strtol(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0' ) { 
+	warnx("bad gen `%s'", argv[1]);
+	return 1;
+    }
+    
+    if (gen > INT_MAX || gen < INT_MIN) {
+	warnx("gen set beyond 32-bit range of field (%lx)\n", gen);
+	return(1);
+    }
+    curinode->di_gen = gen;
+    inodirty();
+    printactive();
+    return rval;
+}
+
+CMDFUNCSTART(linkcount)
+{
+    int rval = 1;
+    int lcnt;
+    char *cp;
+
+    if (!checkactive())
+	return 1;
+
+    lcnt = strtol(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0' ) { 
+	warnx("bad link count `%s'", argv[1]);
+	return 1;
+    }
+    if (lcnt > USHRT_MAX || lcnt < 0) {
+	warnx("max link count is %d\n", USHRT_MAX);
+	return 1;
+    }
+    
+    curinode->di_nlink = lcnt;
+    inodirty();
+    printactive();
+    return rval;
+}
+
+CMDFUNCSTART(chowner)
+{
+    int rval = 1;
+    unsigned long uid;
+    char *cp;
+    struct passwd *pwd;
+
+    if (!checkactive())
+	return 1;
+
+    uid = strtoul(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0' ) { 
+	/* try looking up name */
+	if (pwd = getpwnam(argv[1])) {
+	    uid = pwd->pw_uid;
+	} else {
+	    warnx("bad uid `%s'", argv[1]);
+	    return 1;
+	}
+    }
+    
+    curinode->di_uid = uid;
+    inodirty();
+    printactive();
+    return rval;
+}
+
+CMDFUNCSTART(chgroup)
+{
+    int rval = 1;
+    unsigned long gid;
+    char *cp;
+    struct group *grp;
+
+    if (!checkactive())
+	return 1;
+
+    gid = strtoul(argv[1], &cp, 0);
+    if (cp == argv[1] || *cp != '\0' ) { 
+	if (grp = getgrnam(argv[1])) {
+	    gid = grp->gr_gid;
+	} else {
+	    warnx("bad gid `%s'", argv[1]);
+	    return 1;
+	}
+    }
+    
+    curinode->di_gid = gid;
+    inodirty();
+    printactive();
+    return rval;
+}
+
+int
+dotime(name, rsec, rnsec)
+	char *name;
+	int32_t *rsec, *rnsec;
+{
+    char *p, *val;
+    struct tm t;
+    int32_t sec;
+    int32_t nsec;
+    p = strchr(name, '.');
+    if (p) {
+	*p = '\0';
+	nsec = strtoul(++p, &val, 0);
+	if (val == p || *val != '\0' || nsec >= 1000000000 || nsec < 0) {
+		warnx("invalid nanoseconds");
+		goto badformat;
+	}
+    } else
+	nsec = 0;
+    if (strlen(name) != 14) {
+badformat:
+	warnx("date format: YYYYMMDDHHMMSS[.nsec]");
+	return 1;
+    }
+
+    for (p = name; *p; p++)
+	if (*p < '0' || *p > '9')
+	    goto badformat;
+    
+    p = name;
+#define VAL() ((*p++) - '0')
+    t.tm_year = VAL();
+    t.tm_year = VAL() + t.tm_year * 10;
+    t.tm_year = VAL() + t.tm_year * 10;
+    t.tm_year = VAL() + t.tm_year * 10 - 1900;
+    t.tm_mon = VAL();
+    t.tm_mon = VAL() + t.tm_mon * 10 - 1;
+    t.tm_mday = VAL();
+    t.tm_mday = VAL() + t.tm_mday * 10;
+    t.tm_hour = VAL();
+    t.tm_hour = VAL() + t.tm_hour * 10;
+    t.tm_min = VAL();
+    t.tm_min = VAL() + t.tm_min * 10;
+    t.tm_sec = VAL();
+    t.tm_sec = VAL() + t.tm_sec * 10;
+    t.tm_isdst = -1;
+
+    sec = mktime(&t);
+    if (sec == -1) {
+	warnx("date/time out of range");
+	return 1;
+    }
+    *rsec = sec;
+    *rnsec = nsec;
+    return 0;
+}
+
+CMDFUNCSTART(chmtime)
+{
+    if (dotime(argv[1], &curinode->di_ctime, &curinode->di_ctimensec))
+	return 1;
+    inodirty();
+    printactive();
+    return 0;
+}
+
+CMDFUNCSTART(chatime)
+{
+    if (dotime(argv[1], &curinode->di_ctime, &curinode->di_ctimensec))
+	return 1;
+    inodirty();
+    printactive();
+    return 0;
+}
+
+CMDFUNCSTART(chctime)
+{
+    if (dotime(argv[1], &curinode->di_ctime, &curinode->di_ctimensec))
+	return 1;
+    inodirty();
+    printactive();
+    return 0;
+}
diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h
new file mode 100644
index 0000000..af51907
--- /dev/null
+++ b/sbin/fsdb/fsdb.h
@@ -0,0 +1,56 @@
+/*	$NetBSD: fsdb.h,v 1.2 1995/10/08 23:18:11 thorpej Exp $	*/
+
+/*
+ *  Copyright (c) 1995 John T. Kohl
+ *  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. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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.
+ */
+
+extern int bread __P((int fd, char *buf, daddr_t blk, long size));
+extern void bwrite __P((int fd, char *buf, daddr_t blk, long size));
+extern void rwerror __P((char *mesg, daddr_t blk));
+extern int reply __P((char *question));
+
+extern long dev_bsize;
+extern long secsize;
+extern int fsmodified;
+extern int fsfd;
+
+struct cmdtable {
+	const char *cmd;
+	const char *helptxt;
+	unsigned int minargc;
+	unsigned int maxargc;
+	int (*handler) __P((int argc, char *argv[]));
+};
+extern struct dinode *curinode;
+extern ino_t curinum;
+
+int argcount __P((struct cmdtable *cmdp, int argc, char *argv[]));
+char **crack __P((char *line, int *argc));
+void printstat __P((const char *cp, ino_t inum, struct dinode *dp));
+int printactive __P((void));
+int checkactive __P((void));
+int checkactivedir __P((void));
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
new file mode 100644
index 0000000..1003b9d
--- /dev/null
+++ b/sbin/fsdb/fsdbutil.c
@@ -0,0 +1,204 @@
+/*	$NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $	*/
+
+/*
+ *  Copyright (c) 1995 John T. Kohl
+ *  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. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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 rcsid[] = "$NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/mount.h>
+#include <ctype.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
+
+#include "fsdb.h"
+#include "fsck.h"
+
+char **
+crack(line, argc)
+	char *line;
+	int *argc;
+{
+    static char *argv[8];
+    int i;
+    char *p, *val;
+    for (p = line, i = 0; p != NULL && i < 8; i++) {
+	while ((val = strsep(&p, " \t\n")) != NULL && *val == '\0')
+	    /**/;
+	if (val)
+	    argv[i] = val;
+	else
+	    break;
+    }
+    *argc = i;
+    return argv;
+}
+
+int
+argcount(cmdp, argc, argv)
+	struct cmdtable *cmdp;
+	int argc;
+	char *argv[];
+{
+    if (cmdp->minargc == cmdp->maxargc)
+	warnx("command `%s' takes %u arguments", cmdp->cmd, cmdp->minargc-1);
+    else
+	warnx("command `%s' takes from %u to %u arguments",
+	      cmdp->cmd, cmdp->minargc-1, cmdp->maxargc-1);
+	    
+    warnx("usage: %s: %s", cmdp->cmd, cmdp->helptxt);
+    return 1;
+}
+
+void
+printstat(cp, inum, dp)
+	const char *cp;
+	ino_t inum;
+	struct dinode *dp;
+{
+    struct group *grp;
+    struct passwd *pw;
+    char *p;
+
+    printf("%s: ", cp);
+    switch (dp->di_mode & IFMT) {
+    case IFDIR:
+	puts("directory");
+	break;
+    case IFREG:
+	puts("regular file");
+	break;
+    case IFBLK:
+	printf("block special (%d,%d)",
+	       major(dp->di_rdev), minor(dp->di_rdev));
+	break;
+    case IFCHR:
+	printf("character special (%d,%d)",
+	       major(dp->di_rdev), minor(dp->di_rdev));
+	break;
+    case IFLNK:
+	fputs("symlink",stdout);
+	if (dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN &&
+	    dp->di_blocks == 0)
+	    printf(" to `%.*s'\n", (int) dp->di_size, (char *)dp->di_shortlink);
+	else
+		putchar('\n');
+	break;
+    case IFSOCK:
+	puts("socket");
+	break;
+    case IFIFO:
+	puts("fifo");
+	break;
+    }
+    printf("I=%lu MODE=%o SIZE=%qu", inum, dp->di_mode, dp->di_size);
+    p = ctime(&dp->di_mtime);
+    printf("\n\tMTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20],
+	   dp->di_mtimensec);
+    p = ctime(&dp->di_ctime);
+    printf("\n\tCTIME=%15.15s %4.4s [%d nsec]", &p[4], &p[20],
+	   dp->di_ctimensec);
+    p = ctime(&dp->di_atime);
+    printf("\n\tATIME=%15.15s %4.4s [%d nsec]\n", &p[4], &p[20],
+	   dp->di_atimensec);
+
+    if (pw = getpwuid(dp->di_uid))
+	printf("OWNER=%s ", pw->pw_name);
+    else
+	printf("OWNUID=%u ", dp->di_uid);
+    if (grp = getgrgid(dp->di_gid))
+	printf("GRP=%s ", grp->gr_name);
+    else
+	printf("GID=%u ", dp->di_gid);
+
+    printf("LINKCNT=%hd FLAGS=%#x BLKCNT=%x GEN=%x\n", dp->di_nlink, dp->di_flags,
+	   dp->di_blocks, dp->di_gen);
+}
+
+int
+checkactive()
+{
+    if (!curinode) {
+	warnx("no current inode\n");
+	return 0;
+    }
+    return 1;
+}
+
+int
+checkactivedir()
+{
+    if (!curinode) {
+	warnx("no current inode\n");
+	return 0;
+    }
+    if ((curinode->di_mode & IFMT) != IFDIR) {
+	warnx("inode %d not a directory", curinum);
+	return 0;
+    }
+    return 1;
+}
+
+int
+printactive()
+{
+    if (!checkactive())
+	return 1;
+    switch (curinode->di_mode & IFMT) {
+    case IFDIR:
+    case IFREG:
+    case IFBLK:
+    case IFCHR:
+    case IFLNK:
+    case IFSOCK:
+    case IFIFO:
+	printstat("current inode", curinum, curinode);
+	break;
+    case 0:
+	printf("current inode %d: unallocated inode\n", curinum);
+	break;
+    default:
+	printf("current inode %d: screwy itype 0%o (mode 0%o)?\n",
+	       curinum, curinode->di_mode & IFMT, curinode->di_mode);
+	break;
+    }
+    return 0;
+}