 @@ -1,14 +1,14 @@
-/*	$NetBSD: walk.c,v 1.36 2024/04/23 22:18:56 christos Exp $	*/
+/*	$NetBSD: walk.c,v 1.37 2024/04/24 14:02:39 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,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.36 2024/04/23 22:18:56 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.37 2024/04/24 14:02:39 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>
 @@ -76,54 +76,82 @@ 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;
 	if (strcmp(lname, ".") == 0)
 		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 ("pre sort: %s %s %s\n", 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);
 	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("post sort: %s %s %s\n", root, dir, tmp->name);
 	return first;
+}
 /*
  * walk_dir --
  *	build a tree of fsnodes from `root' and `dir', with a parent
  *	fsnode of `parent' (which may be NULL for the root of the tree).
  *	append the tree to a fsnode of `join' if it is not NULL.
  *	each "level" is a directory, with the "." entry guaranteed to be
  *	at the start of the list, and without ".." entries.
  */
 fsnode *
 walk_dir(const char *root, const char *dir, fsnode *parent, fsnode *join,
     int replace, int follow)
+{
 	fsnode		*first, *cur, *prev, *last;
 	DIR		*dirp;
 	struct dirent	*dent;
 	char		path[MAXPATHLEN + 1];
 	struct stat	stbuf;
 	char		*name, *rp;
 	int		dot, len;
 	fsnode **list, **listptr;
 	int num = 0;
 	assert(root != NULL);
 	assert(dir != NULL);
 	len = snprintf(path, sizeof(path), "%s/%s", root, dir);
-	if (len >= (int)sizeof(path))
+	if ((size_t)len >= sizeof(path))
 		errx(EXIT_FAILURE, "Pathname too long.");
 	if (debug & DEBUG_WALK_DIR)
 		printf("walk_dir: %s %p\n", path, parent);
 	if ((dirp = opendir(path)) == NULL)
 		err(EXIT_FAILURE, "Can't opendir `%s'", path);
 	rp = path + strlen(root) + 1;
 	if (join != NULL) {
 		first = cur = join;
 		while (cur->next != NULL)
 			cur = cur->next;
 		prev = last = cur;
 	} else
 		last = first = prev = NULL;
 @@ -145,34 +173,36 @@ walk_dir(const char *root, const char *d
 				dot = 0;
+			}
 		if (debug & DEBUG_WALK_DIR_NODE)
 			printf("scanning %s/%s/%s\n", root, dir, name);
 		if (snprintf(path + len, sizeof(path) - len, "/%s", name) >=
 		    (int)sizeof(path) - len)
 			errx(EXIT_FAILURE, "Pathname too long.");
 		if (follow) {
 			if (stat(path, &stbuf) == -1)
 				err(EXIT_FAILURE, "Can't stat `%s'", path);
 		} else {
 			if (lstat(path, &stbuf) == -1)
 				err(EXIT_FAILURE, "Can't lstat `%s'", path);
-			/* As symlink permission bits vary between filesystems
+			/*
-			   (ie. 0755 on FFS/NetBSD, 0777 for ext[234]/Linux),
+			 * Symlink permission bits vary between filesystems/OSs
-			   force them to 0755.  */
+			 * (ie. 0755 on FFS/NetBSD, 0777 for ext[234]/Linux),
 			 * force them to 0755.
 			 */
 			if (S_ISLNK(stbuf.st_mode)) {
 				stbuf.st_mode &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
 				stbuf.st_mode |= S_IRWXU
-				                 | S_IRGRP | S_IXGRP
+				    | S_IRGRP | S_IXGRP
-				                 | S_IROTH | S_IXOTH;
+				    | S_IROTH | S_IXOTH;
+			}
+		}
 #ifdef S_ISSOCK
 		if (S_ISSOCK(stbuf.st_mode & S_IFMT)) {
 			if (debug & DEBUG_WALK_DIR_NODE)
 				printf("  skipping socket %s\n", path);
 			continue;
+		}
 #endif
 		if (join != NULL) {
 			cur = join->next;
 			for (;;) {
 @@ -263,55 +293,27 @@ walk_dir(const char *root, const char *d
 			if (llen == -1)
 				err(EXIT_FAILURE, "Readlink `%s'", path);
 			slink[llen] = '\0';
 			cur->symlink = estrdup(slink);
+		}
+	}
 	assert(first != NULL);
 	if (join == NULL)
 		for (cur = first->next; cur != NULL; cur = cur->next)
 			cur->first = first;
 	if (closedir(dirp) == -1)
 		err(EXIT_FAILURE, "Can't closedir `%s/%s'", root, dir);
-	/*
+	return fsnode_sort(first, root, dir);
 	 * Sort entries.
 	 */
 	/* Create a plain list: Count, alloc, add.  */
 	for (fsnode *tmp = first; tmp; tmp = tmp->next) {
 		num++;
 		if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
 			printf ("pre sort: %s %s %s\n", root, dir, tmp->name);
 	list = listptr = ecalloc (num, sizeof (*list));
 	for (fsnode *tmp = first; tmp; tmp = tmp->next)
 		*listptr++ = tmp;
 	/* Sort plain list.  */
 	qsort (list, num, sizeof (*list), &fsnode_cmp);
 	/* Rewire.  */
 	for (int i = 0; i < num - 1; ++i)
 		list[i]->next = list[i+1];
 	list[num - 1]->next = NULL;
 	first = list[0];
 	/* Check `first` to be ".".  */
 	assert (strcmp (first->name, ".") == 0);
 	/* Free.  */
 	free (list);
 	/* Dump sorted state.  */
 	if (debug & DEBUG_DUMP_FSNODES_VERBOSE)
 		for (fsnode *tmp = first; tmp; tmp = tmp->next)
 			printf ("post sort: %s %s %s\n", root, dir, tmp->name);
 	return first;
+}
 static fsnode *
 create_fsnode(const char *root, const char *path, const char *name,
     struct stat *stbuf)
+{
 	fsnode *cur;
 	cur = ecalloc(1, sizeof(*cur));
 	cur->path = estrdup(path);
 	cur->name = estrdup(name);
 	cur->inode = ecalloc(1, sizeof(*cur->inode));
 	cur->root = root;