 @@ -1,538 +1,538 @@
-/*	$NetBSD: compare.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: compare.c,v 1.6 2010/03/21 16:30:17 joerg Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS 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.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: compare.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: compare.c,v 1.6 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #if HAVE_STRING_H
 #include <string.h>
 #endif
 #if HAVE_TIME_H
 #include <time.h>
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifndef NO_MD5
 #if HAVE_MD5_H
 #include <md5.h>
 #endif
 #endif
 #ifndef NO_RMD160
 #if HAVE_RMD160_H
 #include <rmd160.h>
 #endif
 #endif
 #ifndef NO_SHA1
 #if HAVE_SHA1_H
 #include <sha1.h>
 #endif
 #endif
 #ifndef NO_SHA2
 #if HAVE_SHA2_H
 #include <sha2.h>
 #endif
 #endif
 #include "extern.h"
 #define	INDENTNAMELEN	8
 #define MARK								\
 do {									\
 	len = printf("%s: ", RP(p));					\
 	if (len > INDENTNAMELEN) {					\
 		tab = "\t";						\
 		printf("\n");						\
 	} else {							\
 		tab = "";						\
 		printf("%*s", INDENTNAMELEN - (int)len, "");		\
 	}								\
 } while (0)
 #define	LABEL if (!label++) MARK
 #if HAVE_STRUCT_STAT_ST_FLAGS
 #define CHANGEFLAGS							\
 	if (flags != p->fts_statp->st_flags) {				\
 		if (!label) {						\
 			MARK;						\
 			printf("%sflags (\"%s\"", tab,			\
 			    flags_to_string(p->fts_statp->st_flags, "none")); \
 		}							\
 		if (lchflags(p->fts_accpath, flags)) {			\
 			label++;					\
 			printf(", not modified: %s)\n",			\
 			    strerror(errno));				\
 		} else							\
 			printf(", modified to \"%s\")\n",		\
 			     flags_to_string(flags, "none"));		\
+	}
 /* SETFLAGS:
  * given pflags, additionally set those flags specified in s->st_flags and
  * selected by mask (the other flags are left unchanged).
  */
 #define SETFLAGS(pflags, mask)						\
 do {									\
 	flags = (s->st_flags & (mask)) | (pflags);			\
 	CHANGEFLAGS;							\
 } while (0)
 /* CLEARFLAGS:
  * given pflags, reset the flags specified in s->st_flags and selected by mask
  * (the other flags are left unchanged).
  */
 #define CLEARFLAGS(pflags, mask)					\
 do {									\
 	flags = (~(s->st_flags & (mask)) & CH_MASK) & (pflags);		\
 	CHANGEFLAGS;							\
 } while (0)
 #endif	/* HAVE_STRUCT_STAT_ST_FLAGS */
 int
 compare(NODE *s, FTSENT *p)
+{
-	u_int32_t len, val, flags;
+	uint32_t len, val, flags;
 	int fd, label;
 	const char *cp, *tab;
 #if !defined(NO_MD5) || !defined(NO_RMD160) || !defined(NO_SHA1) || !defined(NO_SHA2)
 	char digestbuf[MAXHASHLEN + 1];
 #endif
 	tab = NULL;
 	label = 0;
 	switch(s->type) {
 	case F_BLOCK:
 		if (!S_ISBLK(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 	case F_CHAR:
 		if (!S_ISCHR(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 	case F_DIR:
 		if (!S_ISDIR(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 	case F_FIFO:
 		if (!S_ISFIFO(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 	case F_FILE:
 		if (!S_ISREG(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 	case F_LINK:
 		if (!S_ISLNK(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 #ifdef S_ISSOCK
 	case F_SOCK:
 		if (!S_ISSOCK(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
 #endif
 typeerr:		LABEL;
 		printf("\ttype (%s, %s)\n",
 		    nodetype(s->type), inotype(p->fts_statp->st_mode));
 		return (label);
+	}
 	if (mtree_Wflag)
 		goto afterpermwhack;
 #if HAVE_STRUCT_STAT_ST_FLAGS
 	if (iflag && !uflag) {
 		if (s->flags & F_FLAGS)
 		    SETFLAGS(p->fts_statp->st_flags, SP_FLGS);
 		return (label);
+        }
 	if (mflag && !uflag) {
 		if (s->flags & F_FLAGS)
 		    CLEARFLAGS(p->fts_statp->st_flags, SP_FLGS);
 		return (label);
+        }
 #endif
 	if (s->flags & F_DEV &&
 	    (s->type == F_BLOCK || s->type == F_CHAR) &&
 	    s->st_rdev != p->fts_statp->st_rdev) {
 		LABEL;
 		printf("%sdevice (%#x, %#x",
 		    tab, s->st_rdev, p->fts_statp->st_rdev);
 		if (uflag) {
 			if ((unlink(p->fts_accpath) == -1) ||
 			    (mknod(p->fts_accpath,
 			      s->st_mode | nodetoino(s->type),
 			      s->st_rdev) == -1) ||
 			    (lchown(p->fts_accpath, p->fts_statp->st_uid,
 			      p->fts_statp->st_gid) == -1) )
 				printf(", not modified: %s)\n",
 				    strerror(errno));
 			 else
 				printf(", modified)\n");
 		} else
 			printf(")\n");
 		tab = "\t";
+	}
 	/* Set the uid/gid first, then set the mode. */
 	if (s->flags & (F_UID | F_UNAME) && s->st_uid != p->fts_statp->st_uid) {
 		LABEL;
 		printf("%suser (%lu, %lu",
 		    tab, (u_long)s->st_uid, (u_long)p->fts_statp->st_uid);
 		if (uflag) {
 			if (lchown(p->fts_accpath, s->st_uid, -1))
 				printf(", not modified: %s)\n",
 				    strerror(errno));
 			else
 				printf(", modified)\n");
 		} else
 			printf(")\n");
 		tab = "\t";
+	}
 	if (s->flags & (F_GID | F_GNAME) && s->st_gid != p->fts_statp->st_gid) {
 		LABEL;
 		printf("%sgid (%lu, %lu",
 		    tab, (u_long)s->st_gid, (u_long)p->fts_statp->st_gid);
 		if (uflag) {
 			if (lchown(p->fts_accpath, -1, s->st_gid))
 				printf(", not modified: %s)\n",
 				    strerror(errno));
 			else
 				printf(", modified)\n");
+		}
 		else
 			printf(")\n");
 		tab = "\t";
+	}
 	if (s->flags & F_MODE &&
 	    s->st_mode != (p->fts_statp->st_mode & MBITS)) {
 		if (lflag) {
 			mode_t tmode, mode;
 			tmode = s->st_mode;
 			mode = p->fts_statp->st_mode & MBITS;
 			/*
 			 * if none of the suid/sgid/etc bits are set,
 			 * then if the mode is a subset of the target,
 			 * skip.
 			 */
 			if (!((tmode & ~(S_IRWXU|S_IRWXG|S_IRWXO)) ||
 			    (mode & ~(S_IRWXU|S_IRWXG|S_IRWXO))))
 				if ((mode | tmode) == tmode)
 					goto skip;
+		}
 		LABEL;
 		printf("%spermissions (%#lo, %#lo",
 		    tab, (u_long)s->st_mode,
 		    (u_long)p->fts_statp->st_mode & MBITS);
 		if (uflag) {
 			if (lchmod(p->fts_accpath, s->st_mode))
 				printf(", not modified: %s)\n",
 				    strerror(errno));
 			else
 				printf(", modified)\n");
+		}
 		else
 			printf(")\n");
 		tab = "\t";
 	skip:	;
+	}
 	if (s->flags & F_NLINK && s->type != F_DIR &&
 	    s->st_nlink != p->fts_statp->st_nlink) {
 		LABEL;
 		printf("%slink count (%lu, %lu)\n",
 		    tab, (u_long)s->st_nlink, (u_long)p->fts_statp->st_nlink);
 		tab = "\t";
+	}
 	if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) {
 		LABEL;
 		printf("%ssize (%lld, %lld)\n",
 		    tab, (long long)s->st_size,
 		    (long long)p->fts_statp->st_size);
 		tab = "\t";
+	}
 	/*
 	 * XXX
 	 * Since utimes(2) only takes a timeval, there's no point in
 	 * comparing the low bits of the timespec nanosecond field.  This
 	 * will only result in mismatches that we can never fix.
+	 *
 	 * Doesn't display microsecond differences.
 	 */
 	if (s->flags & F_TIME) {
 		struct timeval tv[2];
 		struct stat *ps = p->fts_statp;
 		time_t smtime = s->st_mtimespec.tv_sec;
 #if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
 		time_t pmtime = ps->st_mtimespec.tv_sec;
 		TIMESPEC_TO_TIMEVAL(&tv[0], &s->st_mtimespec);
 		TIMESPEC_TO_TIMEVAL(&tv[1], &ps->st_mtimespec);
 #else
 		time_t pmtime = (time_t)ps->st_mtime;
 		tv[0].tv_sec = smtime;
 		tv[0].tv_usec = 0;
 		tv[1].tv_sec = pmtime;
 		tv[1].tv_usec = 0;
 #endif
 		if (tv[0].tv_sec != tv[1].tv_sec ||
 		    tv[0].tv_usec != tv[1].tv_usec) {
 			LABEL;
 			printf("%smodification time (%.24s, ",
 			    tab, ctime(&smtime));
 			printf("%.24s", ctime(&pmtime));
 			if (tflag) {
 				tv[1] = tv[0];
 				if (utimes(p->fts_accpath, tv))
 					printf(", not modified: %s)\n",
 					    strerror(errno));
 				else
 					printf(", modified)\n");
 			} else
 				printf(")\n");
 			tab = "\t";
+		}
+	}
 #if HAVE_STRUCT_STAT_ST_FLAGS
 	/*
 	 * XXX
 	 * since lchflags(2) will reset file times, the utimes() above
 	 * may have been useless!  oh well, we'd rather have correct
 	 * flags, rather than times?
 	 */
         if ((s->flags & F_FLAGS) && ((s->st_flags != p->fts_statp->st_flags)
 	    || mflag || iflag)) {
 		if (s->st_flags != p->fts_statp->st_flags) {
 			LABEL;
 			printf("%sflags (\"%s\" is not ", tab,
 			    flags_to_string(s->st_flags, "none"));
 			printf("\"%s\"",
 			    flags_to_string(p->fts_statp->st_flags, "none"));
+		}
 		if (uflag) {
 			if (iflag)
 				SETFLAGS(0, CH_MASK);
 			else if (mflag)
 				CLEARFLAGS(0, SP_FLGS);
 			else
 				SETFLAGS(0, (~SP_FLGS & CH_MASK));
 		} else
 			printf(")\n");
 		tab = "\t";
+	}
 #endif	/* HAVE_STRUCT_STAT_ST_FLAGS */
 	/*
 	 * from this point, no more permission checking or whacking
 	 * occurs, only checking of stuff like checksums and symlinks.
 	 */
  afterpermwhack:
 	if (s->flags & F_CKSUM) {
 		if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0) {
 			LABEL;
 			printf("%scksum: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else if (crc(fd, &val, &len)) {
 			close(fd);
 			LABEL;
 			printf("%scksum: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			close(fd);
 			if (s->cksum != val) {
 				LABEL;
 				printf("%scksum (%lu, %lu)\n",
 				    tab, s->cksum, (unsigned long)val);
+			}
 			tab = "\t";
+		}
+	}
 #ifndef NO_MD5
 	if (s->flags & F_MD5) {
 		if (MD5File(p->fts_accpath, digestbuf) == NULL) {
 			LABEL;
 			printf("%smd5: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			if (strcmp(s->md5digest, digestbuf)) {
 				LABEL;
 				printf("%smd5 (0x%s, 0x%s)\n",
 				    tab, s->md5digest, digestbuf);
+			}
 			tab = "\t";
+		}
+	}
 #endif	/* ! NO_MD5 */
 #ifndef NO_RMD160
 	if (s->flags & F_RMD160) {
 		if (RMD160File(p->fts_accpath, digestbuf) == NULL) {
 			LABEL;
 			printf("%srmd160: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			if (strcmp(s->rmd160digest, digestbuf)) {
 				LABEL;
 				printf("%srmd160 (0x%s, 0x%s)\n",
 				    tab, s->rmd160digest, digestbuf);
+			}
 			tab = "\t";
+		}
+	}
 #endif	/* ! NO_RMD160 */
 #ifndef NO_SHA1
 	if (s->flags & F_SHA1) {
 		if (SHA1File(p->fts_accpath, digestbuf) == NULL) {
 			LABEL;
 			printf("%ssha1: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			if (strcmp(s->sha1digest, digestbuf)) {
 				LABEL;
 				printf("%ssha1 (0x%s, 0x%s)\n",
 				    tab, s->sha1digest, digestbuf);
+			}
 			tab = "\t";
+		}
+	}
 #endif	/* ! NO_SHA1 */
 #ifndef NO_SHA2
 	if (s->flags & F_SHA256) {
 		if (SHA256_File(p->fts_accpath, digestbuf) == NULL) {
 			LABEL;
 			printf("%ssha256: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			if (strcmp(s->sha256digest, digestbuf)) {
 				LABEL;
 				printf("%ssha256 (0x%s, 0x%s)\n",
 				    tab, s->sha256digest, digestbuf);
+			}
 			tab = "\t";
+		}
+	}
 	if (s->flags & F_SHA384) {
 		if (SHA384_File(p->fts_accpath, digestbuf) == NULL) {
 			LABEL;
 			printf("%ssha384: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			if (strcmp(s->sha384digest, digestbuf)) {
 				LABEL;
 				printf("%ssha384 (0x%s, 0x%s)\n",
 				    tab, s->sha384digest, digestbuf);
+			}
 			tab = "\t";
+		}
+	}
 	if (s->flags & F_SHA512) {
 		if (SHA512_File(p->fts_accpath, digestbuf) == NULL) {
 			LABEL;
 			printf("%ssha512: %s: %s\n",
 			    tab, p->fts_accpath, strerror(errno));
 			tab = "\t";
 		} else {
 			if (strcmp(s->sha512digest, digestbuf)) {
 				LABEL;
 				printf("%ssha512 (0x%s, 0x%s)\n",
 				    tab, s->sha512digest, digestbuf);
+			}
 			tab = "\t";
+		}
+	}
 #endif	/* ! NO_SHA2 */
 	if (s->flags & F_SLINK &&
 	    strcmp(cp = rlink(p->fts_accpath), s->slink)) {
 		LABEL;
 		printf("%slink ref (%s, %s", tab, cp, s->slink);
 		if (uflag) {
 			if ((unlink(p->fts_accpath) == -1) ||
 			    (symlink(s->slink, p->fts_accpath) == -1) )
 				printf(", not modified: %s)\n",
 				    strerror(errno));
 			else
 				printf(", modified)\n");
 		} else
 			printf(")\n");
+	}
 	return (label);
+}
 const char *
 rlink(const char *name)
+{
 	static char lbuf[MAXPATHLEN];
 	int len;
 	if ((len = readlink(name, lbuf, sizeof(lbuf) - 1)) == -1)
 		mtree_err("%s: %s", name, strerror(errno));
 	lbuf[len] = '\0';
 	return (lbuf);
+}

 @@ -1,315 +1,315 @@
-/*	$NetBSD: verify.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: verify.c,v 1.6 2010/03/21 16:30:17 joerg Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS 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.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: verify.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: verify.c,v 1.6 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #if ! HAVE_NBTOOL_CONFIG_H
 #if HAVE_DIRENT_H
 #include <dirent.h>
 #endif
 #endif
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #if HAVE_FNMATCH_H
 #include <fnmatch.h>
 #endif
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #if HAVE_STRING_H
 #include <string.h>
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include "extern.h"
 static NODE *root;
 static char path[MAXPATHLEN];
 static void	miss(NODE *, char *);
 static int	vwalk(void);
 int
 verify(void)
+{
 	int rval;
 	root = spec(stdin);
 	rval = vwalk();
 	miss(root, path);
 	return (rval);
+}
 static int
 vwalk(void)
+{
 	FTS *t;
 	FTSENT *p;
 	NODE *ep, *level;
 	int specdepth, rval;
 	char *argv[2];
 	char  dot[] = ".";
 	argv[0] = dot;
 	argv[1] = NULL;
 	if ((t = fts_open(argv, ftsoptions, NULL)) == NULL)
 		mtree_err("fts_open: %s", strerror(errno));
 	level = root;
 	specdepth = rval = 0;
 	while ((p = fts_read(t)) != NULL) {
 		if (check_excludes(p->fts_name, p->fts_path)) {
 			fts_set(t, p, FTS_SKIP);
 			continue;
+		}
 		switch(p->fts_info) {
 		case FTS_D:
 		case FTS_SL:
 			break;
 		case FTS_DP:
 			if (specdepth > p->fts_level) {
 				for (level = level->parent; level->prev;
 				    level = level->prev)
 					continue;
 				--specdepth;
+			}
 			continue;
 		case FTS_DNR:
 		case FTS_ERR:
 		case FTS_NS:
 			warnx("%s: %s", RP(p), strerror(p->fts_errno));
 			continue;
 		default:
 			if (dflag)
 				continue;
+		}
 		if (specdepth != p->fts_level)
 			goto extra;
 		for (ep = level; ep; ep = ep->next)
 			if ((ep->flags & F_MAGIC &&
 			    !fnmatch(ep->name, p->fts_name, FNM_PATHNAME)) ||
 			    !strcmp(ep->name, p->fts_name)) {
 				ep->flags |= F_VISIT;
 				if (compare(ep, p))
 					rval = MISMATCHEXIT;
 				if (!(ep->flags & F_IGN) &&
 				    ep->type == F_DIR &&
 				    p->fts_info == FTS_D) {
 					if (ep->child) {
 						level = ep->child;
 						++specdepth;
+					}
 				} else
 					fts_set(t, p, FTS_SKIP);
 				break;
+			}
 		if (ep)
 			continue;
  extra:
 		if (!eflag) {
 			printf("extra: %s", RP(p));
 			if (rflag) {
 				if ((S_ISDIR(p->fts_statp->st_mode)
 				    ? rmdir : unlink)(p->fts_accpath)) {
 					printf(", not removed: %s",
 					    strerror(errno));
 				} else
 					printf(", removed");
+			}
 			putchar('\n');
+		}
 		fts_set(t, p, FTS_SKIP);
+	}
 	fts_close(t);
 	if (sflag)
 		warnx("%s checksum: %u", fullpath, crc_total);
 	return (rval);
+}
 static void
 miss(NODE *p, char *tail)
+{
 	int create;
 	char *tp;
 	const char *type;
-	u_int32_t flags;
+	uint32_t flags;
 	for (; p; p = p->next) {
 		if (p->flags & F_OPT && !(p->flags & F_VISIT))
 			continue;
 		if (p->type != F_DIR && (dflag || p->flags & F_VISIT))
 			continue;
 		strcpy(tail, p->name);
 		if (!(p->flags & F_VISIT))
 			printf("missing: %s", path);
 		switch (p->type) {
 		case F_BLOCK:
 		case F_CHAR:
 			type = "device";
 			break;
 		case F_DIR:
 			type = "directory";
 			break;
 		case F_LINK:
 			type = "symlink";
 			break;
 		default:
 			putchar('\n');
 			continue;
+		}
 		create = 0;
 		if (!(p->flags & F_VISIT) && uflag) {
 			if (mtree_Wflag || p->type == F_LINK)
 				goto createit;
 			if (!(p->flags & (F_UID | F_UNAME)))
 			    printf(
 				" (%s not created: user not specified)", type);
 			else if (!(p->flags & (F_GID | F_GNAME)))
 			    printf(
 				" (%s not created: group not specified)", type);
 			else if (!(p->flags & F_MODE))
 			    printf(
 				" (%s not created: mode not specified)", type);
 			else
  createit:
 			switch (p->type) {
 			case F_BLOCK:
 			case F_CHAR:
 				if (mtree_Wflag)
 					continue;
 				if (!(p->flags & F_DEV))
 					printf(
 				    " (%s not created: device not specified)",
 					    type);
 				else if (mknod(path,
 				    p->st_mode | nodetoino(p->type),
 				    p->st_rdev) == -1)
 					printf(" (%s not created: %s)\n",
 					    type, strerror(errno));
 				else
 					create = 1;
 				break;
 			case F_LINK:
 				if (!(p->flags & F_SLINK))
 					printf(
 				    " (%s not created: link not specified)\n",
 					    type);
 				else if (symlink(p->slink, path))
 					printf(
 					    " (%s not created: %s)\n",
 					    type, strerror(errno));
 				else
 					create = 1;
 				break;
 			case F_DIR:
 				if (mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO))
 					printf(" (not created: %s)",
 					    strerror(errno));
 				else
 					create = 1;
 				break;
 			default:
 				mtree_err("can't create create %s",
 				    nodetype(p->type));
+			}
+		}
 		if (create)
 			printf(" (created)");
 		if (p->type == F_DIR) {
 			if (!(p->flags & F_VISIT))
 				putchar('\n');
 			for (tp = tail; *tp; ++tp)
 				continue;
 			*tp = '/';
 			miss(p->child, tp + 1);
 			*tp = '\0';
 		} else
 			putchar('\n');
 		if (!create || mtree_Wflag)
 			continue;
 		if ((p->flags & (F_UID | F_UNAME)) &&
 		    (p->flags & (F_GID | F_GNAME)) &&
 		    (lchown(path, p->st_uid, p->st_gid))) {
 			printf("%s: user/group/mode not modified: %s\n",
 			    path, strerror(errno));
 			printf("%s: warning: file mode %snot set\n", path,
 			    (p->flags & F_FLAGS) ? "and file flags " : "");
 			continue;
+		}
 		if (p->flags & F_MODE) {
 			if (lchmod(path, p->st_mode))
 				printf("%s: permissions not set: %s\n",
 				    path, strerror(errno));
+		}
 #if HAVE_STRUCT_STAT_ST_FLAGS
 		if ((p->flags & F_FLAGS) && p->st_flags) {
 			if (iflag)
 				flags = p->st_flags;
 			else
 				flags = p->st_flags & ~SP_FLGS;
 			if (lchflags(path, flags))
 				printf("%s: file flags not set: %s\n",
 				    path, strerror(errno));
+		}
 #endif	/* HAVE_STRUCT_STAT_ST_FLAGS */
+	}
+}

 @@ -1,178 +1,178 @@
-/*	$NetBSD: crc.c,v 1.4 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: crc.c,v 1.5 2010/03/21 16:30:17 joerg Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * James W. Williams of NASA Goddard Space Flight Center.
+ *
  * 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS 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.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: crc.c,v 1.4 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: crc.c,v 1.5 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #if HAVE_TIME_H
 #include <time.h>
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include "extern.h"
-static const u_int32_t crctab[] = {
+static const uint32_t crctab[] = {
 x0,
 x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
 x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
 x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
 x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac,
 x5bd4b01b, 0x569796c2, 0x52568b75, 0x6a1936c8, 0x6ed82b7f,
 x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a,
 x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
 x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58,
 xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033,
 xa4ad16ea, 0xa06c0b5d, 0xd4326d90, 0xd0f37027, 0xddb056fe,
 xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
 xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4,
 xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
 x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5,
 x2ac12072, 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
 x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, 0x7897ab07,
 x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c,
 x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1,
 x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
 xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b,
 xbb60adfc, 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698,
 x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d,
 x94ea7b2a, 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
 xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, 0xc6bcf05f,
 xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
 xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80,
 x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
 x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a,
 x58c1663d, 0x558240e4, 0x51435d53, 0x251d3b9e, 0x21dc2629,
 x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c,
 x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
 x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e,
 xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65,
 xeba91bbc, 0xef68060b, 0xd727bbb6, 0xd3e6a601, 0xdea580d8,
 xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
 xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2,
 xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
 x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74,
 x857130c3, 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
 x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, 0x7b827d21,
 x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a,
 x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, 0x18197087,
 x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
 x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d,
 x2056cd3a, 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce,
 xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb,
 xdbee767c, 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
 xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, 0x89b8fd09,
 x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
 x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf,
 xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
 };
 /*
  * Compute a POSIX 1003.2 checksum.  This routine has been broken out so that
  * other programs can use it.  It takes a file descriptor to read from and
  * locations to store the crc and the number of bytes read.  It returns 0 on
  * success and 1 on failure.  Errno is set on failure.
  */
 extern int sflag;
-u_int32_t crc_total = ~0;		/* The crc over a number of files. */
+uint32_t crc_total = ~0;		/* The crc over a number of files. */
 int
-crc(int fd, u_int32_t *cval, u_int32_t *clen)
+crc(int fd, uint32_t *cval, uint32_t *clen)
+{
 	u_char *p;
 	int nr;
-	u_int32_t thecrc, len;
+	uint32_t thecrc, len;
-	u_int32_t crctot;
+	uint32_t crctot;
 	u_char buf[16 * 1024];
 #define	COMPUTE(var, ch)	(var) = (var) << 8 ^ crctab[(var) >> 24 ^ (ch)]
 	thecrc = len = crctot = 0;
 	if (sflag)
 		crctot = ~crc_total;
 	while ((nr = read(fd, buf, sizeof(buf))) > 0)
 		if (sflag) {
 			for (len += nr, p = buf; nr--; ++p) {
 				COMPUTE(thecrc, *p);
 				COMPUTE(crctot, *p);
+			}
 		} else {
 			for (len += nr, p = buf; nr--; ++p)
 				COMPUTE(thecrc, *p);
+		}
 	if (nr < 0)
 		return 1;
 	*clen = len;
 	/* Include the length of the file. */
 	if (sflag) {
 		for (; len != 0; len >>= 8) {
 			COMPUTE(thecrc, len & 0xff);
 			COMPUTE(crctot, len & 0xff);
+		}
 	} else {
 		for (; len != 0; len >>= 8)
 			COMPUTE(thecrc, len & 0xff);
+	}
 	*cval = ~thecrc;
 	if (sflag)
 		crc_total = ~crctot;
 	return 0;
+}

 @@ -1,439 +1,439 @@
-/*	$NetBSD: create.c,v 1.6 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: create.c,v 1.7 2010/03/21 16:30:17 joerg Exp $	*/
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS 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.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.6 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: create.c,v 1.7 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #if ! HAVE_NBTOOL_CONFIG_H
 #if HAVE_DIRENT_H
 #include <dirent.h>
 #endif
 #endif
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #if HAVE_GRP_H
 #include <grp.h>
 #endif
 #if HAVE_PWD_H
 #include <pwd.h>
 #endif
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif
 #if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #if HAVE_STRING_H
 #include <string.h>
 #endif
 #if HAVE_TIME_H
 #include <time.h>
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifndef NO_MD5
 #if HAVE_MD5_H
 #include <md5.h>
 #endif
 #endif
 #ifndef NO_RMD160
 #if HAVE_RMD160_H
 #include <rmd160.h>
 #endif
 #endif
 #ifndef NO_SHA1
 #if HAVE_SHA1_H
 #include <sha1.h>
 #endif
 #endif
 #ifndef NO_SHA2
 #if HAVE_SHA2_H
 #include <sha2.h>
 #endif
 #endif
 #include "extern.h"
 #define	INDENTNAMELEN	15
 #define	MAXLINELEN	80
 static gid_t gid;
 static uid_t uid;
 static mode_t mode;
 static u_long flags;
 static int	dsort(const FTSENT **, const FTSENT **);
 static void	output(int *, const char *, ...)
 	__attribute__((__format__(__printf__, 2, 3)));
 static int	statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
 static void	statf(FTSENT *);
 void
 cwalk(void)
+{
 	FTS *t;
 	FTSENT *p;
 	time_t clocktime;
 	char host[MAXHOSTNAMELEN + 1];
 	char *argv[2];
 	char  dot[] = ".";
 	argv[0] = dot;
 	argv[1] = NULL;
 	time(&clocktime);
 	gethostname(host, sizeof(host));
 	host[sizeof(host) - 1] = '\0';
 	printf(
 	    "#\t   user: %s\n#\tmachine: %s\n#\t   tree: %s\n#\t   date: %s",
 	    getlogin(), host, fullpath, ctime(&clocktime));
 	if ((t = fts_open(argv, ftsoptions, dsort)) == NULL)
 		mtree_err("fts_open: %s", strerror(errno));
 	while ((p = fts_read(t)) != NULL) {
 		if (check_excludes(p->fts_name, p->fts_path)) {
 			fts_set(t, p, FTS_SKIP);
 			continue;
+		}
 		switch(p->fts_info) {
 		case FTS_D:
 			printf("\n# %s\n", p->fts_path);
 			statd(t, p, &uid, &gid, &mode, &flags);
 			statf(p);
 			break;
 		case FTS_DP:
 			if (p->fts_level > 0)
 				printf("# %s\n..\n\n", p->fts_path);
 			break;
 		case FTS_DNR:
 		case FTS_ERR:
 		case FTS_NS:
 			mtree_err("%s: %s",
 			    p->fts_path, strerror(p->fts_errno));
 			break;
 		default:
 			if (!dflag)
 				statf(p);
 			break;
+		}
+	}
 	fts_close(t);
 	if (sflag && keys & F_CKSUM)
 		mtree_err("%s checksum: %u", fullpath, crc_total);
+}
 static void
 statf(FTSENT *p)
+{
-	u_int32_t len, val;
+	uint32_t len, val;
 	int fd, indent;
 	const char *name;
 #if !defined(NO_MD5) || !defined(NO_RMD160) || !defined(NO_SHA1) || !defined(NO_SHA2)
 	char digestbuf[MAXHASHLEN + 1];
 #endif
 	indent = printf("%s%s",
 	    S_ISDIR(p->fts_statp->st_mode) ? "" : "    ", vispath(p->fts_name));
 	if (indent > INDENTNAMELEN)
 		indent = MAXLINELEN;
 	else
 		indent += printf("%*s", INDENTNAMELEN - indent, "");
 	if (!S_ISREG(p->fts_statp->st_mode))
 		output(&indent, "type=%s", inotype(p->fts_statp->st_mode));
 	if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) {
 		if (keys & F_UNAME &&
 		    (name = user_from_uid(p->fts_statp->st_uid, 1)) != NULL)
 			output(&indent, "uname=%s", name);
 		else /* if (keys & F_UID) */
 			output(&indent, "uid=%u", p->fts_statp->st_uid);
+	}
 	if (keys & (F_GID | F_GNAME) && p->fts_statp->st_gid != gid) {
 		if (keys & F_GNAME &&
 		    (name = group_from_gid(p->fts_statp->st_gid, 1)) != NULL)
 			output(&indent, "gname=%s", name);
 		else /* if (keys & F_GID) */
 			output(&indent, "gid=%u", p->fts_statp->st_gid);
+	}
 	if (keys & F_MODE && (p->fts_statp->st_mode & MBITS) != mode)
 		output(&indent, "mode=%#o", p->fts_statp->st_mode & MBITS);
 	if (keys & F_DEV &&
 	    (S_ISBLK(p->fts_statp->st_mode) || S_ISCHR(p->fts_statp->st_mode)))
 		output(&indent, "device=%#x", p->fts_statp->st_rdev);
 	if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
 		output(&indent, "nlink=%u", p->fts_statp->st_nlink);
 	if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
 		output(&indent, "size=%lld", (long long)p->fts_statp->st_size);
 #if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
 	if (keys & F_TIME)
 		output(&indent, "time=%ld.%ld",
 		    (long)p->fts_statp->st_mtimespec.tv_sec,
 		    p->fts_statp->st_mtimespec.tv_nsec);
 #else
 		output(&indent, "time=%ld.%ld",
 		    p->fts_statp->st_mtime, 0);
 #endif
 	if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
 		if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
 		    crc(fd, &val, &len))
 			mtree_err("%s: %s", p->fts_accpath, strerror(errno));
 		close(fd);
 		output(&indent, "cksum=%lu", (long)val);
+	}
 #ifndef NO_MD5
 	if (keys & F_MD5 && S_ISREG(p->fts_statp->st_mode)) {
 		if (MD5File(p->fts_accpath, digestbuf) == NULL)
 			mtree_err("%s: %s", p->fts_accpath, "MD5File");
 		output(&indent, "md5=%s", digestbuf);
+	}
 #endif	/* ! NO_MD5 */
 #ifndef NO_RMD160
 	if (keys & F_RMD160 && S_ISREG(p->fts_statp->st_mode)) {
 		if (RMD160File(p->fts_accpath, digestbuf) == NULL)
 			mtree_err("%s: %s", p->fts_accpath, "RMD160File");
 		output(&indent, "rmd160=%s", digestbuf);
+	}
 #endif	/* ! NO_RMD160 */
 #ifndef NO_SHA1
 	if (keys & F_SHA1 && S_ISREG(p->fts_statp->st_mode)) {
 		if (SHA1File(p->fts_accpath, digestbuf) == NULL)
 			mtree_err("%s: %s", p->fts_accpath, "SHA1File");
 		output(&indent, "sha1=%s", digestbuf);
+	}
 #endif	/* ! NO_SHA1 */
 #ifndef NO_SHA2
 	if (keys & F_SHA256 && S_ISREG(p->fts_statp->st_mode)) {
 		if (SHA256_File(p->fts_accpath, digestbuf) == NULL)
 			mtree_err("%s: %s", p->fts_accpath, "SHA256_File");
 		output(&indent, "sha256=%s", digestbuf);
+	}
 	if (keys & F_SHA384 && S_ISREG(p->fts_statp->st_mode)) {
 		if (SHA384_File(p->fts_accpath, digestbuf) == NULL)
 			mtree_err("%s: %s", p->fts_accpath, "SHA384_File");
 		output(&indent, "sha384=%s", digestbuf);
+	}
 	if (keys & F_SHA512 && S_ISREG(p->fts_statp->st_mode)) {
 		if (SHA512_File(p->fts_accpath, digestbuf) == NULL)
 			mtree_err("%s: %s", p->fts_accpath, "SHA512_File");
 		output(&indent, "sha512=%s", digestbuf);
+	}
 #endif	/* ! NO_SHA2 */
 	if (keys & F_SLINK &&
 	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
 		output(&indent, "link=%s", vispath(rlink(p->fts_accpath)));
 #if HAVE_STRUCT_STAT_ST_FLAGS
 	if (keys & F_FLAGS && p->fts_statp->st_flags != flags)
 		output(&indent, "flags=%s",
 		    flags_to_string(p->fts_statp->st_flags, "none"));
 #endif
 	putchar('\n');
+}
 /* XXX
  * FLAGS2INDEX will fail once the user and system settable bits need more
  * than one byte, respectively.
  */
 #define FLAGS2INDEX(x)  (((x >> 8) & 0x0000ff00) | (x & 0x000000ff))
 #define	MTREE_MAXGID	5000
 #define	MTREE_MAXUID	5000
 #define	MTREE_MAXMODE	(MBITS + 1)
 #if HAVE_STRUCT_STAT_ST_FLAGS
 #define	MTREE_MAXFLAGS  (FLAGS2INDEX(CH_MASK) + 1)   /* 1808 */
 #else
 #define MTREE_MAXFLAGS	1
 #endif
 #define	MTREE_MAXS 16
 static int
 statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode,
       u_long *pflags)
+{
 	FTSENT *p;
 	gid_t sgid;
 	uid_t suid;
 	mode_t smode;
 	u_long sflags = 0;
 	const char *name;
 	gid_t savegid;
 	uid_t saveuid;
 	mode_t savemode;
 	u_long saveflags;
 	u_short maxgid, maxuid, maxmode, maxflags;
 	u_short g[MTREE_MAXGID], u[MTREE_MAXUID],
 		m[MTREE_MAXMODE], f[MTREE_MAXFLAGS];
 	static int first = 1;
 	savegid = *pgid;
 	saveuid = *puid;
 	savemode = *pmode;
 	saveflags = *pflags;
 	if ((p = fts_children(t, 0)) == NULL) {
 		if (errno)
 			mtree_err("%s: %s", RP(parent), strerror(errno));
 		return (1);
+	}
 	memset(g, 0, sizeof(g));
 	memset(u, 0, sizeof(u));
 	memset(m, 0, sizeof(m));
 	memset(f, 0, sizeof(f));
 	maxuid = maxgid = maxmode = maxflags = 0;
 	for (; p; p = p->fts_link) {
 		smode = p->fts_statp->st_mode & MBITS;
 		if (smode < MTREE_MAXMODE && ++m[smode] > maxmode) {
 			savemode = smode;
 			maxmode = m[smode];
+		}
 		sgid = p->fts_statp->st_gid;
 		if (sgid < MTREE_MAXGID && ++g[sgid] > maxgid) {
 			savegid = sgid;
 			maxgid = g[sgid];
+		}
 		suid = p->fts_statp->st_uid;
 		if (suid < MTREE_MAXUID && ++u[suid] > maxuid) {
 			saveuid = suid;
 			maxuid = u[suid];
+		}
 #if HAVE_STRUCT_STAT_ST_FLAGS
 		sflags = FLAGS2INDEX(p->fts_statp->st_flags);
 		if (sflags < MTREE_MAXFLAGS && ++f[sflags] > maxflags) {
 			saveflags = p->fts_statp->st_flags;
 			maxflags = f[sflags];
+		}
 #endif
+	}
 	/*
 	 * If the /set record is the same as the last one we do not need to
 	 * output a new one.  So first we check to see if anything changed.
 	 * Note that we always output a /set record for the first directory.
 	 */
 	if (((keys & (F_UNAME | F_UID)) && (*puid != saveuid)) ||
 	    ((keys & (F_GNAME | F_GID)) && (*pgid != savegid)) ||
 	    ((keys & F_MODE) && (*pmode != savemode)) ||
 	    ((keys & F_FLAGS) && (*pflags != saveflags)) ||
 	    first) {
 		first = 0;
 		printf("/set type=file");
 		if (keys & (F_UID | F_UNAME)) {
 			if (keys & F_UNAME &&
 			    (name = user_from_uid(saveuid, 1)) != NULL)
 				printf(" uname=%s", name);
 			else /* if (keys & F_UID) */
 				printf(" uid=%lu", (u_long)saveuid);
+		}
 		if (keys & (F_GID | F_GNAME)) {
 			if (keys & F_GNAME &&
 			    (name = group_from_gid(savegid, 1)) != NULL)
 				printf(" gname=%s", name);
 			else /* if (keys & F_UID) */
 				printf(" gid=%lu", (u_long)savegid);
+		}
 		if (keys & F_MODE)
 			printf(" mode=%#lo", (u_long)savemode);
 		if (keys & F_NLINK)
 			printf(" nlink=1");
 		if (keys & F_FLAGS)
 			printf(" flags=%s",
 			    flags_to_string(saveflags, "none"));
 		printf("\n");
 		*puid = saveuid;
 		*pgid = savegid;
 		*pmode = savemode;
 		*pflags = saveflags;
+	}
 	return (0);
+}
 static int
 dsort(const FTSENT **a, const FTSENT **b)
+{
 	if (S_ISDIR((*a)->fts_statp->st_mode)) {
 		if (!S_ISDIR((*b)->fts_statp->st_mode))
 			return (1);
 	} else if (S_ISDIR((*b)->fts_statp->st_mode))
 		return (-1);
 	return (strcmp((*a)->fts_name, (*b)->fts_name));
+}
 void
 output(int *offset, const char *fmt, ...)
+{
 	va_list ap;
 	char buf[1024];
 	va_start(ap, fmt);
 	vsnprintf(buf, sizeof(buf), fmt, ap);
 	va_end(ap);
 	if (*offset + strlen(buf) > MAXLINELEN - 3) {
 		printf(" \\\n%*s", INDENTNAMELEN, "");
 		*offset = INDENTNAMELEN;
+	}
 	*offset += printf(" %s", buf) + 1;
+}

 @@ -1,91 +1,91 @@
-/*	$NetBSD: extern.h,v 1.3 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: extern.h,v 1.4 2010/03/21 16:30:17 joerg Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 THE REGENTS OR CONTRIBUTORS 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.
+ *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include "mtree.h"
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #else
 #define HAVE_STRUCT_STAT_ST_FLAGS 1
 #endif
 #include <nbcompat.h>
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #if HAVE_FTS_H
 #include <fts.h>
 #endif
 #if HAVE_NETDB_H
 /* For MAXHOSTNAMELEN on some platforms. */
 #if HAVE_NETDB_H
 #include <netdb.h>
 #endif
 #endif
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 256
 #endif
 void	 addtag(slist_t *, char *);
 int	 check_excludes(const char *, const char *);
 int	 compare(NODE *, FTSENT *);
-int	 crc(int, u_int32_t *, u_int32_t *);
+int	 crc(int, uint32_t *, uint32_t *);
 void	 cwalk(void);
 void	 dump_nodes(const char *, NODE *, int);
 void	 init_excludes(void);
 int	 matchtags(NODE *);
 void	 mtree_err(const char *, ...)
 	    __attribute__((__format__(__printf__, 1, 2)));
 const char *nodetype(u_int);
 u_int	 parsekey(const char *, int *);
 void	 parsetags(slist_t *, char *);
 u_int	 parsetype(const char *);
 void	 read_excludes_file(const char *);
 const char *rlink(const char *);
 int	 verify(void);
 extern int	dflag, eflag, iflag, lflag, mflag, rflag, sflag, tflag, uflag;
 extern int	mtree_Mflag, mtree_Wflag;
 extern size_t	mtree_lineno;
-extern u_int32_t crc_total;
+extern uint32_t crc_total;
 extern int	ftsoptions, keys;
 extern char	fullpath[];
 extern slist_t	includetags, excludetags;
 #include "stat_flags.h"