 @@ -1,14 +1,14 @@
-/*	$NetBSD: walk.c,v 1.38 2024/04/24 14:23:37 christos Exp $	*/
+/*	$NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig 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,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: walk.c,v 1.38 2024/04/24 14:23:37 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.39 2024/04/24 21:59:39 rillig 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>
 @@ -83,37 +83,36 @@ fsnode_cmp(const void *vleft, const void
 		return -1;
 	if (strcmp(rname, ".") == 0)
 		return 1;
 	return strcmp(lname, rname);
+}
 static fsnode *
 fsnode_sort(fsnode *first, const char *root, const char *dir)
+{
 	fsnode **list, **listptr;
 	size_t num = 0;
 	for (fsnode *tmp = first; tmp; tmp = tmp->next, num++) {
 		num++;
 		if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
 			printf("%s: pre sort: %s %s %s\n",
 			    __func__, root, dir, tmp->name);
+	}
 	list = listptr = ecalloc(num, sizeof(*list));
 	for (fsnode *tmp = first; tmp; tmp = tmp->next)
 		*listptr++ = tmp;
-	qsort (list, num, sizeof(*list), fsnode_cmp);
+	qsort(list, num, sizeof(*list), fsnode_cmp);
 	for (size_t i = 0; i < num - 1; ++i)
 		list[i]->next = list[i + 1];
 	list[num - 1]->next = NULL;
 	first = list[0];
 	assert(strcmp(first->name, ".") == 0);
 	free(list);
 	if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
 		for (fsnode *tmp = first; tmp; tmp = tmp->next)
 			printf("%s: post sort: %s %s %s\n",
 			    __func__, root, dir, tmp->name);
 	return first;
 @@ -552,27 +551,27 @@ apply_specdir(const char *dir, NODE *spe
 				curfsnode->child->first = curfsnode->child;
+			}
 			if (curfsnode->type == S_IFLNK) {
 				assert(curnode->slink != NULL);
 					/* for symlinks, copy the target */
 				curfsnode->symlink = estrdup(curnode->slink);
+			}
+		}
 		apply_specentry(dir, curnode, curfsnode);
 		if (curnode->type == F_DIR) {
 			if (curfsnode->type != S_IFDIR)
 				errx(EXIT_FAILURE,
 				    "`%s' is not a directory", path);
-			assert (curfsnode->child != NULL);
+			assert(curfsnode->child != NULL);
 			apply_specdir(path, curnode, curfsnode->child, speconly);
+		}
+	}
+}
 static void
 apply_specentry(const char *dir, NODE *specnode, fsnode *dirnode)
+{
 	assert(specnode != NULL);
 	assert(dirnode != NULL);
 	if (nodetoino(specnode->type) != dirnode->type)
 @@ -666,34 +665,34 @@ dump_fsnodes(fsnode *root)
 	for (cur = root; cur != NULL; cur = cur->next) {
 		if (snprintf(path, sizeof(path), "%s/%s", cur->path,
 		    cur->name) >= (int)sizeof(path))
 			errx(EXIT_FAILURE, "Pathname too long.");
 		if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
 			printf("%s: cur=%8p parent=%8p first=%8p ", __func__,
 			    cur, cur->parent, cur->first);
 		printf("%7s: %s", inode_type(cur->type), path);
 		if (S_ISLNK(cur->type)) {
 			assert(cur->symlink != NULL);
 			printf(" -> %s", cur->symlink);
 		} else {
-			assert (cur->symlink == NULL);
+			assert(cur->symlink == NULL);
+		}
 		if (cur->inode->nlink > 1)
 			printf(", nlinks=%d", cur->inode->nlink);
 		putchar('\n');
 		if (cur->child) {
-			assert (cur->type == S_IFDIR);
+			assert(cur->type == S_IFDIR);
 			dump_fsnodes(cur->child);
+		}
+	}
 	printf("%s: finished %s/%s\n", __func__, root->path, root->name);
+}
 /*
  * inode_type --
  *	for a given inode type `mode', return a descriptive string.
  *	for most cases, uses inotype() from mtree/misc.c
  */
 const char *