 @@ -1,14 +1,14 @@
-.\"	$NetBSD: makefs.8,v 1.71 2022/11/17 06:40:41 chs Exp $
+.\"	$NetBSD: makefs.8,v 1.72 2024/05/08 15:57:56 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
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -23,27 +23,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 4, 2021
+.Dd May 8, 2024
 .Dt MAKEFS 8
 .Os
 .Sh NAME
 .Nm makefs
 .Nd create a file system image from a directory tree
 .Sh SYNOPSIS
 .Nm
 .Op Fl LrxZ
 .Op Fl B Ar endian
 .Op Fl b Ar free-blocks
 .Op Fl d Ar debug-mask
 .Op Fl F Ar mtree-specfile
 .Op Fl f Ar free-files
 @@ -250,26 +250,30 @@ ISO 9660 file system.
 .It Sy chfs
 Chip flash file system.
 .It Sy ffs
 BSD fast file system (default).
 .It Sy msdos
 FAT12, FAT16, or FAT32 file system.
 .It Sy udf
 ISO/Ecma UDF file system.
 .It Sy v7fs
 th Edition(V7) file system.
 .El
 .It Fl x
 Exclude file system nodes not explicitly listed in the specfile.
 Repeating this flag causes
 .Nm
 to print a warning for each missing system nodes and exit with an error code
 if there are any missing.
 .It Fl Z
 Create a sparse file for
 .Sy ffs .
 This is useful for virtual machine images.
 .El
 .Pp
 Where sizes are specified, a decimal number of bytes is expected.
 Two or more numbers may be separated by an
 .Sq x
 to indicate a product.
 Each number may have one of the following optional suffixes:
 .Bl -tag -width 3n -offset indent -compact
 .It b

 @@ -1,14 +1,14 @@
-/*	$NetBSD: makefs.c,v 1.57 2024/02/18 16:59:16 christos Exp $	*/
+/*	$NetBSD: makefs.c,v 1.58 2024/05/08 15:57:56 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.57 2024/02/18 16:59:16 christos Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.58 2024/05/08 15:57:56 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 <util.h>
 @@ -251,27 +251,27 @@ main(int argc, char *argv[])
 			if ((fstype = get_fstype(optarg)) == NULL)
 				errx(EXIT_FAILURE,
 				    "Unknown fs type `%s'.", optarg);
 			fstype->prepare_options(&fsoptions);
 			break;
 		case 'T':
 			if (get_tstamp(optarg, &stampst) == -1)
 				errx(EXIT_FAILURE,
 				    "Cannot get timestamp from `%s'", optarg);
 			break;
 		case 'x':
-			fsoptions.onlyspec = 1;
+			fsoptions.onlyspec++;
 			break;
 		case 'Z':
 			fsoptions.sparse = 1;
 			break;
 		case '?':
 		default:
 			usage(fstype, &fsoptions);
 			/* NOTREACHED */
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig Exp $	*/
+/*	$NetBSD: walk.c,v 1.40 2024/05/08 15:57:56 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
 @@ -31,50 +31,51 @@
  * 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: walk.c,v 1.39 2024/04/24 21:59:39 rillig Exp $");
+__RCSID("$NetBSD: walk.c,v 1.40 2024/05/08 15:57:56 christos Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include "makefs.h"
 #include "mtree.h"
 static	void	 apply_specdir(const char *, NODE *, fsnode *, int);
 static	void	 apply_specentry(const char *, NODE *, fsnode *);
 static	fsnode	*create_fsnode(const char *, const char *, const char *,
 			       struct stat *);
 static	fsinode	*link_check(fsinode *);
 static size_t missing = 0;
 /*
  * fsnode_cmp --
  *	This function is used by `qsort` so sort one directory's
  *	entries.  `.` is always first, sollowed by anything else
  *	as compared by `strcmp()`.
  */
 static int
 fsnode_cmp(const void *vleft, const void *vright)
+{
 	const fsnode * const *left  = vleft;
 	const fsnode * const *right = vright;
 	const char *lname = (*left)->name, *rname = (*right)->name;
 @@ -419,26 +420,29 @@ apply_specfile(const char *specfile, con
 		err(EXIT_FAILURE, "Can't close `%s'", specfile);
 				/* perform some sanity checks */
 	if (root == NULL)
 		errx(EXIT_FAILURE,
 		    "Specfile `%s' did not contain a tree", specfile);
 	assert(strcmp(root->name, ".") == 0);
 	assert(root->type == F_DIR);
 				/* merge in the changes */
 	apply_specdir(dir, root, parent, speconly);
 	free_nodes(root);
 	if (missing)
 		errx(EXIT_FAILURE, "Add %zu missing entries in `%s'",
 		    missing, specfile);
+}
 static void
 apply_specdir(const char *dir, NODE *specnode, fsnode *dirnode, int speconly)
+{
 	char	 path[MAXPATHLEN + 1];
 	NODE	*curnode;
 	fsnode	*curfsnode;
 	assert(specnode != NULL);
 	assert(dirnode != NULL);
 	if (debug & DEBUG_APPLY_SPECFILE)
 @@ -459,26 +463,31 @@ apply_specdir(const char *dir, NODE *spe
 	 * to begin with
 	 */
 	if (speconly) {
 		fsnode *next;
 		assert(dirnode->name[0] == '.' && dirnode->name[1] == '\0');
 		for (curfsnode = dirnode->next; curfsnode != NULL; curfsnode = next) {
 			next = curfsnode->next;
 			for (curnode = specnode->child; curnode != NULL;
 			     curnode = curnode->next) {
 				if (strcmp(curnode->name, curfsnode->name) == 0)
 					break;
+			}
 			if (curnode == NULL) {
 				if (speconly > 1) {
 					warnx("missing specfile entry for %s/%s",
 					    dir, curfsnode->name);
 					missing++;
+				}
 				if (debug & DEBUG_APPLY_SPECONLY) {
 					printf("%s: trimming %s/%s %p\n",
 					    __func__, dir, curfsnode->name,
 					    curfsnode);
+				}
 				free_fsnodes(curfsnode);
+			}
+		}
+	}
 			/* now walk specnode->child matching up with dirnode */
 	for (curnode = specnode->child; curnode != NULL;
 	    curnode = curnode->next) {