 @@ -1,905 +1,907 @@
-/*	$NetBSD: newfs.c,v 1.112 2014/10/25 16:47:23 mlelstv Exp $	*/
+/*	$NetBSD: newfs.c,v 1.113 2015/07/25 10:37:22 mlelstv Exp $	*/
 /*
  * 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. 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.
  */
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
  * All rights reserved.
+ *
  * This software was developed for the FreeBSD Project by Marshall
  * Kirk McKusick and Network Associates Laboratories, the Security
  * Research Division of Network Associates, Inc. under DARPA/SPAWAR
  * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
  * research program
+ *
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: newfs.c,v 1.112 2014/10/25 16:47:23 mlelstv Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.113 2015/07/25 10:37:22 mlelstv Exp $");
 #endif
 #endif /* not lint */
 /*
  * newfs: friendly front end to mkfs
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/quota2.h>
 #include <ufs/ffs/fs.h>
 #include <ctype.h>
 #include <disktab.h>
 #include <err.h>
 #include <errno.h>
 #include <grp.h>
 #include <limits.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <util.h>
 #include <mntopts.h>
 #ifdef MFS
 #include <mountprog.h>
 #endif
 #include "dkcksum.h"
 #include "extern.h"
 #include "partutil.h"
 struct mntopt mopts[] = {
 	MOPT_STDOPTS,
 	MOPT_ASYNC,
 	MOPT_UPDATE,
 	MOPT_GETARGS,
 	MOPT_NOATIME,
 	{ .m_option = NULL },
 };
 static gid_t mfs_group(const char *);
 static uid_t mfs_user(const char *);
 static int64_t strsuftoi64(const char *, const char *, int64_t, int64_t, int *);
 static void usage(void) __dead;
 #define	COMPAT			/* allow non-labeled disks */
 #ifdef COMPAT
 const char lmsg[] = "%s: can't read disk label; disk type must be specified";
 #else
 const char lmsg[] = "%s: can't read disk label";
 #endif
 /*
  * 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
  */
 /*
  * For file systems smaller than SMALL_FSSIZE we use the S_DFL_* defaults,
  * otherwise if less than MEDIUM_FSSIZE use M_DFL_*,
  * otherwise if less than LARGE_FSSIZE use L_DFL_*,
  * otherwise use LL_DFL_* especially for modern AFT disks.
  */
 #define	SMALL_FSSIZE	(20*1024*2)
 #define	S_DFL_FRAGSIZE	512
 #define	MEDIUM_FSSIZE	(1000*1024*2)
 #define	M_DFL_FRAGSIZE	1024
 #define	LARGE_FSSIZE	(128*1024*1024*2)
 #define	L_DFL_FRAGSIZE	2048
 #define	LL_DFL_FRAGSIZE	4096
 #define	DFL_FRAG_BLK	8
 /* Apple requires the fragment size to be at least APPLEUFS_DIRBLKSIZ
  * but the block size cannot be larger than Darwin's PAGE_SIZE.  See
  * the mount check in Darwin's ffs_mountfs for an explanation.
  */
 #define APPLEUFS_DFL_FRAGSIZE APPLEUFS_DIRBLKSIZ /* 1024 */
 #define APPLEUFS_DFL_BLKSIZE 4096 /* default Darwin PAGE_SIZE */
 /*
  * Default sector size.
  */
 #define	DFL_SECSIZE	512
 /*
  * Default file system size for "mount_mfs swap /dir" case.
  */
 #define	DFL_FSSIZE	(8 * 1024 * 1024)
 /*
  * 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_UFS1(bsize)	((bsize) / sizeof(int32_t))
 #define	MAXBLKPG_UFS2(bsize)	((bsize) / sizeof(int64_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
 int	mfs;			/* run as the memory based filesystem */
 int	Gflag;			/* allow garbage parameters (for testing) */
 int	Nflag;			/* run without writing file system */
 int	Oflag = 1;		/* format as an 4.3BSD file system */
 int	verbosity;		/* amount of printf() output */
 #define DEFAULT_VERBOSITY 3	/* 4 is traditional behavior */
 int64_t	fssize;			/* file system size */
 int	sectorsize;		/* bytes/sector */
 int	fsize = 0;		/* fragment size */
 int	bsize = 0;		/* block size */
 int	maxbsize = 0;		/* maximum clustering */
 int	minfree = MINFREE;	/* free space threshold */
 int	opt = DEFAULTOPT;	/* optimization preference (space or time) */
 int	density;		/* number of bytes per inode */
 int	num_inodes;		/* number of inodes (overrides density) */
 int	maxcontig = 0;		/* max contiguous blocks to allocate */
 int	maxbpg;			/* maximum blocks per file in a cyl group */
 int	avgfilesize = AVFILESIZ;/* expected average file size */
 int	avgfpdir = AFPDIR;	/* expected number of files per directory */
 int	mntflags = 0;		/* flags to be passed to mount */
 u_long	memleft;		/* virtual memory available */
 caddr_t	membase;		/* start address of memory based filesystem */
 int	needswap;		/* Filesystem not in native byte order */
 char	*disktype = NULL;
 int	unlabeled;
 char *appleufs_volname = 0; /* Apple UFS volume name */
 int isappleufs = 0;
 int quotas = 0;
 char	device[MAXPATHLEN];
 int
 main(int argc, char *argv[])
+{
 	struct disk_geom geo;
 	struct dkwedge_info dkw;
 	struct statvfs *mp;
 	struct stat sb;
 	int ch, fsi, fso, len, n, Fflag, Iflag, Zflag;
 	const char *s1, *special, *raw;
 	char *s2;
 	char specname[MAXPATHLEN];
 	char rawname[MAXPATHLEN];
 	const char *opstring;
 	int byte_sized = 0;
 #ifdef MFS
 	struct mfs_args args;
 	char mountfromname[100];
 	char mounttoname[MAXPATHLEN];
 	pid_t pid, res;
 	struct statvfs sf;
 	int status;
 #endif
 	mode_t mfsmode = 01777;	/* default mode for a /tmp-type directory */
 	uid_t mfsuid = 0;	/* user root */
 	gid_t mfsgid = 0;	/* group wheel */
 	mntoptparse_t mo;
 	fsi = fso = -1;
 	Fflag = Iflag = Zflag = 0;
 	verbosity = -1;
 	if (strstr(getprogname(), "mfs")) {
 		mfs = 1;
 	} else {
 		/* Undocumented, for ease of testing */
 		if (argv[1] != NULL && !strcmp(argv[1], "-mfs")) {
 			argv++;
 			argc--;
 			mfs = 1;
+		}
+	}
 	opstring = mfs ?
 	    "NT:V:a:b:d:e:f:g:h:i:m:n:o:p:q:s:u:" :
 	    "B:FGINO:S:T:V:Za:b:d:e:f:g:h:i:l:m:n:o:q:r:s:v:";
 	while ((ch = getopt(argc, argv, opstring)) != -1)
 		switch (ch) {
 		case 'B':
 			if (strcmp(optarg, "be") == 0) {
 #if BYTE_ORDER == LITTLE_ENDIAN
 				needswap = 1;
 #endif
 			} else if (strcmp(optarg, "le") == 0) {
 #if BYTE_ORDER == BIG_ENDIAN
 				needswap = 1;
 #endif
 			} else
 				usage();
 			break;
 		case 'F':
 			Fflag = 1;
 			break;
 		case 'G':
 			fprintf(stderr, "WARNING: -G may create file systems "
 			    "which cause kernel panics\n");
 			Gflag = 1;
 			break;
 		case 'I':
 			Iflag = 1;
 			break;
 		case 'N':
 			Nflag = 1;
 			if (verbosity == -1)
 				verbosity = DEFAULT_VERBOSITY;
 			break;
 		case 'O':
 			Oflag = strsuftoi64("format", optarg, 0, 2, NULL);
 			break;
 		case 'S':
 			/* XXX: non-512 byte sectors almost certainly don't work. */
 			sectorsize = strsuftoi64("sector size",
 			    optarg, 512, 65536, NULL);
 			if (sectorsize & (sectorsize - 1))
 				errx(1, "sector size `%s' is not a power of 2.",
 				    optarg);
 			break;
 #ifdef COMPAT
 		case 'T':
 			disktype = optarg;
 			break;
 #endif
 		case 'V':
 			verbosity = strsuftoi64("verbose", optarg, 0, 4, NULL);
 			break;
 		case 'Z':
 			Zflag = 1;
 			break;
 		case 'a':
 			maxcontig = strsuftoi64("maximum contiguous blocks",
 			    optarg, 1, INT_MAX, NULL);
 			break;
 		case 'b':
 			bsize = strsuftoi64("block size",
 			    optarg, MINBSIZE, MAXBSIZE, NULL);
 			break;
 		case 'd':
 			maxbsize = strsuftoi64("maximum extent size",
 			    optarg, 0, INT_MAX, NULL);
 			break;
 		case 'e':
 			maxbpg = strsuftoi64(
 			    "blocks per file in a cylinder group",
 			    optarg, 1, INT_MAX, NULL);
 			break;
 		case 'f':
 			fsize = strsuftoi64("fragment size",
 			    optarg, 1, MAXBSIZE, NULL);
 			break;
 		case 'g':
 			if (mfs)
 				mfsgid = mfs_group(optarg);
 			else {
 				avgfilesize = strsuftoi64("average file size",
 				    optarg, 1, INT_MAX, NULL);
+			}
 			break;
 		case 'h':
 			avgfpdir = strsuftoi64("expected files per directory",
 			    optarg, 1, INT_MAX, NULL);
 			break;
 		case 'i':
 			density = strsuftoi64("bytes per inode",
 			    optarg, 1, INT_MAX, NULL);
 			break;
 		case 'm':
 			minfree = strsuftoi64("free space %",
 			    optarg, 0, 99, NULL);
 			break;
 		case 'n':
 			num_inodes = strsuftoi64("number of inodes",
 			    optarg, 1, INT_MAX, NULL);
 			break;
 		case 'o':
 			if (mfs) {
 				mo = getmntopts(optarg, mopts, &mntflags, 0);
 				if (mo == NULL)
 					err(1, "getmntopts");
 				freemntopts(mo);
 			} else {
 				if (strcmp(optarg, "space") == 0)
 					opt = FS_OPTSPACE;
 				else if (strcmp(optarg, "time") == 0)
 					opt = FS_OPTTIME;
 				else
 				    errx(1, "%s %s",
 					"unknown optimization preference: ",
 					"use `space' or `time'.");
+			}
 			break;
 		case 'q':
 			if      (strcmp(optarg, "user") == 0)
 				quotas |= FS_Q2_DO_TYPE(USRQUOTA);
 			else if (strcmp(optarg, "group") == 0)
 				quotas |= FS_Q2_DO_TYPE(GRPQUOTA);
 			else
 				errx(1, "invalid quota type %s", optarg);
 			break;
 		case 'p':
 			/* mfs only */
 			if ((mfsmode = strtol(optarg, NULL, 8)) <= 0)
 				errx(1, "bad mode `%s'", optarg);
 			break;
 		case 's':
 			fssize = strsuftoi64("file system size",
 			    optarg, INT64_MIN, INT64_MAX, &byte_sized);
 			break;
 		case 'u':
 			/* mfs only */
 			mfsuid = mfs_user(optarg);
 			break;
 		case 'v':
 			appleufs_volname = optarg;
 			if (strchr(appleufs_volname, ':') || strchr(appleufs_volname, '/'))
 				errx(1,"Apple UFS volume name cannot contain ':' or '/'");
 			if (appleufs_volname[0] == '\0')
 				errx(1,"Apple UFS volume name cannot be zero length");
 			isappleufs = 1;
 			break;
 		case '?':
 		default:
 			usage();
+		}
 	argc -= optind;
 	argv += optind;
 	if (Oflag < 1 && quotas != 0)
 		errx(1, "in-filesystem quota is incompatible with -O0");
 	if (verbosity == -1)
 		/* Default to not showing CG info if mfs */
 		verbosity = mfs ? 0 : DEFAULT_VERBOSITY;
 #ifdef MFS
 	/* This is enough to get through the correct kernel code paths */
 	memset(&args, 0, sizeof args);
 	args.fspec = mountfromname;
 	if (mntflags & (MNT_GETARGS | MNT_UPDATE)) {
 		if ((mntflags & MNT_GETARGS) == 0)
 			mntflags |= MNT_ASYNC;
 		if (mount(MOUNT_MFS, argv[1], mntflags,
 		    &args, sizeof args) == -1)
 			err(1, "mount `%s' failed", argv[1]);
 		if (mntflags & MNT_GETARGS)
 			printf("base=%p, size=%ld\n", args.base, args.size);
 		exit(0);
+	}
 #endif
 	if (argc != 2 && (mfs || argc != 1))
 		usage();
 	memset(&sb, 0, sizeof sb);
 	memset(&dkw, 0, sizeof dkw);
 	special = argv[0];
 	if (Fflag || mfs) {
 		/*
 		 * It's a file system image or an MFS,
 		 * no label, use fixed default for sectorsize.
 		 */
 		if (sectorsize == 0)
 			sectorsize = DFL_SECSIZE;
 		if (mfs) {
 			/*
 			 * Default filesystem size to that of supplied device,
 			 * and fall back to 8M
 			 */
 			if (fssize == 0)
 				if (stat(special, &sb) == -1)
 					fssize = DFL_FSSIZE / sectorsize;
 		} else {
 			/* creating image in a regular file */
 			int fl;
 			if (Nflag)
 				fl = O_RDONLY;
 			else {
 				if (fssize > 0)
 					fl = O_RDWR | O_CREAT;
 				else
 					fl = O_RDWR;
+			}
 			fsi = open(special, fl, 0777);
 			if (fsi == -1)
 				err(1, "can't open file %s", special);
 			if (fstat(fsi, &sb) == -1)
 				err(1, "can't fstat opened %s", special);
 			if (!Nflag)
 				fso = fsi;
+		}
 	} else {	/* !Fflag && !mfs */
-		special = getfsspecname(specname, sizeof(specname), special);
+		raw = getfsspecname(specname, sizeof(specname), special);
-		raw = getdiskrawname(rawname, sizeof(rawname), special);
+		if (raw == NULL)
-		if (raw != NULL)
+			err(1, "%s: %s", special, specname);
 		special = getdiskrawname(rawname, sizeof(rawname), raw);
 		if (special == NULL)
 			special = raw;
 		fsi = opendisk(special, O_RDONLY, device, sizeof(device), 0);
 		special = device;
 		if (fsi < 0 || fstat(fsi, &sb) == -1)
 			err(1, "%s: open for read", special);
 		if (S_ISBLK(sb.st_mode)) {
 			errx(1, "%s is a block device. use raw device",
 			    special);
+		}
 		if (!Nflag) {
 			fso = open(special, O_WRONLY, 0);
 			if (fso < 0)
 				err(1, "%s: open for write", special);
 			/* Bail if target special is mounted */
 			n = getmntinfo(&mp, MNT_NOWAIT);
 			if (n == 0)
 				err(1, "%s: getmntinfo", special);
 			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)
 					errx(1, "%s is mounted on %s",
 					    special, mp->f_mntonname);
 				++mp;
+			}
+		}
 #ifdef COMPAT
 		if (disktype == NULL)
 			disktype = argv[1];
 #endif
 		if (getdiskinfo(special, fsi, disktype, &geo, &dkw) == -1)
 			errx(1, lmsg, special);
 		unlabeled = disktype != NULL;
 		if (sectorsize == 0) {
 			sectorsize = geo.dg_secsize;
 			if (sectorsize <= 0)
 				errx(1, "no default sector size");
+		}
 		if (dkw.dkw_parent[0]) {
 			if (dkw.dkw_size == 0)
 				errx(1, "%s partition is unavailable", special);
 			if (strcmp(dkw.dkw_ptype, DKW_PTYPE_APPLEUFS) == 0)
 				isappleufs = 1;
 			if (!Iflag) {
 				static const char m[] =
 				    "%s partition type is not `%s'";
 				if (isappleufs) {
 					if (strcmp(dkw.dkw_ptype,
 					    DKW_PTYPE_APPLEUFS))
 						errx(1, m,
 						    special, "Apple UFS");
 				} else {
 					if (strcmp(dkw.dkw_ptype,
 					    DKW_PTYPE_FFS))
 						errx(1, m, special, "4.2BSD");
+				}
+			}
 		}	/* !Fflag && !mfs */
+	}
 	if (byte_sized)
 		fssize /= sectorsize;
 	if (fssize <= 0) {
 		if (sb.st_size != 0)
 			fssize += sb.st_size / sectorsize;
 		else
 			fssize += dkw.dkw_size;
 		if (fssize <= 0)
 			errx(1, "Unable to determine file system size");
+	}
 	if (dkw.dkw_parent[0] && (uint64_t)fssize > dkw.dkw_size)
 		errx(1, "size %" PRIu64 " exceeds maximum file system size on "
 		    "`%s' of %" PRIu64 " sectors",
 		    fssize, special, dkw.dkw_size);
 	/* XXXLUKEM: only ftruncate() regular files ? (dsl: or at all?) */
 	if (Fflag && fso != -1
 	    && ftruncate(fso, (off_t)fssize * sectorsize) == -1)
 		err(1, "can't ftruncate %s to %" PRId64, special, fssize);
 	if (Zflag && fso != -1) {	/* pre-zero (and de-sparce) the file */
 		char	*buf;
 		int	bufsize, i;
 		off_t	bufrem;
 		struct statvfs sfs;
 		if (fstatvfs(fso, &sfs) == -1) {
 			warn("can't fstatvfs `%s'", special);
 			bufsize = 8192;
 		} else
 			bufsize = sfs.f_iosize;
 		if ((buf = calloc(1, bufsize)) == NULL)
 			err(1, "can't malloc buffer of %d",
 			bufsize);
 		bufrem = fssize * sectorsize;
 		if (verbosity > 0)
 			printf( "Creating file system image in `%s', "
 			    "size %lld bytes, in %d byte chunks.\n",
 			    special, (long long)bufrem, bufsize);
 		while (bufrem > 0) {
 			i = write(fso, buf, MIN(bufsize, bufrem));
 			if (i == -1)
 				err(1, "writing image");
 			bufrem -= i;
+		}
 		free(buf);
+	}
 	/* Sort out fragment and block sizes */
 	if (fsize == 0) {
 		fsize = bsize / DFL_FRAG_BLK;
 		if (fsize <= 0) {
 			if (isappleufs) {
 				fsize = APPLEUFS_DFL_FRAGSIZE;
 			} else {
 				if (fssize < SMALL_FSSIZE)
 					fsize = S_DFL_FRAGSIZE;
 				else if (fssize < MEDIUM_FSSIZE)
 					fsize = M_DFL_FRAGSIZE;
 				else if (fssize < LARGE_FSSIZE)
 					fsize = L_DFL_FRAGSIZE;
 				else
 					fsize = LL_DFL_FRAGSIZE;
 				if (fsize < sectorsize)
 					fsize = sectorsize;
+			}
+		}
+	}
 	if (bsize <= 0) {
 		if (isappleufs)
 			bsize = APPLEUFS_DFL_BLKSIZE;
 		else
 			bsize = DFL_FRAG_BLK * fsize;
+	}
 	if (isappleufs && (fsize < APPLEUFS_DFL_FRAGSIZE)) {
 		warnx("Warning: chosen fsize of %d is less than Apple UFS minimum of %d",
 			fsize, APPLEUFS_DFL_FRAGSIZE);
+	}
 	if (isappleufs && (bsize > APPLEUFS_DFL_BLKSIZE)) {
 		warnx("Warning: chosen bsize of %d is greater than Apple UFS maximum of %d",
 			bsize, APPLEUFS_DFL_BLKSIZE);
+	}
 	/*
 	 * 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);
 	if (density == 0)
 		density = NFPI * fsize;
 	if (minfree < MINFREE && opt != FS_OPTSPACE) {
 		warnx("%s %s %d%%", "Warning: changing optimization to space",
 		    "because minfree is less than", MINFREE);
 		opt = FS_OPTSPACE;
+	}
 	if (maxbpg == 0) {
 		if (Oflag <= 1)
 			maxbpg = MAXBLKPG_UFS1(bsize);
 		else
 			maxbpg = MAXBLKPG_UFS2(bsize);
+	}
 	mkfs(special, fsi, fso, mfsmode, mfsuid, mfsgid);
 	if (fsi != -1 && fsi != fso)
 		close(fsi);
 	if (fso != -1)
 		close(fso);
 #ifdef MFS
 	if (mfs) {
 		pathadj(argv[1], mounttoname);
 		switch (pid = fork()) {
 		case -1:
 			perror("mfs");
 			exit(10);
 		case 0:
 			(void)snprintf(mountfromname, sizeof(mountfromname),
 			    "mfs:%d", getpid());
 			break;
 		default:
 			(void)snprintf(mountfromname, sizeof(mountfromname),
 			    "mfs:%d", pid);
 			for (;;) {
 				/*
 				 * spin until the mount succeeds
 				 * or the child exits
 				 */
 				usleep(1);
 				/*
 				 * XXX Here is a race condition: another process
 				 * can mount a filesystem which hides our
 				 * ramdisk before we see the success.
 				 */
 				if (statvfs(mounttoname, &sf) < 0)
 					err(88, "statvfs %s", mounttoname);
 				if (!strcmp(sf.f_mntfromname, mountfromname) &&
 				    !strncmp(sf.f_mntonname, mounttoname,
 					     MNAMELEN) &&
 				    !strcmp(sf.f_fstypename, "mfs"))
 					exit(0);
 				res = waitpid(pid, &status, WNOHANG);
 				if (res == -1)
 					err(11, "waitpid");
 				if (res != pid)
 					continue;
 				if (WIFEXITED(status)) {
 					if (WEXITSTATUS(status) == 0)
 						exit(0);
 					errx(1, "%s: mount: %s", mounttoname,
 					     strerror(WEXITSTATUS(status)));
 				} else
 					errx(11, "abnormal termination");
+			}
 			/* NOTREACHED */
+		}
 		(void) setsid();
 		(void) close(0);
 		(void) close(1);
 		(void) close(2);
 		(void) chdir("/");
 		args.base = membase;
 		args.size = fssize * sectorsize;
 		if (mount(MOUNT_MFS, mounttoname, mntflags | MNT_ASYNC,
 		    &args, sizeof args) == -1)
 			exit(errno); /* parent prints message */
+	}
 #endif
 	exit(0);
+}
 static gid_t
 mfs_group(const char *gname)
+{
 	struct group *gp;
 	if (!(gp = getgrnam(gname)) && !isdigit((unsigned char)*gname))
 		errx(1, "unknown gname %s", gname);
 	return gp ? gp->gr_gid : (gid_t)atoi(gname);
+}
 static uid_t
 mfs_user(const char *uname)
+{
 	struct passwd *pp;
 	if (!(pp = getpwnam(uname)) && !isdigit((unsigned char)*uname))
 		errx(1, "unknown user %s", uname);
 	return pp ? pp->pw_uid : (uid_t)atoi(uname);
+}
 static int64_t
 strsuftoi64(const char *desc, const char *arg, int64_t min, int64_t max, int *num_suffix)
+{
 	int64_t result, r1;
 	int shift = 0;
 	char	*ep;
 	errno = 0;
 	r1 = strtoll(arg, &ep, 10);
 	if (ep[0] != '\0' && ep[1] != '\0')
 		errx(1, "%s `%s' is not a valid number.", desc, arg);
 	switch (ep[0]) {
 	case '\0':
 	case 's': case 'S':
 		if (num_suffix != NULL)
 			*num_suffix = 0;
 		break;
 	case 't': case 'T':
 		shift += 10;
 		/* FALLTHROUGH */
 	case 'g': case 'G':
 		shift += 10;
 		/* FALLTHROUGH */
 	case 'm': case 'M':
 		shift += 10;
 		/* FALLTHROUGH */
 	case 'k': case 'K':
 		shift += 10;
 		/* FALLTHROUGH */
 	case 'b': case 'B':
 		if (num_suffix != NULL)
 			*num_suffix = 1;
 		break;
 	default:
 		errx(1, "`%s' is not a valid suffix for %s.", ep, desc);
+	}
 	result = r1 << shift;
 	if (errno == ERANGE || result >> shift != r1)
 		errx(1, "%s `%s' is too large to convert.", desc, arg);
 	if (result < min) {
 		if (Gflag) {
 			warnx("%s `%s' (%" PRId64 ") is less than the "
 			    "minimum (%" PRId64 ").", desc, arg, result, min);
 		} else {
 			errx(1, "%s `%s' (%" PRId64 ") is less than the "
 			    "minimum (%" PRId64 ").", desc, arg, result, min);
+		}
+	}
 	if (result > max) {
 		if (Gflag) {
 			warnx("%s `%s' (%" PRId64 ") is greater than the "
 			    "maximum (%" PRId64 ").", desc, arg, result, max);
 		} else {
 			errx(1, "%s `%s' (%" PRId64 ") is greater than the "
 			    "maximum (%" PRId64 ").", desc, arg, result, max);
+		}
+	}
 	return result;
+}
 #define	NEWFS		1
 #define	MFS_MOUNT	2
 #define	BOTH		NEWFS | MFS_MOUNT
 struct help_strings {
 	int flags;
 	const char *str;
 } const help_strings[] = {
 	{ NEWFS,	"-B byteorder\tbyte order (`be' or `le')" },
 	{ NEWFS,	"-F \t\tcreate file system image in regular file" },
 	{ NEWFS,	"-G \t\tmake sanity calculations non-fatal (testing only!)" },
 	{ NEWFS,	"-I \t\tdo not check that the file system type is '4.2BSD'" },
 	{ BOTH,		"-N \t\tdo not create file system, just print out "
 			    "parameters" },
 	{ NEWFS,	"-O N\t\tfilesystem format: 0 => 4.3BSD, 1 => FFSv1, 2 => FFSv2" },
 	{ NEWFS,	"-S secsize\tsector size" },
 #ifdef COMPAT
 	{ NEWFS,	"-T disktype\tdisk type" },
 #endif
 	{ BOTH,		"-V verbose\toutput verbosity: 0 ==> none, 4 ==> max" },
 	{ NEWFS,	"-Z \t\tpre-zero the image file" },
 	{ BOTH,		"-a maxcontig\tmaximum contiguous blocks" },
 	{ BOTH,		"-b bsize\tblock size" },
 	{ BOTH,		"-d maxbsize\tmaximum extent size" },
 	{ BOTH,		"-e maxbpg\tmaximum blocks per file in a cylinder group"
 			    },
 	{ BOTH,		"-f fsize\tfrag size" },
 	{ NEWFS,	"-g avgfilesize\taverage file size" },
 	{ MFS_MOUNT,	"-g groupname\tgroup name of mount point" },
 	{ BOTH,		"-h avgfpdir\taverage files per directory" },
 	{ BOTH,		"-i density\tnumber of bytes per inode" },
 	{ BOTH,		"-m minfree\tminimum free space %%" },
 	{ BOTH,		"-n inodes\tnumber of inodes (overrides -i density)" },
 	{ BOTH,		"-o optim\toptimization preference (`space' or `time')"
 			    },
 	{ BOTH,		"-q (user|group) enable specified quota" },
 	{ MFS_MOUNT,	"-p perm\t\tpermissions (in octal)" },
 	{ BOTH,		"-s fssize\tfile system size (sectors)" },
 	{ MFS_MOUNT,	"-u username\tuser name of mount point" },
 	{ NEWFS,	"-v volname\tApple UFS volume name" },
 	{ 0, NULL }
 };
 static void
 usage(void)
+{
 	int match;
 	const struct help_strings *hs;
 	if (mfs) {
 		fprintf(stderr,
 		    "usage: %s [ fsoptions ] special-device mount-point\n",
 			getprogname());
 	} else
 		fprintf(stderr,
 		    "usage: %s [ fsoptions ] special-device%s\n",
 		    getprogname(),
 #ifdef COMPAT
 		    " [disk-type]");
 #else
 		    "");
 #endif
 	fprintf(stderr, "where fsoptions are:\n");
 	match = mfs ? MFS_MOUNT : NEWFS;
 	for (hs = help_strings; hs->flags != 0; hs++)
 		if (hs->flags & match)
 			fprintf(stderr, "\t%s\n", hs->str);
 	exit(1);
+}

 @@ -1,587 +1,589 @@
-/*	$NetBSD: installboot.c,v 1.38 2015/06/05 07:44:39 mlelstv Exp $	*/
+/*	$NetBSD: installboot.c,v 1.39 2015/07/25 10:37:22 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn of Wasabi Systems.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: installboot.c,v 1.38 2015/06/05 07:44:39 mlelstv Exp $");
+__RCSID("$NetBSD: installboot.c,v 1.39 2015/07/25 10:37:22 mlelstv Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <assert.h>
 #include <err.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 #if !HAVE_NBTOOL_CONFIG_H
 #include <util.h>
 #endif
 #include "installboot.h"
 static	void	getmachine(ib_params *, const char *, const char *);
 static	void	getfstype(ib_params *, const char *, const char *);
 static	void	parseoptions(ib_params *, const char *);
 __dead static	void	usage(void);
 static	void	options_usage(void);
 static	void	machine_usage(void);
 static	void	fstype_usage(void);
 static	ib_params	installboot_params;
 #define OFFSET(field)    offsetof(ib_params, field)
 const struct option {
 	const char	*name;		/* Name of option */
 	ib_flags	flag;		/* Corresponding IB_xxx flag */
 	enum {				/* Type of option value... */
 		OPT_BOOL,		/* no value */
 		OPT_INT,		/* numeric value */
 		OPT_WORD,		/* space/tab/, terminated */
 		OPT_STRING		/* null terminated */
 	}		type;
 	int		offset;		/* of field in ib_params */
 } options[] = {
 	{ "alphasum",	IB_ALPHASUM,	OPT_BOOL,	0 },
 	{ "append",	IB_APPEND,	OPT_BOOL,	0 },
 	{ "command",	IB_COMMAND,	OPT_STRING,	OFFSET(command) },
 	{ "console",	IB_CONSOLE,	OPT_WORD,	OFFSET(console) },
 	{ "ioaddr",	IB_CONSADDR,	OPT_INT,	OFFSET(consaddr) },
 	{ "keymap",	IB_KEYMAP,	OPT_WORD,	OFFSET(keymap) },
 	{ "password",	IB_PASSWORD,	OPT_WORD,	OFFSET(password) },
 	{ "resetvideo",	IB_RESETVIDEO,	OPT_BOOL,	0 },
 	{ "speed",	IB_CONSPEED,	OPT_INT,	OFFSET(conspeed) },
 	{ "sunsum",	IB_SUNSUM,	OPT_BOOL,	0 },
 	{ "timeout",	IB_TIMEOUT,	OPT_INT,	OFFSET(timeout) },
 	{ "modules",	IB_MODULES,	OPT_BOOL,	0 },
 	{ "bootconf",	IB_BOOTCONF,	OPT_BOOL,	0 },
 	{ .name = NULL },
 };
 #undef OFFSET
 #define OPTION(params, type, opt) (*(type *)((char *)(params) + (opt)->offset))
 #define DFL_SECSIZE	512	/* Don't use DEV_BSIZE. It's host's value. */
 int
 main(int argc, char *argv[])
+{
 	struct utsname	utsname;
 	ib_params	*params;
 	unsigned long	lval;
 	int		ch, rv, mode;
 	char 		*p;
 	const char	*op;
 	ib_flags	unsupported_flags;
 #if !HAVE_NBTOOL_CONFIG_H
 	char		specname[MAXPATHLEN];
 	char		rawname[MAXPATHLEN];
 	const char	*special, *raw;
 #endif
 	setprogname(argv[0]);
 	params = &installboot_params;
 	memset(params, 0, sizeof(*params));
 	params->fsfd = -1;
 	params->s1fd = -1;
 	if ((p = getenv("MACHINE")) != NULL)
 		getmachine(params, p, "$MACHINE");
 	while ((ch = getopt(argc, argv, "b:B:cefm:no:t:v")) != -1) {
 		switch (ch) {
 		case 'b':
 		case 'B':
 			if (*optarg == '\0')
 				goto badblock;
 			lval = strtoul(optarg, &p, 0);
 			if (lval > UINT32_MAX || *p != '\0') {
  badblock:
 				errx(1, "Invalid block number `%s'", optarg);
+			}
 			if (ch == 'b') {
 				params->s1start = (uint32_t)lval;
 				params->flags |= IB_STAGE1START;
 			} else {
 				params->s2start = (uint32_t)lval;
 				params->flags |= IB_STAGE2START;
+			}
 			break;
 		case 'c':
 			params->flags |= IB_CLEAR;
 			break;
 		case 'e':
 			params->flags |= IB_EDIT;
 			break;
 		case 'f':
 			params->flags |= IB_FORCE;
 			break;
 		case 'm':
 			getmachine(params, optarg, "-m");
 			break;
 		case 'n':
 			params->flags |= IB_NOWRITE;
 			break;
 		case 'o':
 			parseoptions(params, optarg);
 			break;
 		case 't':
 			getfstype(params, optarg, "-t");
 			break;
 		case 'v':
 			params->flags |= IB_VERBOSE;
 			break;
 		case '?':
 		default:
 			usage();
 			/* NOTREACHED */
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (params->flags & IB_CLEAR && params->flags & IB_EDIT)
 		usage();
 	if (argc < 1 || argc + 2 * !!(params->flags & (IB_CLEAR | IB_EDIT)) > 3)
 		usage();
 	/* set missing defaults */
 	if (params->machine == NULL) {
 		if (uname(&utsname) == -1)
 			err(1, "Determine uname");
 		getmachine(params, utsname.machine, "uname()");
+	}
 	/* Check that options are supported by this system */
 	unsupported_flags = params->flags & ~params->machine->valid_flags;
 	unsupported_flags &= ~(IB_VERBOSE | IB_NOWRITE | IB_CLEAR | IB_EDIT
 				| IB_FORCE);
 	if (unsupported_flags != 0) {
 		int ndx;
 		for (ndx = 0; options[ndx].name != NULL; ndx++) {
 			if (unsupported_flags & options[ndx].flag) {
 				unsupported_flags &= ~options[ndx].flag;
 				warnx("`-o %s' is not supported for %s",
 				    options[ndx].name, params->machine->name);
+			}
+		}
 		if (unsupported_flags & IB_STAGE1START)
 			warnx("`-b bno' is not supported for %s",
 			    params->machine->name);
 		if (unsupported_flags & IB_STAGE2START)
 			warnx("`-B bno' is not supported for %s",
 			    params->machine->name);
 		unsupported_flags &= ~(IB_STAGE1START | IB_STAGE2START);
 		if (unsupported_flags != 0)
 			warnx("Unknown unsupported flag %#x (coding error!)",
 			    unsupported_flags);
 		exit(1);
+	}
 	/* and some illegal combinations */
 	if (params->flags & IB_STAGE1START && params->flags & IB_APPEND) {
 		warnx("Can't use `-b bno' with `-o append'");
 		exit(1);
+	}
 	if (params->flags & IB_CLEAR &&
 	    params->flags & (IB_STAGE1START | IB_STAGE2START | IB_APPEND)) {
 		warnx("Can't use `-b bno', `-B bno' or `-o append' with `-c'");
 		exit(1);
+	}
 	if (argc >= 3) {
 		params->stage2 = argv[2];
+	}
 #if !HAVE_NBTOOL_CONFIG_H
 	special = getfsspecname(specname, sizeof(specname), argv[0]);
 	if (special == NULL)
 		err(1, "%s: %s", argv[0], specname);
 	raw = getdiskrawname(rawname, sizeof(rawname), special);
 	if (raw != NULL)
 		special = raw;
 	params->filesystem = special;
 #else
 	params->filesystem = argv[0];
 #endif
 	if (params->flags & IB_NOWRITE) {
 		op = "only";
 		mode = O_RDONLY;
 	} else {
 		op = "write";
 		mode = O_RDWR;
+	}
 	/* XXX should be specified via option */
 	params->sectorsize = DFL_SECSIZE;
 	if ((params->fsfd = open(params->filesystem, mode, 0600)) == -1)
 		err(1, "Opening file system `%s' read-%s",
 		    params->filesystem, op);
 	if (fstat(params->fsfd, &params->fsstat) == -1)
 		err(1, "Examining file system `%s'", params->filesystem);
 	if (params->fstype != NULL) {
 		if (! params->fstype->match(params))
 			errx(1, "File system `%s' is not of type %s",
 			    params->filesystem, params->fstype->name);
 	} else {
 		if (params->stage2 != NULL) {
 			params->fstype = &fstypes[0];
 			while (params->fstype->name != NULL &&
 				    !params->fstype->match(params))
 				params->fstype++;
 			if (params->fstype->name == NULL)
 				errx(1, "File system `%s' is of an unknown type",
 				    params->filesystem);
+		}
+	}
 	if (argc >= 2) {
 		if ((params->s1fd = open(argv[1], O_RDONLY, 0600)) == -1)
 			err(1, "Opening primary bootstrap `%s'", argv[1]);
 		if (fstat(params->s1fd, &params->s1stat) == -1)
 			err(1, "Examining primary bootstrap `%s'", argv[1]);
 		if (!S_ISREG(params->s1stat.st_mode))
 			errx(1, "`%s' must be a regular file", argv[1]);
 		params->stage1 = argv[1];
+	}
 	assert(params->machine != NULL);
 	if (params->flags & IB_VERBOSE) {
 		printf("File system:         %s\n", params->filesystem);
 		if (params->fstype)
 			printf("File system type:    %s (blocksize %u, "
 				"needswap %d)\n",
 			    params->fstype->name, params->fstype->blocksize,
 			    params->fstype->needswap);
 		if (!(params->flags & IB_EDIT))
 			printf("Primary bootstrap:   %s\n",
 			    (params->flags & IB_CLEAR) ? "(to be cleared)"
 			    : params->stage1 ? params->stage1 : "(none)" );
 		if (params->stage2 != NULL)
 			printf("Secondary bootstrap: %s\n", params->stage2);
+	}
 	if (params->flags & IB_EDIT) {
 		op = "Edit";
 		rv = params->machine->editboot(params);
 	} else if (params->flags & IB_CLEAR) {
 		op = "Clear";
 		rv = params->machine->clearboot(params);
 	} else {
 		if (argc < 2)
 			errx(EXIT_FAILURE, "Please specify the primary "
 			    "bootstrap file");
 		op = "Set";
 		rv = params->machine->setboot(params);
+	}
 	if (rv == 0)
 		errx(1, "%s bootstrap operation failed", op);
 	if (S_ISREG(params->fsstat.st_mode)) {
 		if (fsync(params->fsfd) == -1)
 			err(1, "Synchronising file system `%s'",
 			    params->filesystem);
 	} else {
 		/* Sync filesystems (to clean in-memory superblock?) */
 		sync();
+	}
 	if (close(params->fsfd) == -1)
 		err(1, "Closing file system `%s'", params->filesystem);
 	if (argc == 2)
 		if (close(params->s1fd) == -1)
 			err(1, "Closing primary bootstrap `%s'",
 			    params->stage1);
 	exit(0);
 	/* NOTREACHED */
+}
 static void
 parseoptions(ib_params *params, const char *option)
+{
 	char *cp;
 	const struct option *opt;
 	int len;
 	unsigned long val;
 	assert(params != NULL);
 	assert(option != NULL);
 	for (;; option += len) {
 		option += strspn(option, ", \t");
 		if (*option == 0)
 			return;
 		len = strcspn(option, "=,");
 		for (opt = options; opt->name != NULL; opt++) {
 			if (memcmp(option, opt->name, len) == 0
 			    && opt->name[len] == 0)
 				break;
+		}
 		if (opt->name == NULL) {
 			len = strcspn(option, ",");
 			warnx("Unknown option `-o %.*s'", len, option);
 			break;
+		}
 		params->flags |= opt->flag;
 		if (opt->type == OPT_BOOL) {
 			if (option[len] != '=')
 				continue;
 			warnx("Option `%s' must not have a value", opt->name);
 			break;
+		}
 		if (option[len] != '=') {
 			warnx("Option `%s' must have a value", opt->name);
 			break;
+		}
 		option += len + 1;
 		len = strcspn(option, ",");
 		switch (opt->type) {
 		case OPT_STRING:
 			len = strlen(option);
 			/* FALLTHROUGH */
 		case OPT_WORD:
 			cp = strdup(option);
 			if (cp == NULL)
 				err(1, "strdup");
 			cp[len] = 0;
 			OPTION(params, char *, opt) = cp;
 			continue;
 		case OPT_INT:
 			val = strtoul(option, &cp, 0);
 			if (cp > option + len || (*cp != 0 && *cp != ','))
 				break;
 			if (val > INT_MAX)
 				break;
 			OPTION(params, int, opt) = (int)val;
 			continue;
 		default:
 			errx(1, "Internal error: option `%s' has invalid type %d",
 				opt->name, opt->type);
+		}
 		warnx("Invalid option value `%s=%.*s'", opt->name, len, option);
 		break;
+	}
 	options_usage();
 	exit(1);
+}
 static void
 options_usage(void)
+{
 	int ndx;
 	const char *pfx;
 	warnx("Valid options are:");
 	pfx = "\t";
 	for (ndx = 0; options[ndx].name != 0; ndx++) {
 		fprintf(stderr, "%s%s", pfx, options[ndx].name);
 		switch (options[ndx].type) {
 		case OPT_INT:
 			fprintf(stderr, "=number");
 			break;
 		case OPT_WORD:
 			fprintf(stderr, "=word");
 			break;
 		case OPT_STRING:
 			fprintf(stderr, "=string");
 			break;
 		default:
 			break;
+		}
 		if ((ndx % 5) == 4)
 			pfx = ",\n\t";
 		else
 			pfx = ", ";
+	}
 	fprintf(stderr, "\n");
+}
 int
 no_setboot(ib_params *params)
+{
 	assert(params != NULL);
 	warnx("%s: bootstrap installation is not supported",
 	    params->machine->name);
 	return (0);
+}
 int
 no_clearboot(ib_params *params)
+{
 	assert(params != NULL);
 	warnx("%s: bootstrap removal is not supported",
 	    params->machine->name);
 	return (0);
+}
 int
 no_editboot(ib_params *params)
+{
 	assert(params != NULL);
 	warnx("%s: bootstrap editing is not supported",
 	    params->machine->name);
 	return (0);
+}
 static void
 getmachine(ib_params *param, const char *mach, const char *provider)
+{
 	int	i;
 	assert(param != NULL);
 	assert(mach != NULL);
 	assert(provider != NULL);
 	for (i = 0; machines[i] != NULL; i++) {
 		if (machines[i]->name == NULL)
 			continue;
 		if (strcmp(machines[i]->name, mach) == 0) {
 			param->machine = machines[i];
 			return;
+		}
+	}
 	warnx("Invalid machine `%s' from %s", mach, provider);
 	machine_usage();
 	exit(1);
+}
 static void
 machine_usage(void)
+{
 	const char *prefix;
 	int	i;
 	int col, len;
 	const char *name;
 	int	wincol=80;
 #ifdef TIOCGWINSZ
 	struct winsize win;
 	if (ioctl(fileno(stderr), TIOCGWINSZ, &win) == 0 && win.ws_col > 0)
 		wincol = win.ws_col;
 #endif
 	warnx("Supported machines are:");
 	prefix="\t";
 	col = 8 + 3;
 	for (i = 0; machines[i] != NULL; i++) {
 		name = machines[i]->name;
 		if (name == NULL)
 			continue;
 		len = strlen(name);
 		if (col + len > wincol) {
 			prefix=",\n\t";
 			col = -2 + 8 + 3;
+		}
 		col += fprintf(stderr, "%s%s", prefix, name);
 		prefix=", ";
+	}
 	fputs("\n", stderr);
+}
 static void
 getfstype(ib_params *param, const char *fstype, const char *provider)
+{
 	int i;
 	assert(param != NULL);
 	assert(fstype != NULL);
 	assert(provider != NULL);
 	for (i = 0; fstypes[i].name != NULL; i++) {
 		if (strcmp(fstypes[i].name, fstype) == 0) {
 			param->fstype = &fstypes[i];
 			return;
+		}
+	}
 	warnx("Invalid file system type `%s' from %s", fstype, provider);
 	fstype_usage();
 	exit(1);
+}
 static void
 fstype_usage(void)
+{
 #ifndef NO_STAGE2
 	const char *prefix;
 	int	i;
 	warnx("Supported file system types are:");
 #define FSTYPES_PER_LINE	9
 	prefix="\t";
 	for (i = 0; fstypes[i].name != NULL; i++) {
 		if (i && (i % FSTYPES_PER_LINE) == 0)
 			prefix=",\n\t";
 		fprintf(stderr, "%s%s", prefix, fstypes[i].name);
 		prefix=", ";
+	}
 	fputs("\n", stderr);
 #endif
+}
 static void
 usage(void)
+{
 	const char	*prog;
 	prog = getprogname();
 	fprintf(stderr,
 "usage: %s [-fnv] [-B s2bno] [-b s1bno] [-m machine] [-o options]\n"
 "\t\t   [-t fstype] filesystem primary [secondary]\n"
 "usage: %s -c [-fnv] [-m machine] [-o options] [-t fstype] filesystem\n"
 "usage: %s -e [-fnv] [-m machine] [-o options] bootstrap\n",
 	    prog, prog, prog);
 	machine_usage();
 	fstype_usage();
 	options_usage();
 	exit(1);
+}