 @@ -1,14 +1,14 @@
-/*	$NetBSD: walk.c,v 1.33 2023/12/28 12:13:55 tsutsui Exp $	*/
+/*	$NetBSD: walk.c,v 1.34 2024/04/23 22:12:16 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,72 +31,93 @@
  * 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.33 2023/12/28 12:13:55 tsutsui Exp $");
+__RCSID("$NetBSD: walk.c,v 1.34 2024/04/23 22:12:16 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 *);
 /*
  * 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 *_left, const void *_right)
+{
 	const fsnode * const left  = *(const fsnode * const *)_left;
 	const fsnode * const right = *(const fsnode * const *)_right;
 	if (strcmp (left->name, ".") == 0)
 		return -1;
 	if (strcmp (right->name, ".") == 0)
 		return 1;
 	return strcmp (left->name, right->name);
+}
 /*
  * 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))
 		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;
 @@ -231,27 +252,56 @@ walk_dir(const char *root, const char *d
 			llen = readlink(path, slink, sizeof(slink) - 1);
 			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 (first);
 	/*
 	 * 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;