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

6 files changed, 0 insertions, 2668 deletions

diff --git a/ufs-utils/Makefile b/ufs-utils/Makefile
deleted file mode 100644
index df22440e..00000000
--- a/ufs-utils/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# 
-#   Copyright (C) 1994, 1996, 2008 Free Software Foundation
-#   Written by Michael I. Bushnell.
-#
-#   This file is part of the GNU Hurd.
-#
-#   The GNU Hurd 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.
-#
-#   The GNU Hurd 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 := ufs-utils
-makemode := utilities
-
-targets = mkfs.ufs clri.ufs stati.ufs
-target-suffix = .ufs
-SRCS = mkfs.c clri.c stati.c dlabel.c
-installationdir = $(sbindir)
-
-OBJS = $(SRCS:.c=.o)
-HURDLIBS = store shouldbeinlibc
-
-include ../Makeconf
-
-mkfs.ufs: mkfs.o dlabel.o ../libstore/libstore.a ../libshouldbeinlibc/libshouldbeinlibc.a
-
-$(targets): %.ufs: %.o
-
-
diff --git a/ufs-utils/clri.c b/ufs-utils/clri.c
deleted file mode 100644
index 1ad348a1..00000000
--- a/ufs-utils/clri.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rich $alz of BBN Inc.
- *
- * 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) 1990, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-
-static char copyright[] __attribute__ ((unused));
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
-static char sccsid[] __attribute__ ((unused));
-#endif /* not lint */
-
-/* Modified by Michael I. Bushnell for GNU Hurd. */
-
-#include <sys/param.h>
-#include <sys/time.h>
-
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-
-
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#define MAXPHYS (64 * 1024)
-#define DEV_BSIZE 512
-
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	register struct fs *sbp;
-	register struct dinode *ip;
-	register int fd;
-	struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)];
-	long generation, bsize;
-	off_t offset;
-	int inonum;
-	char *fs, sblock[SBSIZE];
-
-	if (argc < 3) {
-		(void)fprintf(stderr, "usage: clri filesystem inode ...\n");
-		exit(1);
-	}
-
-	fs = *++argv;
-
-	/* get the superblock. */
-	if ((fd = open(fs, O_RDWR, 0)) < 0)
-	  {
-	    perror (fs);
-	    exit (1);
-	  }
-	if (lseek(fd, (off_t)(SBLOCK * DEV_BSIZE), SEEK_SET) < 0)
-	  {
-	    perror (fs);
-	    exit (1);
-	  }
-	if (read(fd, sblock, sizeof(sblock)) != sizeof(sblock)) {
-		(void)fprintf(stderr,
-		    "clri: %s: can't read the superblock.\n", fs);
-		exit(1);
-	}
-
-	sbp = (struct fs *)sblock;
-	if (sbp->fs_magic != FS_MAGIC) {
-		(void)fprintf(stderr,
-		    "clri: %s: superblock magic number 0x%lux, not 0x%x.\n",
-		    fs, sbp->fs_magic, FS_MAGIC);
-		exit(1);
-	}
-	bsize = sbp->fs_bsize;
-
-	/* remaining arguments are inode numbers. */
-	while (*++argv) {
-		/* get the inode number. */
-		if ((inonum = atoi(*argv)) <= 0) {
-			(void)fprintf(stderr,
-			    "clri: %s is not a valid inode number.\n", *argv);
-			exit(1);
-		}
-		(void)printf("clearing %d\n", inonum);
-
-		/* read in the appropriate block. */
-		offset = ino_to_fsba(sbp, inonum);	/* inode to fs blk */
-		offset = fsbtodb(sbp, offset);		/* fs blk disk blk */
-		offset *= DEV_BSIZE;			/* disk blk to bytes */
-
-		/* seek and read the block */
-		if (lseek(fd, offset, SEEK_SET) < 0)
-		  {
-		    perror (fs);
-		    exit (1);
-		  }
-		if (read(fd, ibuf, bsize) != bsize)
-		  {
-		    perror (fs);
-		    exit (1);
-		  }
-
-		/* get the inode within the block. */
-		ip = &ibuf[ino_to_fsbo(sbp, inonum)];
-
-		/* clear the inode, and bump the generation count. */
-		generation = ip->di_gen + 1;
-		memset(ip, 0, sizeof(*ip));
-		ip->di_gen = generation;
-
-		/* backup and write the block */
-		if (lseek(fd, (off_t)-bsize, SEEK_CUR) < 0)
-		  {
-		    perror (fs);
-		    exit (1);
-		  }
-		if (write(fd, ibuf, bsize) != bsize)
-		  {
-		    perror (fs);
-		    exit (1);
-		  }
-		(void)fsync(fd);
-	}
-	(void)close(fd);
-	exit(0);
-}
diff --git a/ufs-utils/dlabel.c b/ufs-utils/dlabel.c
deleted file mode 100644
index 355cb3f6..00000000
--- a/ufs-utils/dlabel.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Get the disklabel from a device node
-
-   Copyright (C) 1996,99,2001 Free Software Foundation, Inc.
-
-   Written by Miles Bader <miles@gnu.org>
-
-   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. */
-
-#include <errno.h>
-#include <hurd.h>
-#include <mach.h>
-#include <string.h>
-#include <device/device.h>
-#include <device/disk_status.h>
-#include <hurd/store.h>
-
-/* XXX Ick. */
-#define IOCPARM_MASK 0x1fff/* parameter length, at most 13 bits */
-#define IOC_OUT 0x40000000/* copy out parameters */
-#define _IOC(inout,group,num,len) \
-	(inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num))
-#define _IOR(g,n,t) _IOC(IOC_OUT,(g), (n), sizeof(t))
-
-static error_t
-fd_get_device (int fd, device_t *device)
-{
-  error_t err;
-  struct store *store;
-  file_t node = getdport (fd);
-
-  if (node == MACH_PORT_NULL)
-    return errno;
-
-  err = store_create (node, 0, 0, &store); /* consumes NODE on success */
-  if (! err)
-    {
-      if (store->class->id != STORAGE_DEVICE
-	  /* In addition to requiring a device, we also want the *whole*
-	     device -- one contiguous run starting at 0.  */
-	  || store->num_runs != 1
-	  || store->runs[0].start != 0)
-	err = ENODEV;
-      else if (store->port == MACH_PORT_NULL)
-	/* Usually getting a null port back means we didn't have sufficient
-	   privileges.  */
-	err = EPERM;
-      else
-	{
-	  *device = store->port;
-	  store->port = MACH_PORT_NULL;	/* Steal the port from STORE!  */
-	}
-      store_free (store);
-    }
-  else
-    mach_port_deallocate (mach_task_self (), node);
-
-  return err;
-}
-
-error_t
-fd_get_disklabel (int fd, struct disklabel *label)
-{
-  device_t device;
-  error_t err = fd_get_device (fd, &device);
-
-  if (! err)
-    {
-      mach_msg_type_number_t label_len = sizeof *label / sizeof (integer_t);
-
-      err = device_get_status (device, DIOCGDINFO,
-			       (dev_status_t)label, &label_len);
-      if (!err && label_len != sizeof *label / sizeof (integer_t))
-	err = ERANGE;
-
-      mach_port_deallocate (mach_task_self (), device);
-    }
-
-  return err;
-}
diff --git a/ufs-utils/mkfs.c b/ufs-utils/mkfs.c
deleted file mode 100644
index aef3ea92..00000000
--- a/ufs-utils/mkfs.c
+++ /dev/null
@@ -1,1406 +0,0 @@
-/*
- * Copyright (c) 1980, 1989, 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: @(#)mkfs.c	8.3 (Berkeley) 2/3/94";*/
-static char *rcsid = "$Id: mkfs.c,v 1.22 2006/03/14 23:27:50 tschwinge Exp $";
-#endif /* not lint */
-
-#include <unistd.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <argp.h>
-#include <assert.h>
-#include <error.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "../ufs/dinode.h"
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-/* #include <sys/disklabel.h> */
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <version.h>
-
-#include <device/device_types.h>
-#include <device/disk_status.h>
-
-#include <hurd.h>
-
-/* Begin misc additions for GNU Hurd */
-
-/* For GNU Hurd: the ufs DIRSIZ macro is different than the BSD
-   4.4 version that mkfs expects.  So we provide here the BSD version. */
-#undef DIRSIZ
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#define DIRSIZ(oldfmt, dp) \
-    ((oldfmt) ? \
-    ((sizeof (struct directory_entry) - (MAXNAMLEN+1)) + (((dp)->d_type+1 + 3) &~ 3)) : \
-    ((sizeof (struct directory_entry) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3)))
-#else
-#define DIRSIZ(oldfmt, dp) \
-    ((sizeof (struct directory_entry) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
-#endif
-
-#define MAXPHYS (64 * 1024)
-
-/* Provide mode from struct dinode * */
-#define DI_MODE(dp) (((dp)->di_modeh << 16) | (dp)->di_model)
-
-#define DEV_BSIZE 512
-
-#define btodb(bytes) ((bytes) / DEV_BSIZE)
-
-/* End additions for GNU Hurd */
-
-#ifndef STANDALONE
-#include <a.out.h>
-#include <stdio.h>
-#include <time.h>
-#endif
-
-/*
- * make file system for cylinder-group style file systems
- */
-
-extern error_t fd_get_disklabel (int fd, struct disklabel *lab);
-static void mkfs (), initcg (), fsinit (), setblock ();
-static void iput (), rdfs (), clrblock (), wtfs ();
-static int makedir (), isblock ();
-
-/*
- * We limit the size of the inode map to be no more than a
- * third of the cylinder group space, since we must leave at
- * least an equal amount of space for the block map.
- *
- * N.B.: MAXIPG must be a multiple of INOPB(fs).
- */
-#define MAXIPG(fs)	roundup((fs)->fs_bsize * NBBY / 3, INOPB(fs))
-
-#define UMASK		0755
-#define MAXINOPB	(MAXBSIZE / sizeof(struct dinode))
-#define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
-
-/*
- * variables set up by front end.
- */
-#define extern
-extern int	Nflag;		/* run mkfs without writing file system */
-extern int	Oflag;		/* format as an 4.3BSD file system */
-extern int	fssize;		/* file system size */
-extern int	ntracks;	/* # tracks/cylinder */
-extern int	nsectors;	/* # sectors/track */
-extern int	nphyssectors;	/* # sectors/track including spares */
-extern int	secpercyl;	/* sectors per cylinder */
-extern int	sectorsize;	/* bytes/sector */
-extern int	rpm;		/* revolutions/minute of drive */
-extern int	interleave;	/* hardware sector interleave */
-extern int	trackskew;	/* sector 0 skew, per track */
-extern int	headswitch;	/* head switch time, usec */
-extern int	trackseek;	/* track-to-track seek, usec */
-extern int	fsize;		/* fragment size */
-extern int	bsize;		/* block size */
-extern int	cpg;		/* cylinders/cylinder group */
-extern int	cpgflg;		/* cylinders/cylinder group flag was given */
-extern int	minfree;	/* free space threshold */
-extern int	opt;		/* optimization preference (space or time) */
-extern int	density;	/* number of bytes per inode */
-extern int	maxcontig;	/* max contiguous blocks to allocate */
-extern int	rotdelay;	/* rotational delay between blocks */
-extern int	maxbpg;		/* maximum blocks per file in a cyl group */
-extern int	nrpos;		/* # of distinguished rotational positions */
-extern int	bbsize;		/* boot block size */
-extern int	sbsize;		/* superblock size */
-#undef extern
-
-union {
-	struct fs fs;
-	char pad[SBSIZE];
-} fsun;
-#define	sblock	fsun.fs
-struct	csum *fscs;
-
-union {
-	struct cg cg;
-	char pad[MAXBSIZE];
-} cgun;
-#define	acg	cgun.cg
-
-struct dinode zino[MAXBSIZE / sizeof(struct dinode)];
-
-int	fsi, fso;
-daddr_t	alloc();
-
-const char *argp_program_version = STANDARD_HURD_VERSION (mkfs.ufs);
-
-#define _STRINGIFY(arg) #arg
-#define STRINGIFY(arg) _STRINGIFY (arg)
-
-static const struct argp_option options[] = {
-  {0,0,0,0,0, 1},
-  {"just-print", 'N', 0, 0,
-     "Just print the file system parameters that would be used"},
-  {"old-format", 'O', 0, 0, "Create a 4.3BSD format filesystem"},
-  {"max-contig", 'a', "BLOCKS", 0,
-     "The maximum number of contiguous blocks that will be laid out before"
-     " forcing a rotational delay; the default is no limit"},
-  {"block-size", 'b', "BYTES", 0, "The block size of the file system"},
-  {"group-cylinders", 'c', "N", 0,
-     "The number of cylinders per cylinder group; the default 16"},
-  {"rot-delay", 'd', "MSEC", 0,
-     "The expected time to service a transfer completion interrupt and"
-     " initiate a new transfer on the same disk; the default is 0"},
-  {"max-bpg", 'e', "BLOCKS", 0,
-     "Maximum number of blocks any single file can allocate out of a cylinder"
-     " group before it is forced to begin allocating blocks from another"
-     " cylinder group; the default is about one quarter of the total blocks"
-     " in a cylinder group"},
-  {"frag-size",  'f', "BYTES", 0, "The fragment size"},
-  {"inode-density", 'i', "BYTES", 0,
-     "The density of inodes in the file system, in bytes of data space per"
-     " inode; the default is one inode per 4 filesystem frags"},
-  {"minfree", 'm', "PERCENT", 0,
-     "The percentage of space reserved from normal users; the default is "
-     STRINGIFY (MINFREE) "%"},
-  {"rot-positions", 'n', "N", 0,
-     "The number of distinct rotational positions; the default is 8"},
-  {"optimization", 'o', "METH", 0, "``space'' or ``time''"},
-  {"size", 's', "SECTORS", 0, "The size of the file system"},
-
-  {0,0,0,0,
-     "The following options override the standard sizes for the disk"
-     " geometry; their default values are taken from the disk label:", 2},
-
-  {"sector-size", 'S', "BYTES", 0, "The size of a sector (usually 512)"},
-  {"skew", 'k', "SECTORS", 0, "Sector 0 skew, per track"},
-  {"interleave", 'l', "LOG-PHYS-RATIO", 0, "Hardware sector interleave"},
-  {"rpm", 'r', "RPM", 0, "The speed of the disk in revolutions per minute"},
-  {"tracks", 't', "N", 0, "The number of tracks/cylinder"},
-  {"sectors", 'u', "N", 0,
-     "The number of sectors per track (does not include sectors reserved for"
-     " bad block replacement"},
-  {"spare-sectors", 'p', "N", 0,
-     "Spare sectors (for bad sector replacement) at the end of each track"},
-  {"cyl-spare-sectors", 'x', "N", 0,
-     "Spare sectors (for bad sector replacement) at the end of the last track"
-     " in each cylinder"},
-  {0, 0}
-};
-static char *args_doc = "DEVICE";
-static char *doc = "Write a ufs filesystem image onto DEVICE.";
-
-struct amark { void *addr; struct amark *next; };
-
-static void
-amarks_add (struct amark **amarks, void *addr)
-  {
-    struct amark *up = malloc (sizeof (struct amark));
-    assert (up != 0);
-    up->addr = addr;
-    up->next = *amarks;
-    *amarks = up;
-  }
-static int
-amarks_contains (struct amark *amarks, void *addr)
-  {
-    while (amarks)
-      if (amarks->addr == addr)
-	return 1;
-      else
-	amarks = amarks->next;
-    return 0;
-  }
-
-static const struct disklabel default_disklabel = {
-  d_rpm: 3600,
-  d_interleave: 1,
-  d_secsize: DEV_BSIZE,
-  d_sparespertrack: 0,
-  d_sparespercyl: 0,
-  d_trackskew: 0,
-  d_cylskew: 0,
-  d_headswitch: 0,
-  d_trkseek: 0,
-};
-
-char *device = 0;
-
-#define deverr(code, err, fmt, args...) \
-  error (code, err, "%s: " fmt, device , ##args)
-
-int
-main (int argc, char **argv)
-{
-  int fdo, fdi;
-  struct amark *uparams = 0;
-  error_t label_err = 0;
-  struct disklabel label_buf, *label = 0;
-  int nspares = 0, ncspares = 0;
-
-  /* Parse our options...  */
-  error_t parse_opt (int key, char *arg, struct argp_state *state)
-    {
-      switch (key)
-	{
-	case 'N': Nflag = 1; break;
-	case 'O': Oflag = 1; break;
-
-/* Mark &VAR as being a uparam, and set VAR.  */
-#define UP_INT(var) { amarks_add (&uparams, &var); var = atoi (arg); }
-
-	case 'a': UP_INT (maxcontig); break;
-	case 'b': UP_INT (bsize); break;
-	case 'c': UP_INT (cpg); cpgflg = 1; break;
-	case 'd': UP_INT (rotdelay); break;
-	case 'e': UP_INT (maxbpg); break;
-	case 'f': UP_INT (fsize); break;
-	case 'i': UP_INT (density); break;
-	case 'm': UP_INT (minfree); break;
-	case 'n': UP_INT (nrpos); break;
-	case 's': UP_INT (fssize); break;
-	case 'S': UP_INT (sectorsize); break;
-	case 'k': UP_INT (trackskew); break;
-	case 'l': UP_INT (interleave); break;
-	case 'r': UP_INT (rpm); break;
-	case 't': UP_INT (ntracks); break;
-	case 'u': UP_INT (nsectors); break;
-	case 'p': UP_INT (nspares); break;
-	case 'x': UP_INT (ncspares); break;
-
-	case 'o':
-	  amarks_add (&uparams, &opt);
-	  if (strcmp (arg, "time") == 0)
-	    opt = FS_OPTTIME;
-	  else if (strcmp (arg, "space") == 0)
-	    opt = FS_OPTSPACE;
-	  else
-	    argp_error (state, "%s: Invalid value for --optimization", arg);
-	  break;
-
-	case ARGP_KEY_ARG:
-	  if (state->arg_num > 0)
-	    return ARGP_ERR_UNKNOWN;
-	  device = arg;
-	  break;
-
-	default:
-	  return ARGP_ERR_UNKNOWN;
-	}
-      return 0;
-    }
-  const struct argp argp = { options, parse_opt, args_doc, doc };
-
-  /* Tries to get the disklabel for DEVICE; if it can't, then if PARAM_NAME
-     is 0, returns 0, otherwise an error is printed (using PARAM_NAME) and
-     the program exits. */
-  struct disklabel *dl (char *param_name)
-    {
-      if (! label)
-	{
-	  if (! label_err)
-	    {
-	      label_err = fd_get_disklabel (fdi, &label_buf);
-	      if (! label_err)
-		label = &label_buf;
-	    }
-	  if (label_err && param_name)
-	    error (9, label_err,
-		   "%s: Can't get disklabel; please specify --%s",
-		   device, param_name);
-	}
-      return label;
-    }
-  /* Tries to get the integer field at offset OFFS from the disklabel for
-     DEVICE; if it can't, then if PARAM_NAME is 0, returns the corresponding
-     value from DEFAULT_DISKLABEL, otherwise an error is printed and the
-     program exits. */
-  int dl_int (char *param_name, size_t offs)
-    {
-      struct disklabel *l = dl (param_name);
-      return *(int *)((char *)(l ?: &default_disklabel) + offs);
-    }
-  /* A version of dl_int that takes the field name instead of an offset.  */
-#define DL_INT(param_name, field) \
-  dl_int (param_name, offsetof (struct disklabel, field))
-
-  /* Like dl_int, but adjust for any difference in sector size between the
-     disklabel and SECTORSIZE.  */
-  int dl_secs (char *param_name, size_t offs)
-    {
-      int val = dl_int (param_name, offs);
-      int dl_ss = DL_INT (0, d_secsize);
-      if (sectorsize < dl_ss)
-	deverr (10, 0,
-		"%d: Sector size is less than device sector size (%d)",
-		sectorsize, dl_ss);
-      else if (sectorsize > dl_ss)
-	if (sectorsize % dl_ss != 0)
-	  deverr (11, 0,
-		  "%d: Sector size not a multiple of device sector size (%d)",
-		  sectorsize, dl_ss);
-	else
-	  val /= sectorsize / dl_ss;
-      return val;
-    }
-  /* A version of dl_secs that takes the field name instead of an offset.  */
-#define DL_SECS(param_name, field) \
-  dl_secs (param_name, offsetof (struct disklabel, field))
-
-  /* Parse our arguments.  */
-  argp_parse (&argp, argc, argv, 0, 0, 0);
-
-  fdi = open (device, O_RDONLY);
-  if (fdi == -1)
-    error (2, errno, "%s", device);
-  fdo = open (device, O_WRONLY);
-  if (fdo == -1)
-    error (3, errno, "%s", device);
-
-  /* If VAR hasn't been set by the user, set it to DEF_VAL.  */
-#define DEFAULT(var, def_val) \
-  (amarks_contains (uparams, &var) ? 0 : (((var) = (def_val)), 0))
-
-  DEFAULT (sectorsize, DEV_BSIZE);
-  DEFAULT (fssize,
-	   ({ struct stat st;
-	      if (fstat (fdi, &st) == -1)
-		deverr (4, errno, "Cannot get size");
-	      st.st_size / sectorsize; }));
-  DEFAULT (ntracks, DL_INT ("tracks", d_ntracks));
-  DEFAULT (nsectors, DL_SECS ("sectors", d_nsectors));
-  DEFAULT (nspares, DL_SECS (0, d_sparespertrack));
-  DEFAULT (ncspares, DL_SECS (0, d_sparespercyl));
-
-  if (nspares >= nsectors)
-    deverr (5, 0, "%d: Too many spare sectors per track", nspares);
-  if (ncspares >= nsectors)
-    deverr (5, 0, "%d: Too many spare sectors per cylinder", ncspares);
-  nphyssectors = nsectors + nspares;
-
-  secpercyl = nsectors * ntracks;
-
-  DEFAULT (rpm, DL_INT (0, d_rpm));
-  DEFAULT (interleave, DL_INT (0, d_interleave));
-  DEFAULT (trackskew, DL_SECS (0, d_trackskew));
-  DEFAULT (headswitch, DL_INT (0, d_headswitch));
-  DEFAULT (trackseek, DL_INT (0, d_trkseek));
-
-  DEFAULT (fsize, 1024);
-  DEFAULT (bsize, 8192);
-
-  DEFAULT (cpg, 16);
-  DEFAULT (minfree, MINFREE);
-  DEFAULT (opt, DEFAULTOPT);
-  DEFAULT (density, 4 * fsize);
-/*  maxcontig = MAX (1, MIN (MAXPHYS, MAXBSIZE) / bsize - 1); */
-  DEFAULT (maxcontig, 0);
-  DEFAULT (rotdelay, 4);
-#define MAXBLKPG(bsize)	((bsize) / sizeof(daddr_t))
-  DEFAULT (maxbpg, MAXBLKPG (bsize));
-  DEFAULT (nrpos, 8);
-
-  bbsize = BBSIZE;
-  sbsize = SBSIZE;
-
-  mkfs (0, device, fdi, fdo);
-
-  return 0;
-}
-
-void
-mkfs(pp, fsys, fi, fo)
-	struct partition *pp;
-	char *fsys;
-	int fi, fo;
-{
-	register long i, mincpc, mincpg, inospercg;
-	long cylno, rpos, blk, j, warn = 0;
-	long used, mincpgcnt, bpcg;
-	long mapcramped, inodecramped;
-	long postblsize, rotblsize, totalsbsize;
-	time_t utime;
-	quad_t sizepb;
-
-#ifndef STANDALONE
-	time(&utime);
-#endif
-	fsi = fi;
-	fso = fo;
-	if (Oflag) {
-		sblock.fs_inodefmt = FS_42INODEFMT;
-		sblock.fs_maxsymlinklen = 0;
-	} else {
-		sblock.fs_inodefmt = FS_44INODEFMT;
-		sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
-	}
-	/*
-	 * Validate the given file system size.
-	 * Verify that its last block can actually be accessed.
-	 */
-	if (fssize <= 0)
-	  deverr (13, 0, "preposterous size %d", fssize);
-	wtfs(fssize - 1, sectorsize, (char *)&sblock);
-	/*
-	 * collect and verify the sector and track info
-	 */
-	sblock.fs_nsect = nsectors;
-	sblock.fs_ntrak = ntracks;
-	if (sblock.fs_ntrak <= 0)
-	  deverr (14, 0, "preposterous ntrak %ld", sblock.fs_ntrak);
-	if (sblock.fs_nsect <= 0)
-	  deverr (15, 0, "preposterous nsect %ld", sblock.fs_nsect);
-	/*
-	 * collect and verify the block and fragment sizes
-	 */
-	sblock.fs_bsize = bsize;
-	sblock.fs_fsize = fsize;
-	if (!POWEROF2(sblock.fs_bsize))
-	  deverr (16, 0,
-		 "block size must be a power of 2, not %ld",
-		 sblock.fs_bsize);
-	if (!POWEROF2(sblock.fs_fsize))
-	  deverr (17, 0,
-		 "fragment size must be a power of 2, not %ld",
-		 sblock.fs_fsize);
-	if (sblock.fs_fsize < sectorsize)
-	  deverr (18, 0,
-		 "fragment size %ld is too small, minimum is %d",
-		 sblock.fs_fsize, sectorsize);
-	if (sblock.fs_bsize < MINBSIZE)
-	  deverr (19, 0,
-		 "block size %ld is too small, minimum is %d",
-		 sblock.fs_bsize, MINBSIZE);
-	if (sblock.fs_bsize < sblock.fs_fsize)
-	  deverr (20, 0,
-		 "block size (%ld) cannot be smaller than fragment size (%ld)",
-		 sblock.fs_bsize, sblock.fs_fsize);
-	sblock.fs_bmask = ~(sblock.fs_bsize - 1);
-	sblock.fs_fmask = ~(sblock.fs_fsize - 1);
-	sblock.fs_qbmask = ~sblock.fs_bmask;
-	sblock.fs_qfmask = ~sblock.fs_fmask;
-	for (sblock.fs_bshift = 0, i = sblock.fs_bsize; i > 1; i >>= 1)
-		sblock.fs_bshift++;
-	for (sblock.fs_fshift = 0, i = sblock.fs_fsize; i > 1; i >>= 1)
-		sblock.fs_fshift++;
-	sblock.fs_frag = numfrags(&sblock, sblock.fs_bsize);
-	for (sblock.fs_fragshift = 0, i = sblock.fs_frag; i > 1; i >>= 1)
-		sblock.fs_fragshift++;
-	if (sblock.fs_frag > MAXFRAG)
-	  deverr (21, 0,
-		 "fragment size %ld is too small, minimum with block size %ld is %ld",
-		 sblock.fs_fsize, sblock.fs_bsize,
-		 sblock.fs_bsize / MAXFRAG);
-	sblock.fs_nrpos = nrpos;
-	sblock.fs_nindir = sblock.fs_bsize / sizeof(daddr_t);
-	sblock.fs_inopb = sblock.fs_bsize / sizeof(struct dinode);
-	sblock.fs_nspf = sblock.fs_fsize / sectorsize;
-	for (sblock.fs_fsbtodb = 0, i = NSPF(&sblock); i > 1; i >>= 1)
-		sblock.fs_fsbtodb++;
-	sblock.fs_sblkno =
-	    roundup(howmany(bbsize + sbsize, sblock.fs_fsize), sblock.fs_frag);
-	sblock.fs_cblkno = (daddr_t)(sblock.fs_sblkno +
-	    roundup(howmany(sbsize, sblock.fs_fsize), sblock.fs_frag));
-	sblock.fs_iblkno = sblock.fs_cblkno + sblock.fs_frag;
-	sblock.fs_cgoffset = roundup(
-	    howmany(sblock.fs_nsect, NSPF(&sblock)), sblock.fs_frag);
-	for (sblock.fs_cgmask = 0xffffffff, i = sblock.fs_ntrak; i > 1; i >>= 1)
-		sblock.fs_cgmask <<= 1;
-	if (!POWEROF2(sblock.fs_ntrak))
-		sblock.fs_cgmask <<= 1;
-	sblock.fs_maxfilesize = sblock.fs_bsize * NDADDR - 1;
-	for (sizepb = sblock.fs_bsize, i = 0; i < NIADDR; i++) {
-		sizepb *= NINDIR(&sblock);
-		sblock.fs_maxfilesize += sizepb;
-	}
-	/*
-	 * Validate specified/determined secpercyl
-	 * and calculate minimum cylinders per group.
-	 */
-	sblock.fs_spc = secpercyl;
-	for (sblock.fs_cpc = NSPB(&sblock), i = sblock.fs_spc;
-	     sblock.fs_cpc > 1 && (i & 1) == 0;
-	     sblock.fs_cpc >>= 1, i >>= 1)
-		/* void */;
-	mincpc = sblock.fs_cpc;
-	bpcg = sblock.fs_spc * sectorsize;
-	inospercg = roundup(bpcg / sizeof(struct dinode), INOPB(&sblock));
-	if (inospercg > MAXIPG(&sblock))
-		inospercg = MAXIPG(&sblock);
-	used = (sblock.fs_iblkno + inospercg / INOPF(&sblock)) * NSPF(&sblock);
-	mincpgcnt = howmany(sblock.fs_cgoffset * (~sblock.fs_cgmask) + used,
-	    sblock.fs_spc);
-	mincpg = roundup(mincpgcnt, mincpc);
-	/*
-	 * Ensure that cylinder group with mincpg has enough space
-	 * for block maps.
-	 */
-	sblock.fs_cpg = mincpg;
-	sblock.fs_ipg = inospercg;
-	if (maxcontig > 1)
-		sblock.fs_contigsumsize = MIN(maxcontig, FS_MAXCONTIG);
-	mapcramped = 0;
-	while (CGSIZE(&sblock) > sblock.fs_bsize) {
-		mapcramped = 1;
-		if (sblock.fs_bsize < MAXBSIZE) {
-			sblock.fs_bsize <<= 1;
-			if ((i & 1) == 0) {
-				i >>= 1;
-			} else {
-				sblock.fs_cpc <<= 1;
-				mincpc <<= 1;
-				mincpg = roundup(mincpgcnt, mincpc);
-				sblock.fs_cpg = mincpg;
-			}
-			sblock.fs_frag <<= 1;
-			sblock.fs_fragshift += 1;
-			if (sblock.fs_frag <= MAXFRAG)
-				continue;
-		}
-		if (sblock.fs_fsize == sblock.fs_bsize)
-		  deverr (22, 0,
-			 "There is no block size that can support this disk");
-		sblock.fs_frag >>= 1;
-		sblock.fs_fragshift -= 1;
-		sblock.fs_fsize <<= 1;
-		sblock.fs_nspf <<= 1;
-	}
-	/*
-	 * Ensure that cylinder group with mincpg has enough space for inodes.
-	 */
-	inodecramped = 0;
-	used *= sectorsize;
-	inospercg = roundup((mincpg * bpcg - used) / density, INOPB(&sblock));
-	sblock.fs_ipg = inospercg;
-	while (inospercg > MAXIPG(&sblock)) {
-		inodecramped = 1;
-		if (mincpc == 1 || sblock.fs_frag == 1 ||
-		    sblock.fs_bsize == MINBSIZE)
-			break;
-		deverr (0, 0,
-		       "With a block size of %ld %s %ld", sblock.fs_bsize,
-		       "minimum bytes per inode is",
-		       (mincpg * bpcg - used) / MAXIPG(&sblock) + 1);
-		sblock.fs_bsize >>= 1;
-		sblock.fs_frag >>= 1;
-		sblock.fs_fragshift -= 1;
-		mincpc >>= 1;
-		sblock.fs_cpg = roundup(mincpgcnt, mincpc);
-		if (CGSIZE(&sblock) > sblock.fs_bsize) {
-			sblock.fs_bsize <<= 1;
-			break;
-		}
-		mincpg = sblock.fs_cpg;
-		inospercg =
-		    roundup((mincpg * bpcg - used) / density, INOPB(&sblock));
-		sblock.fs_ipg = inospercg;
-	}
-	if (inodecramped) {
-		if (inospercg > MAXIPG(&sblock))
-			deverr (0, 0, "Minimum bytes per inode is %ld",
-			       (mincpg * bpcg - used) / MAXIPG(&sblock) + 1);
-		else if (!mapcramped)
-		  deverr (0, 0,
-			 "With %d bytes per inode,"
-			 " minimum cylinders per group is %ld",
-			 density, mincpg);
-	}
-	if (mapcramped)
-	  deverr (0, 0,
-		 "With %ld sectors per cylinder,"
-		 " minimum cylinders per group is %ld",
-		 sblock.fs_spc, mincpg);
-	if (inodecramped || mapcramped)
-	  if (sblock.fs_bsize != bsize)
-	    {
-	      deverr (0, 0,
-		     "This requires the block size to be changed from %d to %ld",
-		     bsize, sblock.fs_bsize);
-	      deverr (23, 0,
-		     "and the fragment size to be changed from %d to %ld",
-		     fsize, sblock.fs_fsize);
-	    }
-	  else
-	    exit(23);
-	/*
-	 * Calculate the number of cylinders per group
-	 */
-	sblock.fs_cpg = cpg;
-	if (sblock.fs_cpg % mincpc != 0) {
-		deverr (0, 0,
-		       "%s groups must have a multiple of %ld cylinders",
-		       cpgflg ? "Cylinder" : "Warning: cylinder", mincpc);
-		sblock.fs_cpg = roundup(sblock.fs_cpg, mincpc);
-		if (!cpgflg)
-			cpg = sblock.fs_cpg;
-	}
-	/*
-	 * Must ensure there is enough space for inodes.
-	 */
-	sblock.fs_ipg = roundup((sblock.fs_cpg * bpcg - used) / density,
-		INOPB(&sblock));
-	while (sblock.fs_ipg > MAXIPG(&sblock)) {
-		inodecramped = 1;
-		sblock.fs_cpg -= mincpc;
-		sblock.fs_ipg = roundup((sblock.fs_cpg * bpcg - used) / density,
-			INOPB(&sblock));
-	}
-	/*
-	 * Must ensure there is enough space to hold block map.
-	 */
-	while (CGSIZE(&sblock) > sblock.fs_bsize) {
-		mapcramped = 1;
-		sblock.fs_cpg -= mincpc;
-		sblock.fs_ipg = roundup((sblock.fs_cpg * bpcg - used) / density,
-			INOPB(&sblock));
-	}
-	sblock.fs_fpg = (sblock.fs_cpg * sblock.fs_spc) / NSPF(&sblock);
-	if ((sblock.fs_cpg * sblock.fs_spc) % NSPB(&sblock) != 0)
-	  deverr (24, 0, "panic (fs_cpg * fs_spc) %% NSPF != 0");
-	if (sblock.fs_cpg < mincpg)
-	  deverr (25, 0,
-		 "cylinder groups must have at least %ld cylinders", mincpg);
-	else if (sblock.fs_cpg != cpg)
-	  {
-	    if (cpgflg && !mapcramped && !inodecramped)
-	      exit(26);
-	    deverr (0, 0,
-		   "%s%s cylinders per group to %ld",
-		   (cpgflg ? "" : "Warning: "),
-		   ((mapcramped && inodecramped)
-		    ? "Block size and bytes per inode restrict"
-		    : mapcramped ? "Block size restricts"
-		    : "Bytes per inode restrict"),
-		   sblock.fs_cpg);
-	    if (cpgflg)
-	      exit(27);
-	  }
-	sblock.fs_cgsize = fragroundup(&sblock, CGSIZE(&sblock));
-	/*
-	 * Now have size for file system and nsect and ntrak.
-	 * Determine number of cylinders and blocks in the file system.
-	 */
-	sblock.fs_size = fssize = dbtofsb(&sblock, fssize);
-	sblock.fs_ncyl = fssize * NSPF(&sblock) / sblock.fs_spc;
-	if (fssize * NSPF(&sblock) > sblock.fs_ncyl * sblock.fs_spc) {
-		sblock.fs_ncyl++;
-		warn = 1;
-	}
-	if (sblock.fs_ncyl < 1)
-	  deverr (28, 0, "file systems must have at least one cylinder");
-	/*
-	 * Determine feasability/values of rotational layout tables.
-	 *
-	 * The size of the rotational layout tables is limited by the
-	 * size of the superblock, SBSIZE. The amount of space available
-	 * for tables is calculated as (SBSIZE - sizeof (struct fs)).
-	 * The size of these tables is inversely proportional to the block
-	 * size of the file system. The size increases if sectors per track
-	 * are not powers of two, because more cylinders must be described
-	 * by the tables before the rotational pattern repeats (fs_cpc).
-	 */
-	sblock.fs_interleave = interleave;
-	sblock.fs_trackskew = trackskew;
-	sblock.fs_npsect = nphyssectors;
-	sblock.fs_postblformat = FS_DYNAMICPOSTBLFMT;
-	sblock.fs_sbsize = fragroundup(&sblock, sizeof(struct fs));
-	if (sblock.fs_ntrak == 1) {
-		sblock.fs_cpc = 0;
-		goto next;
-	}
-	postblsize = sblock.fs_nrpos * sblock.fs_cpc * sizeof(short);
-	rotblsize = sblock.fs_cpc * sblock.fs_spc / NSPB(&sblock);
-	totalsbsize = sizeof(struct fs) + rotblsize;
-	if (sblock.fs_nrpos == 8 && sblock.fs_cpc <= 16) {
-		/* use old static table space */
-		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);
-	} else {
-		/* use dynamic table space */
-		sblock.fs_postbloff = &sblock.fs_space[0] -
-		    (u_char *)(&sblock.fs_link);
-		sblock.fs_rotbloff = sblock.fs_postbloff + postblsize;
-		totalsbsize += postblsize;
-	}
-	if (totalsbsize > SBSIZE ||
-	    sblock.fs_nsect > (1 << NBBY) * NSPB(&sblock))
-	  {
-	    deverr (0, 0,
-		   "Warning: insufficient space in super block for "
-		   "rotational layout tables with nsect %ld and ntrak %ld",
-		   sblock.fs_nsect, sblock.fs_ntrak);
-	    deverr (0, 0, "File system performance may be impaired");
-	    sblock.fs_cpc = 0;
-	    goto next;
-	  }
-	sblock.fs_sbsize = fragroundup(&sblock, totalsbsize);
-	/*
-	 * calculate the available blocks for each rotational position
-	 */
-	for (cylno = 0; cylno < sblock.fs_cpc; cylno++)
-		for (rpos = 0; rpos < sblock.fs_nrpos; rpos++)
-			fs_postbl(&sblock, cylno)[rpos] = -1;
-	for (i = (rotblsize - 1) * sblock.fs_frag;
-	     i >= 0; i -= sblock.fs_frag) {
-		cylno = cbtocylno(&sblock, i);
-		rpos = cbtorpos(&sblock, i);
-		blk = fragstoblks(&sblock, i);
-		if (fs_postbl(&sblock, cylno)[rpos] == -1)
-			fs_rotbl(&sblock)[blk] = 0;
-		else
-			fs_rotbl(&sblock)[blk] =
-			    fs_postbl(&sblock, cylno)[rpos] - blk;
-		fs_postbl(&sblock, cylno)[rpos] = blk;
-	}
-next:
-	/*
-	 * Compute/validate number of cylinder groups.
-	 */
-	sblock.fs_ncg = sblock.fs_ncyl / sblock.fs_cpg;
-	if (sblock.fs_ncyl % sblock.fs_cpg)
-		sblock.fs_ncg++;
-	sblock.fs_dblkno = sblock.fs_iblkno + sblock.fs_ipg / INOPF(&sblock);
-	i = MIN(~sblock.fs_cgmask, sblock.fs_ncg - 1);
-	if (cgdmin(&sblock, i) - cgbase(&sblock, i) >= sblock.fs_fpg)
-	  {
-	    deverr (0, 0,
-		   "Inode blocks/cyl group (%ld) >= data blocks (%ld)",
-		   cgdmin(&sblock, i) - cgbase(&sblock, i) / sblock.fs_frag,
-		   sblock.fs_fpg / sblock.fs_frag);
-	    deverr (29, 0,
-		   "number of cylinders per cylinder group (%ld)"
-		   " must be increased", sblock.fs_cpg);
-	  }
-	j = sblock.fs_ncg - 1;
-	if ((i = fssize - j * sblock.fs_fpg) < sblock.fs_fpg &&
-	    cgdmin(&sblock, j) - cgbase(&sblock, j) > i) {
-		if (j == 0)
-		  deverr (30, 0,
-			 "Filesystem must have at least %ld sectors",
-			 NSPF(&sblock)
-			  * (cgdmin(&sblock, 0) + 3 * sblock.fs_frag));
-		deverr (0, 0,
-		       "Warning: inode blocks/cyl group (%ld) >="
-		       " data blocks (%ld) in last cylinder group.",
-		       ((cgdmin(&sblock, j) - cgbase(&sblock, j))
-			/ sblock.fs_frag),
-		       i / sblock.fs_frag);
-		deverr (0, 0,
-		       "This implies %ld sector(s) cannot be allocated",
-		       i * NSPF(&sblock));
-		sblock.fs_ncg--;
-		sblock.fs_ncyl -= sblock.fs_ncyl % sblock.fs_cpg;
-		sblock.fs_size = fssize = sblock.fs_ncyl * sblock.fs_spc /
-		    NSPF(&sblock);
-		warn = 0;
-	}
-	if (warn)
-	  deverr (0, 0,
-		 "Warning: %ld sector(s) in last cylinder unallocated",
-		 sblock.fs_spc
-		 - (fssize * NSPF(&sblock) - (sblock.fs_ncyl - 1)
-		    * sblock.fs_spc));
-	/*
-	 * fill in remaining fields of the super block
-	 */
-	sblock.fs_csaddr = cgdmin(&sblock, 0);
-	sblock.fs_cssize =
-	    fragroundup(&sblock, sblock.fs_ncg * sizeof(struct csum));
-	i = sblock.fs_bsize / sizeof(struct csum);
-	sblock.fs_csmask = ~(i - 1);
-	for (sblock.fs_csshift = 0; i > 1; i >>= 1)
-		sblock.fs_csshift++;
-	fscs = (struct csum *)calloc(1, sblock.fs_cssize);
-	sblock.fs_magic = FS_MAGIC;
-	sblock.fs_rotdelay = rotdelay;
-	sblock.fs_minfree = minfree;
-	sblock.fs_maxcontig = maxcontig;
-	sblock.fs_headswitch = headswitch;
-	sblock.fs_trkseek = trackseek;
-	sblock.fs_maxbpg = maxbpg;
-	sblock.fs_rps = rpm / 60;
-	sblock.fs_optim = opt;
-	sblock.fs_cgrotor = 0;
-	sblock.fs_cstotal.cs_ndir = 0;
-	sblock.fs_cstotal.cs_nbfree = 0;
-	sblock.fs_cstotal.cs_nifree = 0;
-	sblock.fs_cstotal.cs_nffree = 0;
-	sblock.fs_fmod = 0;
-	sblock.fs_ronly = 0;
-	sblock.fs_clean = 1;
-
-	/*
-	 * Dump out summary information about file system.
-	 */
-	printf("%s:\n\t%ld sectors in %ld %s of %ld tracks, %ld sectors\n",
-	    fsys, sblock.fs_size * NSPF(&sblock), sblock.fs_ncyl,
-	    "cylinders", sblock.fs_ntrak, sblock.fs_nsect);
-#define B2MBFACTOR (1 / (1024.0 * 1024.0))
-	printf("\t%.1fMB in %ld cyl groups (%ld c/g, %.2fMB/g, %ld i/g)\n",
-	    (float)sblock.fs_size * sblock.fs_fsize * B2MBFACTOR,
-	    sblock.fs_ncg, sblock.fs_cpg,
-	    (float)sblock.fs_fpg * sblock.fs_fsize * B2MBFACTOR,
-	    sblock.fs_ipg);
-#undef B2MBFACTOR
-
-	/*
-	 * Now build the cylinders group blocks and
-	 * then print out indices of cylinder groups.
-	 */
-	printf("\tsuperblock backups at:");
-	for (cylno = 0; cylno < sblock.fs_ncg; cylno++) {
-		initcg(cylno, utime);
-		if (cylno % 8 == 0)
-			printf("\n\t");
-		printf(" %ld,", fsbtodb(&sblock, cgsblock(&sblock, cylno)));
-	}
-	printf("\n");
-	if (Nflag)
-		exit(0);
-	/*
-	 * Now construct the initial file system,
-	 * then write out the super-block.
-	 */
-	fsinit(utime);
-	sblock.fs_time = utime;
-	wtfs((int)SBOFF / sectorsize, sbsize, (char *)&sblock);
-	for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize)
-		wtfs(fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)),
-			sblock.fs_cssize - i < sblock.fs_bsize ?
-			    sblock.fs_cssize - i : sblock.fs_bsize,
-			((char *)fscs) + i);
-	/*
-	 * Write out the duplicate super blocks
-	 */
-	for (cylno = 0; cylno < sblock.fs_ncg; cylno++)
-		wtfs(fsbtodb(&sblock, cgsblock(&sblock, cylno)),
-		    sbsize, (char *)&sblock);
-#if 0 /* Not in Hurd (yet) */
-	/*
-	 * Update information about this partion in pack
-	 * label, to that it may be updated on disk.
-	 */
-	pp->p_fstype = FS_BSDFFS;
-	pp->p_fsize = sblock.fs_fsize;
-	pp->p_frag = sblock.fs_frag;
-	pp->p_cpg = sblock.fs_cpg;
-#endif
-}
-
-/*
- * Initialize a cylinder group.
- */
-void
-initcg(cylno, utime)
-	int cylno;
-	time_t utime;
-{
-	long i;
-	daddr_t cbase, d, dlower, dupper, dmax, blkno;
-	register struct csum *cs;
-
-	/*
-	 * Determine block bounds for cylinder group.
-	 * Allow space for super block summary information in first
-	 * cylinder group.
-	 */
-	cbase = cgbase(&sblock, cylno);
-	dmax = cbase + sblock.fs_fpg;
-	if (dmax > sblock.fs_size)
-		dmax = sblock.fs_size;
-	dlower = cgsblock(&sblock, cylno) - cbase;
-	dupper = cgdmin(&sblock, cylno) - cbase;
-	if (cylno == 0)
-		dupper += howmany(sblock.fs_cssize, sblock.fs_fsize);
-	cs = fscs + cylno;
-	bzero(&acg, sblock.fs_cgsize);
-	acg.cg_time = utime;
-	acg.cg_magic = CG_MAGIC;
-	acg.cg_cgx = cylno;
-	if (cylno == sblock.fs_ncg - 1)
-		acg.cg_ncyl = sblock.fs_ncyl % sblock.fs_cpg;
-	else
-		acg.cg_ncyl = sblock.fs_cpg;
-	acg.cg_niblk = sblock.fs_ipg;
-	acg.cg_ndblk = dmax - cbase;
-	if (sblock.fs_contigsumsize > 0)
-		acg.cg_nclusterblks = acg.cg_ndblk / sblock.fs_frag;
-	acg.cg_btotoff = &acg.cg_space[0] - (u_char *)(&acg.cg_link);
-	acg.cg_boff = acg.cg_btotoff + sblock.fs_cpg * sizeof(long);
-	acg.cg_iusedoff = acg.cg_boff +
-		sblock.fs_cpg * sblock.fs_nrpos * sizeof(short);
-	acg.cg_freeoff = acg.cg_iusedoff + howmany(sblock.fs_ipg, NBBY);
-	if (sblock.fs_contigsumsize <= 0) {
-		acg.cg_nextfreeoff = acg.cg_freeoff +
-		   howmany(sblock.fs_cpg * sblock.fs_spc / NSPF(&sblock), NBBY);
-	} else {
-		acg.cg_clustersumoff = acg.cg_freeoff + howmany
-		    (sblock.fs_cpg * sblock.fs_spc / NSPF(&sblock), NBBY) -
-		    sizeof(long);
-		acg.cg_clustersumoff =
-		    roundup(acg.cg_clustersumoff, sizeof(long));
-		acg.cg_clusteroff = acg.cg_clustersumoff +
-		    (sblock.fs_contigsumsize + 1) * sizeof(long);
-		acg.cg_nextfreeoff = acg.cg_clusteroff + howmany
-		    (sblock.fs_cpg * sblock.fs_spc / NSPB(&sblock), NBBY);
-	}
-	if (acg.cg_nextfreeoff - (long)(&acg.cg_link) > sblock.fs_cgsize)
-	  deverr (37, 0, "Panic: cylinder group too big");
-	acg.cg_cs.cs_nifree += sblock.fs_ipg;
-	if (cylno == 0)
-		for (i = 0; i < ROOTINO; i++) {
-			setbit(cg_inosused(&acg), i);
-			acg.cg_cs.cs_nifree--;
-		}
-	for (i = 0; i < sblock.fs_ipg / INOPF(&sblock); i += sblock.fs_frag)
-		wtfs(fsbtodb(&sblock, cgimin(&sblock, cylno) + i),
-		    sblock.fs_bsize, (char *)zino);
-	if (cylno > 0) {
-		/*
-		 * In cylno 0, beginning space is reserved
-		 * for boot and super blocks.
-		 */
-		for (d = 0; d < dlower; d += sblock.fs_frag) {
-			blkno = d / sblock.fs_frag;
-			setblock(&sblock, cg_blksfree(&acg), blkno);
-			if (sblock.fs_contigsumsize > 0)
-				setbit(cg_clustersfree(&acg), blkno);
-			acg.cg_cs.cs_nbfree++;
-			cg_blktot(&acg)[cbtocylno(&sblock, d)]++;
-			cg_blks(&sblock, &acg, cbtocylno(&sblock, d))
-			    [cbtorpos(&sblock, d)]++;
-		}
-		sblock.fs_dsize += dlower;
-	}
-	sblock.fs_dsize += acg.cg_ndblk - dupper;
-	i = dupper % sblock.fs_frag;
-	if (i) {
-		acg.cg_frsum[sblock.fs_frag - i]++;
-		for (d = dupper + sblock.fs_frag - i; dupper < d; dupper++) {
-			setbit(cg_blksfree(&acg), dupper);
-			acg.cg_cs.cs_nffree++;
-		}
-	}
-	for (d = dupper; d + sblock.fs_frag <= dmax - cbase; ) {
-		blkno = d / sblock.fs_frag;
-		setblock(&sblock, cg_blksfree(&acg), blkno);
-		if (sblock.fs_contigsumsize > 0)
-			setbit(cg_clustersfree(&acg), blkno);
-		acg.cg_cs.cs_nbfree++;
-		cg_blktot(&acg)[cbtocylno(&sblock, d)]++;
-		cg_blks(&sblock, &acg, cbtocylno(&sblock, d))
-		    [cbtorpos(&sblock, d)]++;
-		d += sblock.fs_frag;
-	}
-	if (d < dmax - cbase) {
-		acg.cg_frsum[dmax - cbase - d]++;
-		for (; d < dmax - cbase; d++) {
-			setbit(cg_blksfree(&acg), d);
-			acg.cg_cs.cs_nffree++;
-		}
-	}
-	if (sblock.fs_contigsumsize > 0) {
-		long *sump = cg_clustersum(&acg);
-		u_char *mapp = cg_clustersfree(&acg);
-		int map = *mapp++;
-		int bit = 1;
-		int run = 0;
-
-		for (i = 0; i < acg.cg_nclusterblks; i++) {
-			if ((map & bit) != 0) {
-				run++;
-			} else if (run != 0) {
-				if (run > sblock.fs_contigsumsize)
-					run = sblock.fs_contigsumsize;
-				sump[run]++;
-				run = 0;
-			}
-			if ((i & (NBBY - 1)) != (NBBY - 1)) {
-				bit <<= 1;
-			} else {
-				map = *mapp++;
-				bit = 1;
-			}
-		}
-		if (run != 0) {
-			if (run > sblock.fs_contigsumsize)
-				run = sblock.fs_contigsumsize;
-			sump[run]++;
-		}
-	}
-	sblock.fs_cstotal.cs_ndir += acg.cg_cs.cs_ndir;
-	sblock.fs_cstotal.cs_nffree += acg.cg_cs.cs_nffree;
-	sblock.fs_cstotal.cs_nbfree += acg.cg_cs.cs_nbfree;
-	sblock.fs_cstotal.cs_nifree += acg.cg_cs.cs_nifree;
-	*cs = acg.cg_cs;
-	wtfs(fsbtodb(&sblock, cgtod(&sblock, cylno)),
-		sblock.fs_bsize, (char *)&acg);
-}
-
-/*
- * initialize the file system
- */
-struct dinode node;
-
-#ifdef LOSTDIR
-#define PREDEFDIR 3
-#else
-#define PREDEFDIR 2
-#endif
-
-struct directory_entry root_dir[] = {
-	{ ROOTINO, sizeof(struct directory_entry), DT_DIR, 1, "." },
-	{ ROOTINO, sizeof(struct directory_entry), DT_DIR, 2, ".." },
-#ifdef LOSTDIR
-	{ LOSTFOUNDINO, sizeof(struct directory_entry), DT_DIR, 10, "lost+found" },
-#endif
-};
-struct odirectory_entry {
-	u_long	d_ino;
-	u_short	d_reclen;
-	u_short	d_namlen;
-	u_char	d_name[MAXNAMLEN + 1];
-} oroot_dir[] = {
-	{ ROOTINO, sizeof(struct directory_entry), 1, "." },
-	{ ROOTINO, sizeof(struct directory_entry), 2, ".." },
-#ifdef LOSTDIR
-	{ LOSTFOUNDINO, sizeof(struct directory_entry), 10, "lost+found" },
-#endif
-};
-#ifdef LOSTDIR
-struct directory_entry lost_found_dir[] = {
-	{ LOSTFOUNDINO, sizeof(struct directory_entry), DT_DIR, 1, "." },
-	{ ROOTINO, sizeof(struct directory_entry), DT_DIR, 2, ".." },
-	{ 0, DIRBLKSIZ, 0, 0, 0 },
-};
-struct odirectory_entry olost_found_dir[] = {
-	{ LOSTFOUNDINO, sizeof(struct directory_entry), 1, "." },
-	{ ROOTINO, sizeof(struct directory_entry), 2, ".." },
-	{ 0, DIRBLKSIZ, 0, 0 },
-};
-#endif
-char buf[MAXBSIZE];
-
-void
-fsinit(utime)
-	time_t utime;
-{
-	/*
-	 * initialize the node
-	 */
-	node.di_atime.tv_sec = utime;
-	node.di_mtime.tv_sec = utime;
-	node.di_ctime.tv_sec = utime;
-#ifdef LOSTDIR
-	/*
-	 * create the lost+found directory
-	 */
-	if (Oflag) {
-		(void)makedir((struct directory_entry *)olost_found_dir, 2);
-		for (i = DIRBLKSIZ; i < sblock.fs_bsize; i += DIRBLKSIZ)
-			bcopy(&olost_found_dir[2], &buf[i],
-			    DIRSIZ(0, &olost_found_dir[2]));
-	} else {
-		(void)makedir(lost_found_dir, 2);
-		for (i = DIRBLKSIZ; i < sblock.fs_bsize; i += DIRBLKSIZ)
-			bcopy(&lost_found_dir[2], &buf[i],
-			    DIRSIZ(0, &lost_found_dir[2]));
-	}
-	node.di_model = ifdir | UMASK;
-	node.di_modeh = 0;
-	node.di_nlink = 2;
-	node.di_size = sblock.fs_bsize;
-	node.di_db[0] = alloc(node.di_size, DI_MODE (&node));
-	node.di_blocks = btodb(fragroundup(&sblock, node.di_size));
-	wtfs(fsbtodb(&sblock, node.di_db[0]), node.di_size, buf);
-	iput(&node, LOSTFOUNDINO);
-#endif
-	/*
-	 * create the root directory
-	 */
-	node.di_model = IFDIR | UMASK;
-	node.di_modeh = 0;
-	node.di_nlink = PREDEFDIR;
-
-	/* Set the uid/gid to non-root if run by a non-root user.  This
-	   is what mke2fs does in e2fsprogs-1.18 (actually it uses the
-	   real IDs iff geteuid()!=0, but that is just wrong).  */
-	node.di_uid = geteuid();
-	if (node.di_uid != 0)
-	  node.di_gid = getegid();
-
-	if (Oflag)
-		node.di_size = makedir((struct directory_entry *)oroot_dir, PREDEFDIR);
-	else
-		node.di_size = makedir(root_dir, PREDEFDIR);
-	node.di_db[0] = alloc(sblock.fs_fsize, DI_MODE (&node));
-	node.di_blocks = btodb(fragroundup(&sblock, node.di_size));
-	wtfs(fsbtodb(&sblock, node.di_db[0]), sblock.fs_fsize, buf);
-	iput(&node, ROOTINO);
-}
-
-/*
- * construct a set of directory entries in "buf".
- * return size of directory.
- */
-int
-makedir(protodir, entries)
-	register struct directory_entry *protodir;
-	int entries;
-{
-	char *cp;
-	int i, spcleft;
-
-	spcleft = DIRBLKSIZ;
-	for (cp = buf, i = 0; i < entries - 1; i++) {
-		protodir[i].d_reclen = DIRSIZ(0, &protodir[i]);
-		bcopy(&protodir[i], cp, protodir[i].d_reclen);
-		cp += protodir[i].d_reclen;
-		spcleft -= protodir[i].d_reclen;
-	}
-	protodir[i].d_reclen = spcleft;
-	bcopy(&protodir[i], cp, DIRSIZ(0, &protodir[i]));
-	return (DIRBLKSIZ);
-}
-
-/*
- * allocate a block or frag
- */
-daddr_t
-alloc(size, mode)
-	int size;
-	int mode;
-{
-	int i, frag;
-	daddr_t d, blkno;
-
-	rdfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
-	    (char *)&acg);
-	if (acg.cg_magic != CG_MAGIC) {
-		deverr (0, 0, "cg 0: bad magic number");
-		return (0);
-	}
-	if (acg.cg_cs.cs_nbfree == 0) {
-		deverr (0, 0, "first cylinder group ran out of space");
-		return (0);
-	}
-	for (d = 0; d < acg.cg_ndblk; d += sblock.fs_frag)
-		if (isblock(&sblock, cg_blksfree(&acg), d / sblock.fs_frag))
-			goto goth;
-	deverr (0, 0, "internal error: can't find block in cyl 0");
-	return (0);
-goth:
-	blkno = fragstoblks(&sblock, d);
-	clrblock(&sblock, cg_blksfree(&acg), blkno);
-	if (sblock.fs_contigsumsize > 0)
-		clrbit(cg_clustersfree(&acg), blkno);
-	acg.cg_cs.cs_nbfree--;
-	sblock.fs_cstotal.cs_nbfree--;
-	fscs[0].cs_nbfree--;
-	if (mode & IFDIR) {
-		acg.cg_cs.cs_ndir++;
-		sblock.fs_cstotal.cs_ndir++;
-		fscs[0].cs_ndir++;
-	}
-	cg_blktot(&acg)[cbtocylno(&sblock, d)]--;
-	cg_blks(&sblock, &acg, cbtocylno(&sblock, d))[cbtorpos(&sblock, d)]--;
-	if (size != sblock.fs_bsize) {
-		frag = howmany(size, sblock.fs_fsize);
-		fscs[0].cs_nffree += sblock.fs_frag - frag;
-		sblock.fs_cstotal.cs_nffree += sblock.fs_frag - frag;
-		acg.cg_cs.cs_nffree += sblock.fs_frag - frag;
-		acg.cg_frsum[sblock.fs_frag - frag]++;
-		for (i = frag; i < sblock.fs_frag; i++)
-			setbit(cg_blksfree(&acg), d + i);
-	}
-	wtfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
-	    (char *)&acg);
-	return (d);
-}
-
-/*
- * Allocate an inode on the disk
- */
-void
-iput(ip, ino)
-	register struct dinode *ip;
-	register ino_t ino;
-{
-	struct dinode buf[MAXINOPB];
-	daddr_t d;
-	int c;
-
-	c = ino_to_cg(&sblock, ino);
-	rdfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
-	    (char *)&acg);
-	if (acg.cg_magic != CG_MAGIC)
-	  deverr (31, 0, "cg 0: bad magic number");
-	acg.cg_cs.cs_nifree--;
-	setbit(cg_inosused(&acg), ino);
-	wtfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
-	    (char *)&acg);
-	sblock.fs_cstotal.cs_nifree--;
-	fscs[0].cs_nifree--;
-	if (ino >= sblock.fs_ipg * sblock.fs_ncg)
-	  deverr (32, 0, "fsinit: inode value out of range (%Ld)", ino);
-	d = fsbtodb(&sblock, ino_to_fsba(&sblock, ino));
-	rdfs(d, sblock.fs_bsize, buf);
-	buf[ino_to_fsbo(&sblock, ino)] = *ip;
-	wtfs(d, sblock.fs_bsize, buf);
-}
-
-/*
- * read a block from the file system
- */
-void
-rdfs(bno, size, bf)
-	daddr_t bno;
-	int size;
-	char *bf;
-{
-	int n;
-	if (lseek(fsi, (off_t)bno * sectorsize, 0) < 0)
-	  deverr (33, errno, "rdfs: %ld: seek error", bno);
-	n = read(fsi, bf, size);
-	if (n != size)
-	  deverr (34, errno, "rdfs: %ld: read error", bno);
-}
-
-/*
- * write a block to the file system
- */
-void
-wtfs(bno, size, bf)
-	daddr_t bno;
-	int size;
-	char *bf;
-{
-	int n;
-	if (Nflag)
-		return;
-	if (lseek(fso, (off_t)bno * sectorsize, SEEK_SET) < 0)
-	  deverr (35, errno, "wtfs: %ld: seek error", bno);
-	n = write(fso, bf, size);
-	if (n != size)
-	  deverr (36, errno, "wtfs: %ld: write error", bno);
-}
-
-/*
- * check if a block is available
- */
-int
-isblock(fs, cp, h)
-	struct fs *fs;
-	unsigned char *cp;
-	int h;
-{
-	unsigned char mask;
-
-	switch (fs->fs_frag) {
-	case 8:
-		return (cp[h] == 0xff);
-	case 4:
-		mask = 0x0f << ((h & 0x1) << 2);
-		return ((cp[h >> 1] & mask) == mask);
-	case 2:
-		mask = 0x03 << ((h & 0x3) << 1);
-		return ((cp[h >> 2] & mask) == mask);
-	case 1:
-		mask = 0x01 << (h & 0x7);
-		return ((cp[h >> 3] & mask) == mask);
-	default:
-		deverr (0, 0, "isblock bad fs_frag %ld", fs->fs_frag);
-		return (0);
-	}
-}
-
-/*
- * take a block out of the map
- */
-void
-clrblock(fs, cp, h)
-	struct fs *fs;
-	unsigned char *cp;
-	int h;
-{
-	switch ((fs)->fs_frag) {
-	case 8:
-		cp[h] = 0;
-		return;
-	case 4:
-		cp[h >> 1] &= ~(0x0f << ((h & 0x1) << 2));
-		return;
-	case 2:
-		cp[h >> 2] &= ~(0x03 << ((h & 0x3) << 1));
-		return;
-	case 1:
-		cp[h >> 3] &= ~(0x01 << (h & 0x7));
-		return;
-	default:
-		deverr (0, 0, "clrblock bad fs_frag %ld", fs->fs_frag);
-		return;
-	}
-}
-
-/*
- * put a block into the map
- */
-void
-setblock(fs, cp, h)
-	struct fs *fs;
-	unsigned char *cp;
-	int h;
-{
-	switch (fs->fs_frag) {
-	case 8:
-		cp[h] = 0xff;
-		return;
-	case 4:
-		cp[h >> 1] |= (0x0f << ((h & 0x1) << 2));
-		return;
-	case 2:
-		cp[h >> 2] |= (0x03 << ((h & 0x3) << 1));
-		return;
-	case 1:
-		cp[h >> 3] |= (0x01 << (h & 0x7));
-		return;
-	default:
-		deverr (0, 0, "setblock bad fs_frag %ld", fs->fs_frag);
-		return;
-	}
-}
diff --git a/ufs-utils/newfs.c b/ufs-utils/newfs.c
deleted file mode 100644
index efc7dbea..00000000
--- a/ufs-utils/newfs.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993, 1994
- *	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) 1983, 1989, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-/*static char sccsid[] = "from: @(#)newfs.c	8.8 (Berkeley) 4/18/94";*/
-static char *rcsid = "$Id: newfs.c,v 1.2 1994/09/09 14:11:41 mib Exp $";
-#endif /* not lint */
-
-/*
- * newfs: friendly front end to mkfs
- */
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-/* #include <sys/disklabel.h> */
-#include <sys/file.h>
-/* #include <sys/mount.h> */
-
-#include "../ufs/dir.h"
-#include "../ufs/fs.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-/* #include "mntopts.h" */
-
-/* GNU Hurd additions */
-#define MAXPATHLEN 2048
-
-/* End GNU Hurd additions */
-
-
-#if 0
-struct mntopt mopts[] = {
-	MOPT_STDOPTS,
-	MOPT_ASYNC,
-	{ NULL },
-};
-#endif
-
-#if __STDC__
-void	fatal(const char *fmt, ...);
-#else
-void	fatal();
-#endif
-
-#define	COMPAT			/* allow non-labeled disks */
-
-/*
- * The following two constants set the default block and fragment sizes.
- * Both constants must be a power of 2 and meet the following constraints:
- *	MINBSIZE <= DESBLKSIZE <= MAXBSIZE
- *	sectorsize <= DESFRAGSIZE <= DESBLKSIZE
- *	DESBLKSIZE / DESFRAGSIZE <= 8
- */
-#define	DFL_FRAGSIZE	1024
-#define	DFL_BLKSIZE	8192
-
-/*
- * Cylinder groups may have up to many cylinders. The actual
- * number used depends upon how much information can be stored
- * on a single cylinder. The default is to use 16 cylinders
- * per group.
- */
-#define	DESCPG		16	/* desired fs_cpg */
-
-/*
- * ROTDELAY gives the minimum number of milliseconds to initiate
- * another disk transfer on the same cylinder. It is used in
- * determining the rotationally optimal layout for disk blocks
- * within a file; the default of fs_rotdelay is 4ms.
- */
-#define ROTDELAY	4
-
-/*
- * MAXBLKPG determines the maximum number of data blocks which are
- * placed in a single cylinder group. The default is one indirect
- * block worth of data blocks.
- */
-#define MAXBLKPG(bsize)	((bsize) / sizeof(daddr_t))
-
-/*
- * Each file system has a number of inodes statically allocated.
- * We allocate one inode slot per NFPI fragments, expecting this
- * to be far more than we will ever need.
- */
-#define	NFPI		4
-
-/*
- * For each cylinder we keep track of the availability of blocks at different
- * rotational positions, so that we can lay out the data to be picked
- * up with minimum rotational latency.  NRPOS is the default number of
- * rotational positions that we distinguish.  With NRPOS of 8 the resolution
- * of our summary information is 2ms for a typical 3600 rpm drive.
- */
-#define	NRPOS		8	/* number distinct rotational positions */
-
-
-int	mfs;			/* run as the memory based filesystem */
-int	Nflag;			/* run without writing file system */
-int	Oflag;			/* format as an 4.3BSD file system */
-int	fssize;			/* file system size */
-int	ntracks;		/* # tracks/cylinder */
-int	nsectors;		/* # sectors/track */
-int	nphyssectors;		/* # sectors/track including spares */
-int	secpercyl;		/* sectors per cylinder */
-int	trackspares = -1;	/* spare sectors per track */
-int	cylspares = -1;		/* spare sectors per cylinder */
-int	sectorsize;		/* bytes/sector */
-#ifdef tahoe
-int	realsectorsize;		/* bytes/sector in hardware */
-#endif
-int	rpm;			/* revolutions/minute of drive */
-int	interleave;		/* hardware sector interleave */
-int	trackskew = -1;		/* sector 0 skew, per track */
-int	headswitch;		/* head switch time, usec */
-int	trackseek;		/* track-to-track seek, usec */
-int	fsize = 0;		/* fragment size */
-int	bsize = 0;		/* block size */
-int	cpg = DESCPG;		/* cylinders/cylinder group */
-int	cpgflg;			/* cylinders/cylinder group flag was given */
-int	minfree = MINFREE;	/* free space threshold */
-int	opt = DEFAULTOPT;	/* optimization preference (space or time) */
-int	density;		/* number of bytes per inode */
-int	maxcontig = 0;		/* max contiguous blocks to allocate */
-int	rotdelay = ROTDELAY;	/* rotational delay between blocks */
-int	maxbpg;			/* maximum blocks per file in a cyl group */
-int	nrpos = NRPOS;		/* # of distinguished rotational positions */
-int	bbsize = BBSIZE;	/* boot block size */
-int	sbsize = SBSIZE;	/* superblock size */
-/* int	mntflags = MNT_ASYNC;*/	/* flags to be passed to mount */
-u_long	memleft;		/* virtual memory available */
-caddr_t	membase;		/* start address of memory based filesystem */
-#ifdef COMPAT
-char	*disktype;
-int	unlabeled;
-#endif
-
-char	device[MAXPATHLEN];
-char	*progname;
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	extern char *optarg;
-	extern int optind;
-	register int ch;
-	register struct partition *pp;
-	register struct disklabel *lp;
-	struct disklabel *getdisklabel();
-/*	struct partition oldpartition; */
-	struct stat st;
-	struct statfs *mp;
-	int fsi, fso, len, n;
-	char *cp, *s1, *s2, *special, *opstring, buf[BUFSIZ];
-
-	if (progname = rindex(*argv, '/'))
-		++progname;
-	else
-		progname = *argv;
-
-#if 0
-	if (strstr(progname, "mfs")) {
-		mfs = 1;
-		Nflag++;
-	}
-#endif
-
-	opstring = mfs ?
-	    "NT:a:b:c:d:e:f:i:m:o:s:" :
-	    "NOS:T:a:b:c:d:e:f:i:k:l:m:n:o:p:r:s:t:u:x:";
-	while ((ch = getopt(argc, argv, opstring)) != EOF)
-		switch (ch) {
-		case 'N':
-			Nflag = 1;
-			break;
-		case 'O':
-			Oflag = 1;
-			break;
-		case 'S':
-			if ((sectorsize = atoi(optarg)) <= 0)
-				fatal("%s: bad sector size", optarg);
-			break;
-#ifdef COMPAT
-		case 'T':
-			disktype = optarg;
-			break;
-#endif
-		case 'a':
-			if ((maxcontig = atoi(optarg)) <= 0)
-				fatal("%s: bad maximum contiguous blocks\n",
-				    optarg);
-			break;
-		case 'b':
-			if ((bsize = atoi(optarg)) < MINBSIZE)
-				fatal("%s: bad block size", optarg);
-			break;
-		case 'c':
-			if ((cpg = atoi(optarg)) <= 0)
-				fatal("%s: bad cylinders/group", optarg);
-			cpgflg++;
-			break;
-		case 'd':
-			if ((rotdelay = atoi(optarg)) < 0)
-				fatal("%s: bad rotational delay\n", optarg);
-			break;
-		case 'e':
-			if ((maxbpg = atoi(optarg)) <= 0)
-		fatal("%s: bad blocks per file in a cylinder group\n",
-				    optarg);
-			break;
-		case 'f':
-			if ((fsize = atoi(optarg)) <= 0)
-				fatal("%s: bad fragment size", optarg);
-			break;
-		case 'i':
-			if ((density = atoi(optarg)) <= 0)
-				fatal("%s: bad bytes per inode\n", optarg);
-			break;
-		case 'k':
-			if ((trackskew = atoi(optarg)) < 0)
-				fatal("%s: bad track skew", optarg);
-			break;
-		case 'l':
-			if ((interleave = atoi(optarg)) <= 0)
-				fatal("%s: bad interleave", optarg);
-			break;
-		case 'm':
-			if ((minfree = atoi(optarg)) < 0 || minfree > 99)
-				fatal("%s: bad free space %%\n", optarg);
-			break;
-		case 'n':
-			if ((nrpos = atoi(optarg)) <= 0)
-				fatal("%s: bad rotational layout count\n",
-				    optarg);
-			break;
-		case 'o':
-#if 0
-			if (mfs)
-				getmntopts(optarg, mopts, &mntflags);
-			else 
-#endif
-			  {
-				if (strcmp(optarg, "space") == 0)
-					opt = FS_OPTSPACE;
-				else if (strcmp(optarg, "time") == 0)
-					opt = FS_OPTTIME;
-				else
-	fatal("%s: unknown optimization preference: use `space' or `time'.");
-			}
-			break;
-		case 'p':
-			if ((trackspares = atoi(optarg)) < 0)
-				fatal("%s: bad spare sectors per track",
-				    optarg);
-			break;
-		case 'r':
-			if ((rpm = atoi(optarg)) <= 0)
-				fatal("%s: bad revolutions/minute\n", optarg);
-			break;
-		case 's':
-			if ((fssize = atoi(optarg)) <= 0)
-				fatal("%s: bad file system size", optarg);
-			break;
-		case 't':
-			if ((ntracks = atoi(optarg)) <= 0)
-				fatal("%s: bad total tracks", optarg);
-			break;
-		case 'u':
-			if ((nsectors = atoi(optarg)) <= 0)
-				fatal("%s: bad sectors/track", optarg);
-			break;
-		case 'x':
-			if ((cylspares = atoi(optarg)) < 0)
-				fatal("%s: bad spare sectors per cylinder",
-				    optarg);
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc != 2 && (mfs || argc != 1))
-		usage();
-
-	special = argv[0];
-	cp = rindex(special, '/');
-	if (cp == 0) {
-		/*
-		 * No path prefix; try /dev/r%s then /dev/%s.
-		 */
-		(void)sprintf(device, "%sr%s", _PATH_DEV, special);
-		if (stat(device, &st) == -1)
-			(void)sprintf(device, "%s%s", _PATH_DEV, special);
-		special = device;
-	}
-	if (Nflag) {
-		fso = -1;
-	} else {
-		fso = open(special, O_WRONLY);
-		if (fso < 0)
-			fatal("%s: %s", special, strerror(errno));
-
-#if 0
-		/* Bail if target special is mounted */
-		n = getmntinfo(&mp, MNT_NOWAIT);
-		if (n == 0)
-			fatal("%s: getmntinfo: %s", special, strerror(errno));
-
-		len = sizeof(_PATH_DEV) - 1;
-		s1 = special;
-		if (strncmp(_PATH_DEV, s1, len) == 0)
-			s1 += len;
-
-		while (--n >= 0) {
-			s2 = mp->f_mntfromname;
-			if (strncmp(_PATH_DEV, s2, len) == 0) {
-				s2 += len - 1;
-				*s2 = 'r';
-			}
-			if (strcmp(s1, s2) == 0 || strcmp(s1, &s2[1]) == 0)
-				fatal("%s is mounted on %s",
-				    special, mp->f_mntonname);
-			++mp;
-		}
-#endif
-	}
-#if 0
-	if (mfs && disktype != NULL) {
-		lp = (struct disklabel *)getdiskbyname(disktype);
-		if (lp == NULL)
-			fatal("%s: unknown disk type", disktype);
-		pp = &lp->d_partitions[1];
-	} else {
-		fsi = open(special, O_RDONLY);
-		if (fsi < 0)
-			fatal("%s: %s", special, strerror(errno));
-		if (fstat(fsi, &st) < 0)
-			fatal("%s: %s", special, strerror(errno));
-		if ((st.st_mode & S_IFMT) != S_IFCHR && !mfs)
-			printf("%s: %s: not a character-special device\n",
-			    progname, special);
-		cp = index(argv[0], '\0') - 1;
-		if (cp == 0 || (*cp < 'a' || *cp > 'h') && !isdigit(*cp))
-			fatal("%s: can't figure out file system partition",
-			    argv[0]);
-#ifdef COMPAT
-		if (!mfs && disktype == NULL)
-			disktype = argv[1];
-#endif
-		lp = getdisklabel(special, fsi);
-		if (isdigit(*cp))
-			pp = &lp->d_partitions[0];
-		else
-			pp = &lp->d_partitions[*cp - 'a'];
-		if (pp->p_size == 0)
-			fatal("%s: `%c' partition is unavailable",
-			    argv[0], *cp);
-		if (pp->p_fstype == FS_BOOT)
-			fatal("%s: `%c' partition overlaps boot program",
-			      argv[0], *cp);
-	}
-#endif
-	/* GNU Hurd specific here */
-	fsi = open (special, O_RDONLY);
-	if (fsi < 0)
-	  fatal("%s: %s", special, strerror(errno));
-	if (fstat(fsi, &st) < 0)
-	  fatal("%s: %s", special, strerror(errno));
-	fssize = st.st_size;
-	/* End GNU Hurd specific */
-	
-	if (fssize == 0)
-		fssize = pp->p_size;
-	if (fssize > pp->p_size && !mfs)
-	       fatal("%s: maximum file system size on the `%c' partition is %d",
-			argv[0], *cp, pp->p_size);
-	if (rpm == 0) {
-		rpm = lp->d_rpm;
-		if (rpm <= 0)
-			rpm = 3600;
-	}
-	if (ntracks == 0) {
-		ntracks = lp->d_ntracks;
-		if (ntracks <= 0)
-			fatal("%s: no default #tracks", argv[0]);
-	}
-	if (nsectors == 0) {
-		nsectors = lp->d_nsectors;
-		if (nsectors <= 0)
-			fatal("%s: no default #sectors/track", argv[0]);
-	}
-	if (sectorsize == 0) {
-		sectorsize = lp->d_secsize;
-		if (sectorsize <= 0)
-			fatal("%s: no default sector size", argv[0]);
-	}
-	if (trackskew == -1) {
-		trackskew = lp->d_trackskew;
-		if (trackskew < 0)
-			trackskew = 0;
-	}
-	if (interleave == 0) {
-		interleave = lp->d_interleave;
-		if (interleave <= 0)
-			interleave = 1;
-	}
-	if (fsize == 0) {
-		fsize = pp->p_fsize;
-		if (fsize <= 0)
-			fsize = MAX(DFL_FRAGSIZE, lp->d_secsize);
-	}
-	if (bsize == 0) {
-		bsize = pp->p_frag * pp->p_fsize;
-		if (bsize <= 0)
-			bsize = MIN(DFL_BLKSIZE, 8 * fsize);
-	}
-	/*
-	 * Maxcontig sets the default for the maximum number of blocks
-	 * that may be allocated sequentially. With filesystem clustering
-	 * it is possible to allocate contiguous blocks up to the maximum
-	 * transfer size permitted by the controller or buffering.
-	 */
-	if (maxcontig == 0)
-		maxcontig = MAX(1, MIN(MAXPHYS, MAXBSIZE) / bsize - 1);
-	if (density == 0)
-		density = NFPI * fsize;
-	if (minfree < MINFREE && opt != FS_OPTSPACE) {
-		fprintf(stderr, "Warning: changing optimization to space ");
-		fprintf(stderr, "because minfree is less than %d%%\n", MINFREE);
-		opt = FS_OPTSPACE;
-	}
-	if (trackspares == -1) {
-		trackspares = lp->d_sparespertrack;
-		if (trackspares < 0)
-			trackspares = 0;
-	}
-	nphyssectors = nsectors + trackspares;
-	if (cylspares == -1) {
-		cylspares = lp->d_sparespercyl;
-		if (cylspares < 0)
-			cylspares = 0;
-	}
-	secpercyl = nsectors * ntracks - cylspares;
-	if (secpercyl != lp->d_secpercyl)
-		fprintf(stderr, "%s (%d) %s (%lu)\n",
-			"Warning: calculated sectors per cylinder", secpercyl,
-			"disagrees with disk label", lp->d_secpercyl);
-	if (maxbpg == 0)
-		maxbpg = MAXBLKPG(bsize);
-	headswitch = lp->d_headswitch;
-	trackseek = lp->d_trkseek;
-#ifdef notdef /* label may be 0 if faked up by kernel */
-	bbsize = lp->d_bbsize;
-	sbsize = lp->d_sbsize;
-#endif
-	oldpartition = *pp;
-#ifdef tahoe
-	realsectorsize = sectorsize;
-	if (sectorsize != DEV_BSIZE) {		/* XXX */
-		int secperblk = DEV_BSIZE / sectorsize;
-
-		sectorsize = DEV_BSIZE;
-		nsectors /= secperblk;
-		nphyssectors /= secperblk;
-		secpercyl /= secperblk;
-		fssize /= secperblk;
-		pp->p_size /= secperblk;
-	}
-#endif
-	mkfs(pp, special, fsi, fso);
-#ifdef tahoe
-	if (realsectorsize != DEV_BSIZE)
-		pp->p_size *= DEV_BSIZE / realsectorsize;
-#endif
-	if (!Nflag && bcmp(pp, &oldpartition, sizeof(oldpartition)))
-		rewritelabel(special, fso, lp);
-	if (!Nflag)
-		close(fso);
-	close(fsi);
-#ifdef MFS
-	if (mfs) {
-		struct mfs_args args;
-
-		sprintf(buf, "mfs:%d", getpid());
-		args.fspec = buf;
-		args.export.ex_root = -2;
-		if (mntflags & MNT_RDONLY)
-			args.export.ex_flags = MNT_EXRDONLY;
-		else
-			args.export.ex_flags = 0;
-		args.base = membase;
-		args.size = fssize * sectorsize;
-		if (mount(MOUNT_MFS, argv[1], mntflags, &args) < 0)
-			fatal("%s: %s", argv[1], strerror(errno));
-	}
-#endif
-	exit(0);
-}
-
-#ifdef COMPAT
-char lmsg[] = "%s: can't read disk label; disk type must be specified";
-#else
-char lmsg[] = "%s: can't read disk label";
-#endif
-
-struct disklabel *
-getdisklabel(s, fd)
-	char *s;
-	int fd;
-{
-	static struct disklabel lab;
-
-	if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) {
-#ifdef COMPAT
-		if (disktype) {
-			struct disklabel *lp, *getdiskbyname();
-
-			unlabeled++;
-			lp = getdiskbyname(disktype);
-			if (lp == NULL)
-				fatal("%s: unknown disk type", disktype);
-			return (lp);
-		}
-#endif
-		warn("ioctl (GDINFO)");
-		fatal(lmsg, s);
-	}
-	return (&lab);
-}
-
-rewritelabel(s, fd, lp)
-	char *s;
-	int fd;
-	register struct disklabel *lp;
-{
-#ifdef COMPAT
-	if (unlabeled)
-		return;
-#endif
-	lp->d_checksum = 0;
-	lp->d_checksum = dkcksum(lp);
-	if (ioctl(fd, DIOCWDINFO, (char *)lp) < 0) {
-		warn("ioctl (WDINFO)");
-		fatal("%s: can't rewrite disk label", s);
-	}
-#if vax
-	if (lp->d_type == DTYPE_SMD && lp->d_flags & D_BADSECT) {
-		register i;
-		int cfd;
-		daddr_t alt;
-		char specname[64];
-		char blk[1024];
-		char *cp;
-
-		/*
-		 * Make name for 'c' partition.
-		 */
-		strcpy(specname, s);
-		cp = specname + strlen(specname) - 1;
-		if (!isdigit(*cp))
-			*cp = 'c';
-		cfd = open(specname, O_WRONLY);
-		if (cfd < 0)
-			fatal("%s: %s", specname, strerror(errno));
-		bzero(blk, sizeof(blk));
-		*(struct disklabel *)(blk + LABELOFFSET) = *lp;
-		alt = lp->d_ncylinders * lp->d_secpercyl - lp->d_nsectors;
-		for (i = 1; i < 11 && i < lp->d_nsectors; i += 2) {
-			if (lseek(cfd, (off_t)(alt + i) * lp->d_secsize,
-			    L_SET) == -1)
-				fatal("lseek to badsector area: %s",
-				    strerror(errno));
-			if (write(cfd, blk, lp->d_secsize) < lp->d_secsize)
-				warn("alternate label %d write", i/2);
-		}
-		close(cfd);
-	}
-#endif
-}
-
-/*VARARGS*/
-void
-#if __STDC__
-fatal(const char *fmt, ...)
-#else
-fatal(fmt, va_alist)
-	char *fmt;
-	va_dcl
-#endif
-{
-	va_list ap;
-
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-	if (fcntl(STDERR_FILENO, F_GETFL) < 0) {
-		openlog(progname, LOG_CONS, LOG_DAEMON);
-		vsyslog(LOG_ERR, fmt, ap);
-		closelog();
-	} else {
-		vwarnx(fmt, ap);
-	}
-	va_end(ap);
-	exit(1);
-	/*NOTREACHED*/
-}
-
-usage()
-{
-	if (mfs) {
-		fprintf(stderr,
-		    "usage: %s [ -fsoptions ] special-device mount-point\n",
-			progname);
-	} else
-		fprintf(stderr,
-		    "usage: %s [ -fsoptions ] special-device%s\n",
-		    progname,
-#ifdef COMPAT
-		    " [device-type]");
-#else
-		    "");
-#endif
-	fprintf(stderr, "where fsoptions are:\n");
-	fprintf(stderr,
-	    "\t-N do not create file system, just print out parameters\n");
-	fprintf(stderr, "\t-O create a 4.3BSD format filesystem\n");
-	fprintf(stderr, "\t-S sector size\n");
-#ifdef COMPAT
-	fprintf(stderr, "\t-T disktype\n");
-#endif
-	fprintf(stderr, "\t-a maximum contiguous blocks\n");
-	fprintf(stderr, "\t-b block size\n");
-	fprintf(stderr, "\t-c cylinders/group\n");
-	fprintf(stderr, "\t-d rotational delay between contiguous blocks\n");
-	fprintf(stderr, "\t-e maximum blocks per file in a cylinder group\n");
-	fprintf(stderr, "\t-f frag size\n");
-	fprintf(stderr, "\t-i number of bytes per inode\n");
-	fprintf(stderr, "\t-k sector 0 skew, per track\n");
-	fprintf(stderr, "\t-l hardware sector interleave\n");
-	fprintf(stderr, "\t-m minimum free space %%\n");
-	fprintf(stderr, "\t-n number of distinguished rotational positions\n");
-	fprintf(stderr, "\t-o optimization preference (`space' or `time')\n");
-	fprintf(stderr, "\t-p spare sectors per track\n");
-	fprintf(stderr, "\t-s file system size (sectors)\n");
-	fprintf(stderr, "\t-r revolutions/minute\n");
-	fprintf(stderr, "\t-t tracks/cylinder\n");
-	fprintf(stderr, "\t-u sectors/track\n");
-	fprintf(stderr, "\t-x spare sectors per cylinder\n");
-	exit(1);
-}
diff --git a/ufs-utils/stati.c b/ufs-utils/stati.c
deleted file mode 100644
index ba545bf2..00000000
--- a/ufs-utils/stati.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rich $alz of BBN Inc.
- *
- * 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) 1990, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-
-static char copyright[] __attribute__ ((unused));
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
-static char sccsid[] __attribute__ ((unused));
-#endif /* not lint */
-
-/* Modified by Michael I. Bushnell for GNU Hurd. */
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include "../ufs/dinode.h"
-#include "../ufs/fs.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
-
-#define MAXPHYS (64 * 1024)
-#define DEV_BSIZE 512
-
-/* Returns a nice representation of a file mode in a static buffer.  */
-static char *
-mode_rep (unsigned short mode)
-{
-  static char buf[30];
-  char *p = buf;
-
-  void add_perms (int shift, unsigned sid_mask)
-    {
-      unsigned short smode = mode << shift;
-      *p++ = (smode & S_IREAD) ? 'r' : '-';
-      *p++ = (smode & S_IWRITE) ? 'w' : '-';
-      *p++ = (smode & S_IEXEC) ? ((mode & sid_mask) ? 's' : 'x') : '-';
-    }
-
-  switch (mode & S_IFMT)
-    {
-    case S_IFREG: *p++ = '-'; break;
-    case S_IFDIR: *p++ = 'd'; break;
-    case S_IFCHR: *p++ = 'c'; break;
-    case S_IFBLK: *p++ = 'b'; break;
-    case S_IFLNK: *p++ = 'l'; break;
-    case S_IFSOCK:*p++ = 'p'; break;
-    case S_IFIFO: *p++ = 'f'; break;
-    default:      *p++ = '?';
-    }
-
-  add_perms (0, S_ISUID);
-  add_perms (3, S_ISGID);
-  add_perms (6, 0);
-
-  snprintf (p, buf + sizeof buf - p, " [0%0o]", mode);
-
-  return buf;
-}
-
-/* Returns a nice representation of a struct timespec in a static buffer.  */
-static char *
-timespec_rep (struct timespec *ts)
-{
-  static char buf[200];
-  char *p = buf;
-  if (ts->tv_sec || ts->tv_nsec)
-    {
-      time_t time = ts->tv_sec;
-      strcpy (buf, ctime (&time));
-      p += strlen (buf);
-      if (p[-1] == '\n')
-	p--;
-      *p++ = ' ';
-    }
-  snprintf (p, buf + sizeof buf - p, "[%ld, %ld]", ts->tv_sec, ts->tv_nsec);
-  return buf;
-}
-
-/* Returns a nice representation of a uid in a static buffer.  */
-static char *
-uid_rep (uid_t uid)
-{
-  static char buf[200];
-  struct passwd *pw = getpwuid (uid);
-  if (pw)
-    snprintf (buf, sizeof buf, "%d(%s)", uid, pw->pw_name);
-  else
-    snprintf (buf, sizeof buf, "%d", uid);
-  return buf;
-}
-
-/* Returns a nice representation of a gid in a static buffer.  */
-static char *
-gid_rep (gid_t gid)
-{
-  static char buf[200];
-  struct group *gr = getgrgid (gid);
-  if (gr)
-    snprintf (buf, sizeof buf, "%d(%s)", gid, gr->gr_name);
-  else
-    snprintf (buf, sizeof buf, "%d", gid);
-  return buf;
-}
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	register struct fs *sbp;
-	register struct dinode *ip;
-	register int fd;
-	struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)];
-	long bsize;
-	off_t offset;
-	int inonum;
-	char *fs, sblock[SBSIZE];
-
-	if (argc < 3) {
-		(void)fprintf(stderr, "usage: stati filesystem inode ...\n");
-		exit(1);
-	}
-
-	fs = *++argv;
-
-	/* get the superblock. */
-	if ((fd = open(fs, O_RDWR, 0)) < 0)
-	  {
-	    perror (fs);
-	    exit (1);
-	  }
-	if (lseek(fd, (off_t)(SBLOCK * DEV_BSIZE), SEEK_SET) < 0)
-	  {
-	    perror (fs);
-	    exit (1);
-	  }
-	if (read(fd, sblock, sizeof(sblock)) != sizeof(sblock)) {
-		(void)fprintf(stderr,
-		    "stati: %s: can't read the superblock.\n", fs);
-		exit(1);
-	}
-
-	sbp = (struct fs *)sblock;
-	if (sbp->fs_magic != FS_MAGIC) {
-		(void)fprintf(stderr,
-		    "stati: %s: superblock magic number 0x%lux, not 0x%x.\n",
-		    fs, sbp->fs_magic, FS_MAGIC);
-		exit(1);
-	}
-	bsize = sbp->fs_bsize;
-
-	/* remaining arguments are inode numbers. */
-	while (*++argv) {
-		int i;
-
-		/* get the inode number. */
-		if ((inonum = atoi(*argv)) <= 0) {
-			(void)fprintf(stderr,
-			    "stati: %s is not a valid inode number.\n", *argv);
-			exit(1);
-		}
-
-		/* read in the appropriate block. */
-		offset = ino_to_fsba(sbp, inonum);	/* inode to fs blk */
-		offset = fsbtodb(sbp, offset);		/* fs blk disk blk */
-		offset *= DEV_BSIZE;			/* disk blk to bytes */
-
-		/* seek and read the block */
-		if (lseek(fd, offset, SEEK_SET) < 0)
-		  {
-		    perror (fs);
-		    exit (1);
-		  }
-		if (read(fd, ibuf, bsize) != bsize)
-		  {
-		    perror (fs);
-		    exit (1);
-		  }
-
-		/* get the inode within the block. */
-		ip = &ibuf[ino_to_fsbo(sbp, inonum)];
-
-		if (argc > 3)
-		  printf ("inode:  %d\n", inonum);
-
-		printf ("mode:   %s\n", mode_rep (ip->di_model));
-		printf ("nlink:  %d\n", ip->di_nlink);
-		printf ("size:   %qd\n", ip->di_size);
-		printf ("atime:  %s\n", timespec_rep (&ip->di_atime));
-		printf ("mtime:  %s\n", timespec_rep (&ip->di_mtime));
-		printf ("ctime:  %s\n", timespec_rep (&ip->di_ctime));
-		printf ("flags:  %#lx\n", ip->di_flags);
-		printf ("blocks: %ld\n", ip->di_blocks);
-		printf ("gener:  %ld\n", ip->di_gen);
-		printf ("uid:    %s\n", uid_rep (ip->di_uid));
-		printf ("gid:    %s\n", gid_rep (ip->di_gid));
-		printf ("dblks:  ");
-		for (i = 0; i < NDADDR; i++)
-		  printf ("%s%ld", (i == 0 ? "" : ", "), ip->di_db[i]);
-		putchar ('\n');
-		printf ("iblks:  ");
-		for (i = 0; i < NIADDR; i++)
-		  printf ("%s%ld", (i == 0 ? "" : ", "), ip->di_ib[i]);
-		putchar ('\n');
-		printf ("trans:  %ld\n", ip->di_trans);
-
-		if (argv[1])
-		  putchar ('\n');
-	}
-	(void)close(fd);
-	exit(0);
-}