Remove dumplfs, okay millert@ miod@

5 files changed, 0 insertions, 763 deletions

diff --git a/sbin/dumplfs/Makefile b/sbin/dumplfs/Makefile
deleted file mode 100644
index a930e7f60ff..00000000000
--- a/sbin/dumplfs/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:36:23 deraadt Exp $
-
-PROG=	dumplfs
-SRCS=	dumplfs.c lfs_cksum.c misc.c
-.PATH:	${.CURDIR}/../../sys/ufs/lfs
-MAN=	dumplfs.8
-
-.include <bsd.prog.mk>
diff --git a/sbin/dumplfs/dumplfs.8 b/sbin/dumplfs/dumplfs.8
deleted file mode 100644
index 15ffcaca50f..00000000000
--- a/sbin/dumplfs/dumplfs.8
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"	$OpenBSD: dumplfs.8,v 1.9 2003/06/02 20:06:14 millert Exp $
-.\"	$NetBSD: dumplfs.8,v 1.2 1995/03/18 14:55:19 cgd Exp $
-.\"
-.\" Copyright (c) 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. 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.
-.\"
-.\"     @(#)dumplfs.8	8.1 (Berkeley) 6/18/93
-.\"
-.Dd June 18, 1993
-.Dt DUMPLFS 8
-.Os
-.Sh NAME
-.Nm dumplfs
-.Nd dump file system information
-.Sh SYNOPSIS
-.Nm dumplfs
-.Op Ar filesys No \&| Ar device
-.Sh DESCRIPTION
-.Nm
-prints out the file system layout information for the
-LFS file system or special device specified.
-The listing is very long and detailed.
-This command is useful mostly for finding out certain file system
-information such as the file system block size.
-.Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr fs 5 ,
-.Xr disklabel 8 ,
-.Xr newlfs 8
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.4 .
diff --git a/sbin/dumplfs/dumplfs.c b/sbin/dumplfs/dumplfs.c
deleted file mode 100644
index 1c5f0ca2fac..00000000000
--- a/sbin/dumplfs/dumplfs.c
+++ /dev/null
@@ -1,598 +0,0 @@
-/*	$OpenBSD: dumplfs.c,v 1.10 2004/07/17 02:14:32 deraadt Exp $	*/
-/*	$NetBSD: dumplfs.c,v 1.7 1995/12/14 22:36:34 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 1991, 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. 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) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dumplfs.c	8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.10 2004/07/17 02:14:32 deraadt Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <sys/time.h>
-
-#include <ufs/ufs/dinode.h>
-#include <ufs/lfs/lfs.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fstab.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "extern.h"
-
-static void	addseg(char *);
-static void	dump_cleaner_info(struct lfs *, void *);
-static void	dump_dinode(struct dinode *);
-static void	dump_ifile(int, struct lfs *, int);
-static int	dump_ipage_ifile(int, IFILE *, int);
-static int	dump_ipage_segusage(struct lfs *, int, IFILE *, int);
-static void	dump_segment(int, int, daddr_t, struct lfs *, int);
-static int	dump_sum(int, struct lfs *, SEGSUM *, int, daddr_t);
-static void	dump_super(struct lfs *);
-static void	usage(void);
-
-typedef struct seglist SEGLIST;
-struct seglist {
-        SEGLIST *next;
-	int num;
-};
-SEGLIST	*seglist;
-
-int daddr_shift;
-char *special;
-
-/* Segment Usage formats */
-#define print_suheader \
-	(void)printf("segnum\tflags\tnbytes\tninos\tnsums\tlastmod\n")
-
-#define print_suentry(i, sp) \
-	(void)printf("%d\t%c%c%c\t%d\t%d\t%d\t%s", i, \
-	    (((sp)->su_flags & SEGUSE_ACTIVE) ? 'A' : ' '), \
-	    (((sp)->su_flags & SEGUSE_DIRTY) ? 'D' : 'C'), \
-	    (((sp)->su_flags & SEGUSE_SUPERBLOCK) ? 'S' : ' '), \
-	    (sp)->su_nbytes, (sp)->su_ninos, (sp)->su_nsums, \
-	    ctime((time_t *)&(sp)->su_lastmod))
-
-/* Ifile formats */
-#define print_iheader \
-	(void)printf("inum\tstatus\tversion\tdaddr\t\tfreeptr\n")
-#define print_ientry(i, ip) \
-	if (ip->if_daddr == LFS_UNUSED_DADDR) \
-		(void)printf("%d\tFREE\t%d\t \t\t%d\n", \
-		    i, ip->if_version, ip->if_nextfree); \
-	else \
-		(void)printf("%d\tINUSE\t%d\t%8X    \n", \
-		    i, ip->if_version, ip->if_daddr)
-int
-main(int argc, char *argv[])
-{
-	struct lfs lfs_sb1, lfs_sb2, *lfs_master;
-	daddr_t seg_addr;
-	int ch, do_allsb, do_ientries, fd, segnum;
-
-	do_allsb = 0;
-	do_ientries = 0;
-	while ((ch = getopt(argc, argv, "ais:")) != -1)
-		switch(ch) {
-		case 'a':		/* Dump all superblocks */
-			do_allsb = 1;
-			break;
-		case 'i':		/* Dump ifile entries */
-			do_ientries = 1;
-			break;
-		case 's':		/* Dump out these segments */
-			addseg(optarg);
-			break;
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc != 1)
-		usage();
-
-	special = argv[0];
-	if ((fd = open(special, O_RDONLY, 0)) < 0)
-		err(1, "%s", special);
-
-	/* Read the first superblock */
-	get(fd, LFS_LABELPAD, &lfs_sb1, sizeof(struct lfs));
-	daddr_shift = lfs_sb1.lfs_bshift - lfs_sb1.lfs_fsbtodb;
-
-	/*
-	 * Read the second superblock and figure out which check point is
-	 * most up to date.
-	 */
-	get(fd,
-	    lfs_sb1.lfs_sboffs[1] << daddr_shift, &lfs_sb2, sizeof(struct lfs));
-
-	lfs_master = &lfs_sb1;
-	if (lfs_sb1.lfs_tstamp < lfs_sb2.lfs_tstamp)
-		lfs_master = &lfs_sb2;
-
-	(void)printf("Master Superblock:\n");
-	dump_super(lfs_master);
-
-	dump_ifile(fd, lfs_master, do_ientries);
-
-	if (seglist != NULL)
-		for (; seglist != NULL; seglist = seglist->next) {
-			seg_addr = lfs_master->lfs_sboffs[0] + seglist->num *
-			    (lfs_master->lfs_ssize << lfs_master->lfs_fsbtodb);
-			dump_segment(fd,
-			    seglist->num, seg_addr, lfs_master, do_allsb);
-		}
-	else
-		for (segnum = 0, seg_addr = lfs_master->lfs_sboffs[0];
-		    segnum < lfs_master->lfs_nseg; segnum++, seg_addr +=
-		    lfs_master->lfs_ssize << lfs_master->lfs_fsbtodb)
-			dump_segment(fd,
-			    segnum, seg_addr, lfs_master, do_allsb);
-
-	(void)close(fd);
-	return (0);
-}
-
-/*
- * We are reading all the blocks of an inode and dumping out the ifile table.
- * This code could be tighter, but this is a first pass at getting the stuff
- * printed out rather than making this code incredibly efficient.
- */
-static void
-dump_ifile(int fd, struct lfs *lfsp, int do_ientries)
-{
-	IFILE *ipage;
-	struct dinode *dip, *dpage;
-	daddr_t addr, *addrp, *dindir, *iaddrp, *indir;
-	int block_limit, i, inum, j, nblocks, psize;
-
-	psize = lfsp->lfs_bsize;
-	addr = lfsp->lfs_idaddr;
-
-	if (!(dpage = malloc(psize)))
-		err(1, "malloc");
-	get(fd, addr << daddr_shift, dpage, psize);
-
-	for (dip = dpage + INOPB(lfsp) - 1; dip >= dpage; --dip)
-		if (dip->di_inumber == LFS_IFILE_INUM)
-			break;
-
-	if (dip < dpage)
-		errx(1, "unable to locate ifile inode");
-
-	(void)printf("\nIFILE inode\n");
-	dump_dinode(dip);
-
-	(void)printf("\nIFILE contents\n");
-	nblocks = dip->di_size >> lfsp->lfs_bshift;
-	block_limit = MIN(nblocks, NDADDR);
-
-	/* Get the direct block */
-	if ((ipage = malloc(psize)) == NULL)
-		err(1, "malloc");
-	for (inum = 0, addrp = dip->di_db, i = 0; i < block_limit;
-	    i++, addrp++) {
-		get(fd, *addrp << daddr_shift, ipage, psize);
-		if (i < lfsp->lfs_cleansz) {
-			dump_cleaner_info(lfsp, ipage);
-			print_suheader;
-			continue;
-		}
-
-		if (i < (lfsp->lfs_segtabsz + lfsp->lfs_cleansz)) {
-			inum = dump_ipage_segusage(lfsp, inum, ipage,
-			    lfsp->lfs_sepb);
-			if (!inum)
-				if(!do_ientries)
-					goto e0;
-				else
-					print_iheader;
-		} else
-			inum = dump_ipage_ifile(inum, ipage, lfsp->lfs_ifpb);
-
-	}
-
-	if (nblocks <= NDADDR)
-		goto e0;
-
-	/* Dump out blocks off of single indirect block */
-	if (!(indir = malloc(psize)))
-		err(1, "malloc");
-	get(fd, dip->di_ib[0] << daddr_shift, indir, psize);
-	block_limit = MIN(i + lfsp->lfs_nindir, nblocks);
-	for (addrp = indir; i < block_limit; i++, addrp++) {
-		if (*addrp == LFS_UNUSED_DADDR)
-			break;
-		get(fd, *addrp << daddr_shift,ipage, psize);
-		if (i < lfsp->lfs_cleansz) {
-			dump_cleaner_info(lfsp, ipage);
-			continue;
-		} else
-			i -= lfsp->lfs_cleansz;
-
-		if (i < lfsp->lfs_segtabsz) {
-			inum = dump_ipage_segusage(lfsp, inum, ipage,
-			    lfsp->lfs_sepb);
-			if (!inum)
-				if(!do_ientries)
-					goto e1;
-				else
-					print_iheader;
-		} else
-			inum = dump_ipage_ifile(inum, ipage, lfsp->lfs_ifpb);
-	}
-
-	if (nblocks <= lfsp->lfs_nindir * lfsp->lfs_ifpb)
-		goto e1;
-
-	/* Get the double indirect block */
-	if (!(dindir = malloc(psize)))
-		err(1, "malloc");
-	get(fd, dip->di_ib[1] << daddr_shift, dindir, psize);
-	for (iaddrp = dindir, j = 0; j < lfsp->lfs_nindir; j++, iaddrp++) {
-		if (*iaddrp == LFS_UNUSED_DADDR)
-			break;
-		get(fd, *iaddrp << daddr_shift, indir, psize);
-		block_limit = MIN(i + lfsp->lfs_nindir, nblocks);
-		for (addrp = indir; i < block_limit; i++, addrp++) {
-			if (*addrp == LFS_UNUSED_DADDR)
-				break;
-			get(fd, *addrp << daddr_shift, ipage, psize);
-			if (i < lfsp->lfs_cleansz) {
-				dump_cleaner_info(lfsp, ipage);
-				continue;
-			} else
-				i -= lfsp->lfs_cleansz;
-
-			if (i < lfsp->lfs_segtabsz) {
-				inum = dump_ipage_segusage(lfsp,
-				    inum, ipage, lfsp->lfs_sepb);
-				if (!inum)
-					if(!do_ientries)
-						goto e2;
-					else
-						print_iheader;
-			} else
-				inum = dump_ipage_ifile(inum,
-				    ipage, lfsp->lfs_ifpb);
-		}
-	}
-e2:	free(dindir);
-e1:	free(indir);
-e0:	free(dpage);
-	free(ipage);
-}
-
-static int
-dump_ipage_ifile(int i, IFILE *pp, int tot)
-{
-	IFILE *ip;
-	int cnt, max;
-
-	max = i + tot;
-
-	for (ip = pp, cnt = i; cnt < max; cnt++, ip++)
-		print_ientry(cnt, ip);
-	return (max);
-}
-
-static int
-dump_ipage_segusage(struct lfs *lfsp, int i, IFILE *pp, int tot)
-{
-	SEGUSE *sp;
-	int cnt, max;
-
-	max = i + tot;
-	for (sp = (SEGUSE *)pp, cnt = i;
-	     cnt < lfsp->lfs_nseg && cnt < max; cnt++, sp++)
-		print_suentry(cnt, sp);
-	if (max >= lfsp->lfs_nseg)
-		return (0);
-	else
-		return (max);
-}
-
-static void
-dump_dinode(struct dinode *dip)
-{
-	int i;
-	time_t at, mt, ct;
-
-	at = dip->di_atime;
-	mt = dip->di_mtime;
-	ct = dip->di_ctime;
-
-	(void)printf("%s%d\t%s%d\t%s%d\t%s%d\t%s%d\n",
-		"mode  ", dip->di_mode,
-		"nlink ", dip->di_nlink,
-		"uid   ", dip->di_uid,
-		"gid   ", dip->di_gid,
-		"size  ", dip->di_size);
-	(void)printf("%s%s%s%s%s%s",
-		"atime ", ctime(&at),
-		"mtime ", ctime(&mt),
-		"ctime ", ctime(&ct));
-	(void)printf("inum  %d\n", dip->di_inumber);
-	(void)printf("Direct Addresses\n");
-	for (i = 0; i < NDADDR; i++) {
-		(void)printf("\t0x%X", dip->di_db[i]);
-		if ((i % 6) == 5)
-			(void)printf("\n");
-	}
-	for (i = 0; i < NIADDR; i++)
-		(void)printf("\t0x%X", dip->di_ib[i]);
-	(void)printf("\n");
-}
-
-static int
-dump_sum(int fd, struct lfs *lfsp, SEGSUM *sp, int segnum, daddr_t addr)
-{
-	FINFO *fp;
-	u_int32_t *dp;
-	int i, j;
-	int ck;
-	int numblocks;
-	struct dinode *inop;
-
-	if (sp->ss_sumsum != (ck = cksum(&sp->ss_datasum,
-	    LFS_SUMMARY_SIZE - sizeof(sp->ss_sumsum)))) {
-		(void)printf("dumplfs: %s %d address 0x%lx\n",
-		    "corrupt summary block; segment", segnum, addr);
-		return(0);
-	}
-
-	(void)printf("Segment Summary Info at 0x%lx\n", addr);
-	(void)printf("    %s0x%X\t%s%d\t%s%d\n    %s0x%X\t%s0x%X",
-		"next     ", sp->ss_next,
-		"nfinfo   ", sp->ss_nfinfo,
-		"ninos    ", sp->ss_ninos,
-		"sumsum   ", sp->ss_sumsum,
-		"datasum  ", sp->ss_datasum );
-	(void)printf("\tcreate   %s", ctime((time_t *)&sp->ss_create));
-
-	numblocks = (sp->ss_ninos + INOPB(lfsp) - 1) / INOPB(lfsp);
-
-	/* Dump out inode disk addresses */
-	dp = (daddr_t *)sp;
-	dp += LFS_SUMMARY_SIZE / sizeof(daddr_t);
-	inop = malloc(1 << lfsp->lfs_bshift);
-	if (inop == NULL)
-		err(1, "malloc");
-	printf("    Inode addresses:");
-	for (dp--, i = 0; i < sp->ss_ninos; dp--) {
-		printf("\t0x%X {", *dp);
-		get(fd, *dp << (lfsp->lfs_bshift - lfsp->lfs_fsbtodb), inop,
-		    (1 << lfsp->lfs_bshift));
-		for (j = 0; i < sp->ss_ninos && j < INOPB(lfsp); j++, i++) {
-			if (j > 0)
-				(void)printf(", ");
-			(void)printf("%d", inop[j].di_inumber);
-		}
-		(void)printf("}");
-		if (((i/INOPB(lfsp)) % 4) == 3)
-			(void)printf("\n");
-	}
-	free(inop);
-
-	printf("\n");
-	for (fp = (FINFO *)(sp + 1), i = 0; i < sp->ss_nfinfo; i++) {
-		numblocks += fp->fi_nblocks;
-		(void)printf("    FINFO for inode: %d version %d nblocks %d\n",
-		    fp->fi_ino, fp->fi_version, fp->fi_nblocks);
-		dp = &(fp->fi_blocks[0]);
-		for (j = 0; j < fp->fi_nblocks; j++, dp++) {
-			(void)printf("\t%d", *dp);
-			if ((j % 8) == 7)
-				(void)printf("\n");
-		}
-		if ((j % 8) != 0)
-			(void)printf("\n");
-		fp = (FINFO *)dp;
-	}
-	return (numblocks);
-}
-
-static void
-dump_segment(int fd, int segnum, daddr_t addr, struct lfs *lfsp, int dump_sb)
-{
-	struct lfs lfs_sb, *sbp;
-	SEGSUM *sump;
-	char sumblock[LFS_SUMMARY_SIZE];
-	int did_one, nblocks, sb;
-	off_t sum_offset, super_off;
-
-	(void)printf("\nSEGMENT %d (Disk Address 0x%X)\n",
-	    addr >> (lfsp->lfs_segshift - daddr_shift), addr);
-	sum_offset = (addr << (lfsp->lfs_bshift - lfsp->lfs_fsbtodb));
-
-	sb = 0;
-	did_one = 0;
-	do {
-		get(fd, sum_offset, sumblock, LFS_SUMMARY_SIZE);
-		sump = (SEGSUM *)sumblock;
-		if (sump->ss_sumsum != cksum (&sump->ss_datasum,
-			LFS_SUMMARY_SIZE - sizeof(sump->ss_sumsum))) {
-			sbp = (struct lfs *)sump;
-			if (sb = (sbp->lfs_magic == LFS_MAGIC)) {
-				super_off = sum_offset;
-				sum_offset += LFS_SBPAD;
-			} else if (did_one)
-				break;
-			else {
-				printf("Segment at 0x%X corrupt\n", addr);
-				break;
-			}
-		} else {
-			nblocks = dump_sum(fd, lfsp, sump, segnum, sum_offset >>
-			     (lfsp->lfs_bshift - lfsp->lfs_fsbtodb));
-			if (nblocks)
-				sum_offset += LFS_SUMMARY_SIZE +
-					(nblocks << lfsp->lfs_bshift);
-			else
-				sum_offset = 0;
-			did_one = 1;
-		}
-	} while (sum_offset);
-
-	if (dump_sb && sb)  {
-		get(fd, super_off, &lfs_sb, sizeof(struct lfs));
-		dump_super(&lfs_sb);
-	}
-	return;
-}
-
-static void
-dump_super(struct lfs *lfsp)
-{
-	int i;
-
-	(void)printf("%s0x%X\t%s0x%X\t%s%d\t%s%d\n",
-		"magic    ", lfsp->lfs_magic,
-		"version  ", lfsp->lfs_version,
-		"size     ", lfsp->lfs_size,
-		"ssize    ", lfsp->lfs_ssize);
-	(void)printf("%s%d\t\t%s%d\t%s%d\t%s%d\n",
-		"dsize    ", lfsp->lfs_dsize,
-		"bsize    ", lfsp->lfs_bsize,
-		"fsize    ", lfsp->lfs_fsize,
-		"frag     ", lfsp->lfs_frag);
-
-	(void)printf("%s%d\t\t%s%d\t%s%d\t%s%d\n",
-		"minfree  ", lfsp->lfs_minfree,
-		"inopb    ", lfsp->lfs_inopb,
-		"ifpb     ", lfsp->lfs_ifpb,
-		"nindir   ", lfsp->lfs_nindir);
-
-	(void)printf("%s%d\t\t%s%d\t%s%d\t%s%d\n",
-		"nseg     ", lfsp->lfs_nseg,
-		"nspf     ", lfsp->lfs_nspf,
-		"cleansz  ", lfsp->lfs_cleansz,
-		"segtabsz ", lfsp->lfs_segtabsz);
-
-	(void)printf("%s0x%X\t%s%d\t%s0x%X\t%s%d\n",
-		"segmask  ", lfsp->lfs_segmask,
-		"segshift ", lfsp->lfs_segshift,
-		"bmask    ", lfsp->lfs_bmask,
-		"bshift   ", lfsp->lfs_bshift);
-
-	(void)printf("%s0x%X\t\t%s%d\t%s0x%X\t%s%d\n",
-		"ffmask   ", lfsp->lfs_ffmask,
-		"ffshift  ", lfsp->lfs_ffshift,
-		"fbmask   ", lfsp->lfs_fbmask,
-		"fbshift  ", lfsp->lfs_fbshift);
-
-	(void)printf("%s%d\t%s%d\t%s0x%X\t%s0x%qx\n",
-		"sushift  ", lfsp->lfs_sushift,
-		"fsbtodb  ", lfsp->lfs_fsbtodb,
-		"cksum    ", lfsp->lfs_cksum,
-		"maxfilesize  ", lfsp->lfs_maxfilesize);
-
-	(void)printf("Superblock disk addresses:\t");
-	for (i = 0; i < LFS_MAXNUMSB; i++) {
-		(void)printf(" 0x%X", lfsp->lfs_sboffs[i]);
-		if ( i == (LFS_MAXNUMSB >> 1))
-			(void)printf("\n\t\t\t\t");
-	}
-	(void)printf("\n");
-
-	(void)printf("Checkpoint Info\n");
-	(void)printf("%s%d\t%s0x%X\t%s%d\n",
-		"free     ", lfsp->lfs_free,
-		"idaddr   ", lfsp->lfs_idaddr,
-		"ifile    ", lfsp->lfs_ifile);
-	(void)printf("%s%d\t%s%d\t%s%d\n",
-		"bfree    ", lfsp->lfs_bfree,
-		"avail    ", lfsp->lfs_avail,
-		"uinodes  ", lfsp->lfs_uinodes);
-	(void)printf("%s%d\t%s0x%X\t%s0x%X\n%s0x%X\t%s0x%X\t",
-		"nfiles   ", lfsp->lfs_nfiles,
-		"lastseg  ", lfsp->lfs_lastseg,
-		"nextseg  ", lfsp->lfs_nextseg,
-		"curseg   ", lfsp->lfs_curseg,
-		"offset   ", lfsp->lfs_offset);
-	(void)printf("tstamp   %s", ctime((time_t *)&lfsp->lfs_tstamp));
-	(void)printf("\nIn-Memory Information\n");
-	(void)printf("%s%d\t%s0x%X\t%s%d%s%d\t%s%d\n",
-		"seglock  ", lfsp->lfs_seglock,
-		"iocount  ", lfsp->lfs_iocount,
-		"writer   ", lfsp->lfs_writer,
-		"dirops   ", lfsp->lfs_dirops,
-		"doifile  ", lfsp->lfs_doifile);
-	(void)printf("%s%d\t%s%d\t%s0x%X\t%s%d\n",
-		"nactive  ", lfsp->lfs_nactive,
-		"fmod     ", lfsp->lfs_fmod,
-		"clean    ", lfsp->lfs_clean,
-		"ronly    ", lfsp->lfs_ronly);
-}
-
-static void
-addseg(char *arg)
-{
-	SEGLIST *p;
-
-	if ((p = malloc(sizeof(SEGLIST))) == NULL)
-		err(1, "malloc");
-	p->next = seglist;
-	p->num = atoi(arg);
-	seglist = p;
-}
-
-static void
-dump_cleaner_info(struct lfs *lfsp, void *ipage)
-{
-	CLEANERINFO *cip;
-
-	cip = (CLEANERINFO *)ipage;
-	(void)printf("segments clean\t%d\tsegments dirty\t%d\n\n",
-	    cip->clean, cip->dirty);
-}
-
-static void
-usage(void)
-{
-	(void)fprintf(stderr, "usage: dumplfs [-ai] [-s segnum] file\n");
-	exit(1);
-}
diff --git a/sbin/dumplfs/extern.h b/sbin/dumplfs/extern.h
deleted file mode 100644
index 985c02e4fdd..00000000000
--- a/sbin/dumplfs/extern.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$OpenBSD: extern.h,v 1.4 2003/06/02 20:06:14 millert Exp $	*/
-/*	$NetBSD: extern.h,v 1.3 1995/03/18 14:55:22 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1991, 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. 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.
- *
- *	@(#)extern.h	8.1 (Berkeley) 6/5/93
- */
-
-void	get(int, off_t, void *, size_t);
-
-extern char *special;
diff --git a/sbin/dumplfs/misc.c b/sbin/dumplfs/misc.c
deleted file mode 100644
index a9fcb9ccbad..00000000000
--- a/sbin/dumplfs/misc.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$OpenBSD: misc.c,v 1.4 2004/07/17 02:14:32 deraadt Exp $	*/
-/*	$NetBSD: misc.c,v 1.3 1995/03/18 14:55:23 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1991, 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. 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
-#if 0
-static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/5/93";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2004/07/17 02:14:32 deraadt Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
-
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "extern.h"
-
-void
-get(int fd, off_t off, void *p, size_t len)
-{
-	int rbytes;
-
-	if (lseek(fd, off, SEEK_SET) < 0)
-		err(1, "%s", special);
-	if ((rbytes = read(fd, p, len)) < 0)
-		err(1, "%s", special);
-	if (rbytes != len)
-		errx(1, "%s: short read (%d, not %d)", special, rbytes, len);
-}