 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -34,27 +34,27 @@
 #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
 @@ -141,27 +141,27 @@ do {									\
  * 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;

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -34,27 +34,27 @@
 #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>
 @@ -179,27 +179,27 @@ vwalk(void)
+	}
 	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";

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -37,47 +37,47 @@
 #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,
 @@ -119,35 +119,35 @@ static const u_int32_t crctab[] = {
 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);
+			}

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -34,27 +34,27 @@
 #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>
 @@ -176,27 +176,27 @@ cwalk(void)
 				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, "");

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -54,38 +54,38 @@
 /* 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"