 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660.c,v 1.36 2013/01/23 20:46:39 christos Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.37 2013/01/23 21:32:32 christos Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * 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.
 @@ -93,27 +93,27 @@
  * 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"
 #else
 #include <sys/mount.h>
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.36 2013/01/23 20:46:39 christos Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.37 2013/01/23 21:32:32 christos Exp $");
 #endif  /* !__lint */
 #include <string.h>
 #include <ctype.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include "makefs.h"
 #include "cd9660.h"
 #include "cd9660/iso9660_rrip.h"
 #include "cd9660/cd9660_archimedes.h"
 /*
 @@ -414,27 +414,27 @@ cd9660_parse_opts(const char *option, fs
 		/* End of flag variables */
         } else if (CD9660_IS_COMMAND_ARG(var, "boot-load-segment")) {
 		if (val == NULL) {
 			warnx("Option `%s' doesn't contain a value", var);
 			rv = 0;
 		} else {
 			cd9660_eltorito_add_boot_option(var, val);
+		}
 	} else {
 		if (val == NULL) {
 			warnx("Option `%s' doesn't contain a value", var);
 			rv = 0;
 		} else
-			rv = set_option(cd9660_options, var, val);
+			rv = set_option_var(cd9660_options, var, val);
+	}
 	if (var)
 		free(var);
 	return (rv);
+}
 /*
  * Main function for cd9660_makefs
  * Builds the ISO image file
  * @param const char *image The image filename to create
  * @param const char *dir The directory that is being read
  * @param struct fsnode *root The root node of the filesystem tree

 @@ -1,14 +1,14 @@
-/*	$NetBSD: makefs.c,v 1.36 2013/01/23 20:46:39 christos Exp $	*/
+/*	$NetBSD: makefs.c,v 1.37 2013/01/23 21:32:32 christos Exp $	*/
 /*
  * Copyright (c) 2001-2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Luke Mewburn for Wasabi Systems, 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
 @@ -31,27 +31,27 @@
  * 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(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.36 2013/01/23 20:46:39 christos Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.37 2013/01/23 21:32:32 christos Exp $");
 #endif	/* !__lint */
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdbool.h>
 #include "makefs.h"
 @@ -290,29 +290,53 @@ main(int argc, char *argv[])
+	}
 				/* build the file system */
 	TIMER_START(start);
 	fstype->make_fs(argv[0], argv[1], root, &fsoptions);
 	TIMER_RESULTS(start, "make_fs");
 	free_fsnodes(root);
 	exit(0);
 	/* NOTREACHED */
+}
 int
 set_option(const option_t *options, const char *option)
+{
 	char *var, *val;
 	int retval;
 	assert(option != NULL);
 	if ((var = strdup(option)) == NULL) {
 		err(EXIT_FAILURE, "Allocating memory for copy of option string");
+	}
 	retval = 0;
 	if ((val = strchr(var, '=')) == NULL) {
 		warnx("Option `%s' doesn't contain a value", var);
 		goto out;
+	}
 	*val++ = '\0';
 	retval = set_option_var(options, var, val);
 out:
 	free(var);
 	return retval;
+}
 int
-set_option(const option_t *options, const char *var, const char *val)
+set_option_var(const option_t *options, const char *var, const char *val)
+{
 	char *s;
 	size_t i;
 #define NUM(width) *(uint ## width ## _t *)options[i].value = \
     (uint ## width ## _t)strsuftoll(options[i].desc, val, \
     options[i].minimum, options[i].maximum); break
 	for (i = 0; options[i].name != NULL; i++) {
 		if (options[i].letter != var[0] || var[1] != '\0')
 			continue;
 		else if (strcmp(options[i].name, var) != 0)
 			continue;

 @@ -73,48 +73,30 @@ chfs_cleanup_opts(fsinfo_t *fsopts)
 int
 chfs_parse_opts(const char *option, fsinfo_t *fsopts)
+{
 	static const option_t chfs_options[] = {
 		{ 'p', "pagesize", &chfs_opts.pagesize,	OPT_INT32,
 , INT_MAX, "page size" },
 		{ 'e', "eraseblock", &chfs_opts.eraseblock, OPT_INT32,
 , INT_MAX, "eraseblock size" },
 		{ 'm', "mediatype", &chfs_opts.mediatype, OPT_INT32,
 , 1, "type of the media, 0 (nor) or 1 (nand)" },
 		{ .name = NULL }
 	};
 	char *var, *val;
 	int retval;
 	assert(option != NULL);
 	assert(fsopts != NULL);
-	if ((var = strdup(option)) == NULL) {
+	return set_option(chfs_options, option);
 		err(EXIT_FAILURE, "Allocating memory for copy of option string");
 	retval = 0;
 	if ((val = strchr(var, '=')) == NULL) {
 		warnx("Option `%s' doesn't contain a value", var);
 		goto leave_chfs_parse_opts;
 	*val++ = '\0';
 	retval = set_option(chfs_options, var, val);
 leave_chfs_parse_opts:
 	free(var);
 	return retval;
+}
 void
 chfs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
+{
 	struct timeval	start;
 	assert(image != NULL);
 	assert(dir != NULL);
 	assert(root != NULL);
 	assert(fsopts != NULL);
 	TIMER_START(start);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: v7fs.c,v 1.4 2013/01/23 20:46:39 christos Exp $	*/
+/*	$NetBSD: v7fs.c,v 1.5 2013/01/23 21:32:32 christos Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: v7fs.c,v 1.4 2013/01/23 20:46:39 christos Exp $");
+__RCSID("$NetBSD: v7fs.c,v 1.5 2013/01/23 21:32:32 christos Exp $");
 #endif	/* !__lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include "makefs.h"
 #include "v7fs.h"
 #include "v7fs_impl.h"
 #include "v7fs_makefs.h"
 #include "newfs_v7fs.h"
 @@ -72,27 +72,27 @@ v7fs_cleanup_opts(fsinfo_t *fsopts)
+}
 int
 v7fs_parse_opts(const char *option, fsinfo_t *fsopts)
+{
 	static option_t v7fs_options[] = {
 		{ '\0', "pdp", &v7fs_opts.pdp_endian, OPT_INT32, false, true,
 		    "PDP endian" },
 		{ '\0', "progress", &v7fs_opts.progress, OPT_INT32, false, true,
 		  "Progress bar" },
 		{ .name = NULL }
 	};
-	set_option(v7fs_options, option, "1");
+	set_option_var(v7fs_options, option, "1");
 	return 1;
+}
 void
 v7fs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
+{
 	struct v7fs_mount_device v7fs_mount;
 	int fd, endian, error = 1;
 	v7fs_newfs_verbose = debug;
 #ifndef HAVE_NBTOOL_CONFIG_H
 	if ((progress_bar_enable = v7fs_opts.progress)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs.c,v 1.50 2013/01/23 20:46:39 christos Exp $	*/
+/*	$NetBSD: ffs.c,v 1.51 2013/01/23 21:32:32 christos Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Luke Mewburn for Wasabi Systems, 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
 @@ -61,27 +61,27 @@
  * 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.
+ *
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.50 2013/01/23 20:46:39 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.51 2013/01/23 21:32:32 christos Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #if !HAVE_NBTOOL_CONFIG_H
 #include <sys/mount.h>
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 @@ -176,91 +176,83 @@ ffs_prep_opts(fsinfo_t *fsopts)
+}
 void
 ffs_cleanup_opts(fsinfo_t *fsopts)
+{
 	if (fsopts->fs_specific)
 		free(fsopts->fs_specific);
+}
 int
 ffs_parse_opts(const char *option, fsinfo_t *fsopts)
+{
 	ffs_opt_t	*ffs_opts = fsopts->fs_specific;
 	char optimization[24];
 	option_t ffs_options[] = {
 	    { '\0', "bsize", &ffs_opts->bsize, OPT_INT32,
 , INT_MAX, "block size" },
 	    { '\0', "fsize", &ffs_opts->fsize, OPT_INT32,
 , INT_MAX, "fragment size" },
 	    { '\0', "density", &ffs_opts->density, OPT_INT32,
 , INT_MAX, "bytes per inode" },
 	    { '\0', "minfree", &ffs_opts->minfree, OPT_INT32,
 , 99, "minfree" },
 	    { '\0', "maxbpf", &ffs_opts->maxbpg, OPT_INT32,
 , INT_MAX, "max blocks per file in a cg" },
 	    { '\0', "avgfilesize", &ffs_opts->avgfilesize, OPT_INT32,
 , INT_MAX, "expected average file size" },
 	    { '\0', "avgfpdir", &ffs_opts->avgfpdir, OPT_INT32,
 , INT_MAX, "expected # of files per directory" },
 	    { '\0', "extent", &ffs_opts->maxbsize, OPT_INT32,
 , INT_MAX, "maximum # extent size" },
 	    { '\0', "maxbpcg", &ffs_opts->maxblkspercg, OPT_INT32,
 , INT_MAX, "max # of blocks per group" },
 	    { '\0', "version", &ffs_opts->version, OPT_INT32,
 , 2, "UFS version" },
 	    { '\0', "optimization", optimization, OPT_STRARRAY,
 , sizeof(optimization), "Optimization (time|space)" },
 	    { '\0', "label", ffs_opts->label, OPT_STRARRAY,
 , sizeof(ffs_opts->label), "UFS label" },
 	    { .name = NULL }
 	};
-	char	*var, *val;
+	int	rv, i;
 	int	rv;
 	assert(option != NULL);
 	assert(fsopts != NULL);
 	assert(ffs_opts != NULL);
 	if (debug & DEBUG_FS_PARSE_OPTS)
 		printf("ffs_parse_opts: got `%s'\n", option);
-	if ((var = strdup(option)) == NULL)
+	rv = set_option(ffs_options, option);
-		err(1, "Allocating memory for copy of option string");
+	if (rv == 0)
-	rv = 0;
+		return 0;
-	if ((val = strchr(var, '=')) == NULL) {
+	for (i = 0; ffs_options[i].name && (1 << i) != rv; i++)
-		warnx("Option `%s' doesn't contain a value", var);
+		continue;
 		goto leave_ffs_parse_opts;
 	*val++ = '\0';
-	if (strcmp(var, "optimization") == 0) {
+	if (strcmp(ffs_options[i].name, "optimization") == 0) {
-		if (strcmp(val, "time") == 0) {
+		if (strcmp(optimization, "time") == 0) {
 			ffs_opts->optimization = FS_OPTTIME;
-		} else if (strcmp(val, "space") == 0) {
+		} else if (strcmp(optimization, "space") == 0) {
 			ffs_opts->optimization = FS_OPTSPACE;
 		} else {
-			warnx("Invalid optimization `%s'", val);
+			warnx("Invalid optimization `%s'", optimization);
-			goto leave_ffs_parse_opts;
+			return 0;
+		}
 		rv = 1;
-	} else if (strcmp(var, "label") == 0) {
+	return rv;
 		strlcpy(ffs_opts->label, val, sizeof(ffs_opts->label));
 		rv = 1;
 	} else
 		rv = set_option(ffs_options, var, val);
  leave_ffs_parse_opts:
 	if (var)
 		free(var);
 	return (rv);
+}
 void
 ffs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
+{
 	struct fs	*superblock;
 	struct timeval	start;
 	assert(image != NULL);
 	assert(dir != NULL);
 	assert(root != NULL);
 	assert(fsopts != NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: makefs.h,v 1.28 2013/01/23 20:46:39 christos Exp $	*/
+/*	$NetBSD: makefs.h,v 1.29 2013/01/23 21:32:32 christos Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Luke Mewburn for Wasabi Systems, 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
 @@ -161,27 +161,28 @@ typedef struct {
 	char		letter;		/* option letter NUL for none */
 	const char	*name;		/* option name */
 	void		*value;		/* where to stuff the value */
 	opttype_t	type;		/* type of entry */
 	long long	minimum;	/* minimum for value */
 	long long	maximum;	/* maximum for value */
 	const char	*desc;		/* option description */
 } option_t;
 void		apply_specfile(const char *, const char *, fsnode *, int);
 void		dump_fsnodes(fsnode *);
 const char *	inode_type(mode_t);
-int		set_option(const option_t *, const char *, const char *);
+int		set_option(const option_t *, const char *);
 int		set_option_var(const option_t *, const char *, const char *);
 fsnode *	walk_dir(const char *, const char *, fsnode *, fsnode *);
 void		free_fsnodes(fsnode *);
 #define DECLARE_FUN(fs)							\
 void		fs ## _prep_opts(fsinfo_t *);				\
 int		fs ## _parse_opts(const char *, fsinfo_t *);		\
 void		fs ## _cleanup_opts(fsinfo_t *);			\
 void		fs ## _makefs(const char *, const char *, fsnode *, fsinfo_t *)
 DECLARE_FUN(ffs);
 DECLARE_FUN(cd9660);
 DECLARE_FUN(chfs);
 DECLARE_FUN(v7fs);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdos.c,v 1.1 2013/01/23 20:46:39 christos Exp $	*/
+/*	$NetBSD: msdos.c,v 1.2 2013/01/23 21:32:32 christos Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.1 2013/01/23 20:46:39 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.2 2013/01/23 21:32:32 christos Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #if !HAVE_NBTOOL_CONFIG_H
 #include <sys/mount.h>
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 @@ -99,29 +99,27 @@ msdos_parse_opts(const char *option, fsi
 },
 ALLOPTS
 #undef AOPT
 		{ .name = NULL }
 	};
 	assert(option != NULL);
 	assert(fsopts != NULL);
 	assert(msdos_opt != NULL);
 	if (debug & DEBUG_FS_PARSE_OPTS)
 		printf("msdos_parse_opts: got `%s'\n", option);
-	set_option(msdos_options, option, "1");
+	return set_option(msdos_options, option);
 	return 1;
+}
 void
 msdos_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
+{
 #ifdef notyet
 	struct fs	*superblock;
 	struct timeval	start;
 	assert(image != NULL);
 	assert(dir != NULL);
 	assert(root != NULL);