 @@ -1,14 +1,14 @@
-/*	$NetBSD: walk.c,v 1.35 2024/04/23 22:12:48 christos Exp $	*/
+/*	$NetBSD: walk.c,v 1.36 2024/04/23 22:18: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,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.35 2024/04/23 22:12:48 christos Exp $");
+__RCSID("$NetBSD: walk.c,v 1.36 2024/04/23 22:18: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>
 @@ -63,36 +63,37 @@ __RCSID("$NetBSD: walk.c,v 1.35 2024/04/
 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)
+fsnode_cmp(const void *vleft, const void *vright)
+{
-	const fsnode * const left  = *(const fsnode * const *)_left;
+	const fsnode * const *left  = vleft;
-	const fsnode * const right = *(const fsnode * const *)_right;
+	const fsnode * const *right = vright;
 	const char *lname = (*left)->name, *rname = (*right)->name;
-	if (strcmp (left->name, ".") == 0)
+	if (strcmp(lname, ".") == 0)
 		return -1;
-	if (strcmp (right->name, ".") == 0)
+	if (strcmp(rname, ".") == 0)
 		return 1;
-	return strcmp (left->name, right->name);
+	return strcmp(lname, rname);
+}
 /*
  * 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)
 @@ -239,34 +240,34 @@ walk_dir(const char *root, const char *d
 				    replace, follow);
 				continue;
+			}
+		}
 		if (stbuf.st_nlink > 1) {
 			fsinode	*curino;
 			curino = link_check(cur->inode);
 			if (curino != NULL) {
 				free(cur->inode);
 				cur->inode = curino;
 				cur->inode->nlink++;
 				if (debug & DEBUG_WALK_DIR_LINKCHECK)
-					printf("link_check: found [%llu, %llu]\n",
+					printf("link_check: found [%ju, %ju]\n",
-					    (unsigned long long)curino->st.st_dev,
+					    (uintmax_t)curino->st.st_dev,
-					    (unsigned long long)curino->st.st_ino);
+					    (uintmax_t)curino->st.st_ino);
+			}
+		}
 		if (S_ISLNK(cur->type)) {
 			char	slink[PATH_MAX+1];
-			int	llen;
+			ssize_t	llen;
 			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)
 @@ -584,29 +585,29 @@ apply_specentry(const char *dir, NODE *s
 	if (specnode->flags & (F_GID | F_GNAME)) {
 		ASEPRINT("gid", "%d",
 		    dirnode->inode->st.st_gid, specnode->st_gid);
 		dirnode->inode->st.st_gid = specnode->st_gid;
+	}
 	if (specnode->flags & F_MODE) {
 		ASEPRINT("mode", "%#o",
 		    dirnode->inode->st.st_mode & ALLPERMS, specnode->st_mode);
 		dirnode->inode->st.st_mode &= ~ALLPERMS;
 		dirnode->inode->st.st_mode |= (specnode->st_mode & ALLPERMS);
+	}
 		/* XXX: ignoring F_NLINK for now */
 	if (specnode->flags & F_SIZE) {
-		ASEPRINT("size", "%lld",
+		ASEPRINT("size", "%jd",
-		    (long long)dirnode->inode->st.st_size,
+		    (intmax_t)dirnode->inode->st.st_size,
-		    (long long)specnode->st_size);
+		    (intmax_t)specnode->st_size);
 		dirnode->inode->st.st_size = specnode->st_size;
+	}
 	if (specnode->flags & F_SLINK) {
 		assert(dirnode->symlink != NULL);
 		assert(specnode->slink != NULL);
 		ASEPRINT("symlink", "%s", dirnode->symlink, specnode->slink);
 		free(dirnode->symlink);
 		dirnode->symlink = estrdup(specnode->slink);
+	}
 	if (specnode->flags & F_TIME) {
 		ASEPRINT("time", "%ld",
 		    (long)dirnode->inode->st.st_mtime,
 		    (long)specnode->st_mtimespec.tv_sec);
 @@ -619,33 +620,33 @@ apply_specentry(const char *dir, NODE *s
 		dirnode->inode->st.st_ctimensec =	start_time.tv_nsec;
 #endif
+	}
 	if (specnode->flags & (F_UID | F_UNAME)) {
 		ASEPRINT("uid", "%d",
 		    dirnode->inode->st.st_uid, specnode->st_uid);
 		dirnode->inode->st.st_uid = specnode->st_uid;
+	}
 #if HAVE_STRUCT_STAT_ST_FLAGS
 	if (specnode->flags & F_FLAGS) {
 		ASEPRINT("flags", "%#lX",
 		    (unsigned long)dirnode->inode->st.st_flags,
 		    (unsigned long)specnode->st_flags);
-		dirnode->inode->st.st_flags = specnode->st_flags;
+		dirnode->inode->st.st_flags = (unsigned int)specnode->st_flags;
+	}
 #endif
 	if (specnode->flags & F_DEV) {
-		ASEPRINT("rdev", "%#llx",
+		ASEPRINT("rdev", "%#jx",
-		    (unsigned long long)dirnode->inode->st.st_rdev,
+		    (uintmax_t)dirnode->inode->st.st_rdev,
-		    (unsigned long long)specnode->st_rdev);
+		    (uintmax_t)specnode->st_rdev);
 		dirnode->inode->st.st_rdev = specnode->st_rdev;
+	}
 #undef ASEPRINT
 	dirnode->flags |= FSNODE_F_HASSPEC;
+}
 /*
  * dump_fsnodes --
  *	dump the fsnodes from `cur'
  */
 void
 @@ -702,58 +703,57 @@ inode_type(mode_t mode)
  * link_check --
  *	return pointer to fsinode matching `entry's st_ino & st_dev if it exists,
  *	otherwise add `entry' to table and return NULL
  */
 /* This was borrowed from du.c and tweaked to keep an fsnode
  * pointer instead. -- dbj@netbsd.org
  */
 static fsinode *
 link_check(fsinode *entry)
+{
 	static struct entry {
 		fsinode *data;
 	} *htable;
-	static int htshift;  /* log(allocated size) */
+	static size_t htshift;  /* log(allocated size) */
-	static int htmask;   /* allocated size - 1 */
+	static size_t htmask;   /* allocated size - 1 */
-	static int htused;   /* 2*number of insertions */
+	static size_t htused;   /* 2*number of insertions */
-	int h, h2;
+	size_t h, h2;
 	uint64_t tmp;
 	/* this constant is (1<<64)/((1+sqrt(5))/2)
 	 * aka (word size)/(golden ratio)
 	 */
 	const uint64_t HTCONST = 11400714819323198485ULL;
-	const int HTBITS = 64;
+	const size_t HTBITS = 64;
 	/* Never store zero in hashtable */
 	assert(entry);
 	/* Extend hash table if necessary, keep load under 0.5 */
 	if (htused<<1 >= htmask) {
 		struct entry *ohtable;
 		if (!htable)
 			htshift = 10;   /* starting hashtable size */
 		else
 			htshift++;   /* exponential hashtable growth */
 		htmask  = (1 << htshift) - 1;
 		htused = 0;
 		ohtable = htable;
 		htable = ecalloc(htmask+1, sizeof(*htable));
 		/* populate newly allocated hashtable */
 		if (ohtable) {
-			int i;
+			for (size_t i = 0; i <= htmask>>1; i++)
 			for (i = 0; i <= htmask>>1; i++)
 				if (ohtable[i].data)
 					link_check(ohtable[i].data);
 			free(ohtable);
+		}
+	}
 	/* multiplicative hashing */
 	tmp = entry->st.st_dev;
 	tmp <<= HTBITS>>1;
 	tmp |=  entry->st.st_ino;
 	tmp *= HTCONST;
 	h  = tmp >> (HTBITS - htshift);
 	h2 = 1 | ( tmp >> (HTBITS - (htshift<<1) - 1)); /* must be odd */