date:20090501

CVS commit: src/doc

2009-05-01 Thread Jeremy C. Reed

Module Name:src
Committed By:   reed
Date:   Sat May  2 06:21:16 UTC 2009

Modified Files:
src/doc: CHANGES.prev

Log Message:
Fix typo that I saw on website. I don't know how this gets converted to HTML 
though.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/doc/CHANGES.prev

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.94 src/doc/CHANGES.prev:1.95
--- src/doc/CHANGES.prev:1.94	Sun Apr  5 06:50:11 2009
+++ src/doc/CHANGES.prev	Sat May  2 06:21:16 2009
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.94 $>
+LIST OF CHANGES FROM PREVIOUS RELEASES:			<$Revision: 1.95 $>
 
 
 Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -9150,7 +9150,7 @@
 	arcmsr(4): Areca Technology Corporation SATA RAID controller driver,
 		ported from OpenBSD. [xtraeme 20071204]
 	symlink(7): Implement a new magic string for magic symlinks, @ruid,
-		which exapnds to the real user id of the process and
+		which expands to the real user id of the process and
 		use this magic string for per-user tmp. [mjf 20071204]
 	fxp(4): Fix some TX timeout and RX pool corruption problems.
 		Mostly from OpenBSD. [tsutsui 20071208]

CVS commit: src/usr.sbin/paxctl

2009-05-01 Thread Elad Efrat

Module Name:src
Committed By:   elad
Date:   Sat May  2 06:01:30 UTC 2009

Modified Files:
src/usr.sbin/paxctl: paxctl.c

Log Message:
PR/41332: Jason V. Miller: paxctl(8) leaks file descriptors

Always close(fd) before returning.

Thanks for the report!


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/paxctl/paxctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/paxctl/paxctl.c
diff -u src/usr.sbin/paxctl/paxctl.c:1.9 src/usr.sbin/paxctl/paxctl.c:1.10
--- src/usr.sbin/paxctl/paxctl.c:1.9	Sun Jan 18 10:01:34 2009
+++ src/usr.sbin/paxctl/paxctl.c	Sat May  2 06:01:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: paxctl.c,v 1.9 2009/01/18 10:01:34 lukem Exp $ */
+/* $NetBSD: paxctl.c,v 1.10 2009/05/02 06:01:30 elad Exp $ */
 
 /*-
  * Copyright (c) 2006 Elad Efrat 
@@ -34,7 +34,7 @@
 #include 
 #ifndef lint
 #ifdef __RCSID
-__RCSID("$NetBSD: paxctl.c,v 1.9 2009/01/18 10:01:34 lukem Exp $");
+__RCSID("$NetBSD: paxctl.c,v 1.10 2009/05/02 06:01:30 elad Exp $");
 #endif
 #endif /* not lint */
 
@@ -204,11 +204,13 @@
 
 	if (read(fd, &e, sizeof(e)) != sizeof(e)) {
 		warn("Can't read ELF header from `%s'", name);
+		(void)close(fd);
 		return 1;
 	}
 
 	if (memcmp(e.h32.e_ident, ELFMAG, SELFMAG) != 0) {
 		warnx("Bad ELF magic from `%s' (maybe it's not an ELF?)", name);
+		(void)close(fd);
 		return 1;
 	}
 
@@ -227,6 +229,7 @@
 	} else {
 		warnx("Bad ELF size %d from `%s' (maybe it's not an ELF?)",
 		(int)e.h32.e_ehsize, name);
+		(void)close(fd);
 		return 1;
 	}
 
@@ -234,6 +237,7 @@
 		if ((size_t)pread(fd, &p, PHSIZE, (off_t)EH(e_phoff) + i * PHSIZE) !=
 		PHSIZE) {
 			warn("Can't read program header data from `%s'", name);
+			(void)close(fd);
 			return 1;
 		}
 
@@ -242,6 +246,7 @@
 
 		if (pread(fd, &n, NHSIZE, (off_t)PH(p_offset)) != NHSIZE) {
 			warn("Can't read note header from `%s'", name);
+			(void)close(fd);
 			return 1;
 		}
 		if (NH(n_type) != ELF_NOTE_TYPE_PAX_TAG ||
@@ -251,6 +256,7 @@
 		if (pread(fd, &pax_tag, sizeof(pax_tag), PH(p_offset) + NHSIZE)
 		!= sizeof(pax_tag)) {
 			warn("Can't read pax_tag from `%s'", name);
+			(void)close(fd);
 			return 1;
 		}
 		if (memcmp(pax_tag.name, ELF_NOTE_PAX_NAME,
@@ -258,6 +264,7 @@
 			warn("Unknown pax_tag name `%*.*s' from `%s'",
 			ELF_NOTE_PAX_NAMESZ, ELF_NOTE_PAX_NAMESZ,
 			pax_tag.name, name);
+			(void)close(fd);
 			return 1;
 		}
 		ok = 1;
@@ -287,6 +294,7 @@
 		if (!pax_flags_sane(SWAP(pax_tag.flags))) {
 			warnx("New flags 0x%x don't make sense",
 			(uint32_t)SWAP(pax_tag.flags));
+			(void)close(fd);
 			return 1;
 		}

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Sat May  2 04:19:44 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c

Log Message:
Reorder the args to a static function to mirror some other function calls.

Attempt to use mmap(2) to read a file, and fall back to multiple read(2)
calls if that fails.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.5 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.6
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.5	Sat May  2 02:38:55 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c	Sat May  2 04:19:43 2009
@@ -29,7 +29,9 @@
 #include "config.h"
 
 #include 
+#include 
 #include 
+#include 
 
 #ifdef HAVE_OPENSSL_CAST_H
 #include 
@@ -158,13 +160,15 @@
 
 /* sign a file, and put the signature in a separate file */
 static int
-sign_detached(__ops_secret_key_t *seckey, const char *hashstr, char *f,
-		char *sigfile)
+sign_detached(char *f, char *sigfile, __ops_secret_key_t *seckey,
+		const char *hashstr)
 {
 	__ops_create_signature_t	*sig;
 	__ops_hash_algorithm_t		 alg;
 	__ops_create_info_t		*info;
 	unsigned char	 		 keyid[OPS_KEY_ID_SIZE];
+	unsigned char			*mmapped;
+	struct stat			 st;
 	time_t t;
 	char fname[MAXPATHLEN];
 	int fd;
@@ -188,19 +192,32 @@
 			f);
 		return 0;
 	}
-	for (;;) {
-		unsigned char	buf[8192];
-		int 		n;
+	/* attempt to mmap(2) the file - if that fails, fall back to
+	 * standard read(2) */
+	mmapped = MAP_FAILED;
+	if (fstat(fd, &st) == 0) {
+		mmapped = mmap(NULL, (size_t)st.st_size, PROT_READ,
+	MAP_FILE | MAP_PRIVATE, fd, 0);
+	}
+	if (mmapped == MAP_FAILED) {
+		for (;;) {
+			unsigned char	buf[8192];
+			int 		n;
 
-		if ((n = read(fd, buf, sizeof(buf))) == 0) {
-			break;
-		}
-		if (n < 0) {
-			(void) fprintf(stderr, "short read \"%s\"\n", f);
-			(void) close(fd);
-			return 0;
+			if ((n = read(fd, buf, sizeof(buf))) == 0) {
+break;
+			}
+			if (n < 0) {
+(void) fprintf(stderr, "short read \"%s\"\n",
+		f);
+(void) close(fd);
+return 0;
+			}
+			__ops_signature_add_data(sig, buf, (unsigned)n);
 		}
-		__ops_signature_add_data(sig, buf, (unsigned)n);
+	} else {
+		__ops_signature_add_data(sig, mmapped, (unsigned)st.st_size);
+		(void) munmap(mmapped, (unsigned)st.st_size);
 	}
 	(void) close(fd);
 
@@ -463,7 +480,7 @@
 	if (cleartext) {
 		__ops_sign_file_as_cleartext(f, out, seckey, true);
 	} else if (detached) {
-		sign_detached(seckey, "SHA1", f, out);
+		sign_detached(f, out, seckey, "SHA1");
 	} else {
 		__ops_sign_file(f, out, seckey, armored, true);
 	}

CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Sat May  2 02:44:36 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: libnetpgp.3

Log Message:
Document the way to get detached sig files from this library


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.3 src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.4
--- src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3:1.3	Tue Apr 28 07:59:35 2009
+++ src/crypto/external/bsd/netpgp/dist/src/lib/libnetpgp.3	Sat May  2 02:44:36 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: libnetpgp.3,v 1.3 2009/04/28 07:59:35 wiz Exp $
+.\" $NetBSD: libnetpgp.3,v 1.4 2009/05/02 02:44:36 agc Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -77,7 +77,7 @@
 .Ft int
 .Fo netpgp_sign_file
 .Fa "netpgp_t *netpgp" "char *userid" "char *filename" "char *out"
-.Fa "int armored" "int cleartext"
+.Fa "int armored" "int cleartext" "int detached"
 .Fc
 .Ft int
 .Fo netpgp_verify_file

CVS commit: src/crypto/external/bsd/netpgp/dist/src/bin

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Sat May  2 02:43:16 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/bin: netpgp.1

Log Message:
Give credit where credit is due.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.4 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.5
--- src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.4	Sat May  2 02:38:54 2009
+++ src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1	Sat May  2 02:43:15 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.4 2009/05/02 02:38:54 agc Exp $
+.\" $NetBSD: netpgp.1,v 1.5 2009/05/02 02:43:15 agc Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -273,3 +273,7 @@
 .Sh AUTHORS
 .An Ben Laurie
 .An Rachel Willmer
+and overhauled and rewritten by
+.An Alistair Crooks
+This manual page was also written by
+.An Alistair Crooks

CVS commit: src/crypto/external/bsd/netpgp

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Sat May  2 02:38:55 UTC 2009

Modified Files:
src/crypto/external/bsd/netpgp/dist: TODO
src/crypto/external/bsd/netpgp/dist/include: netpgp.h
src/crypto/external/bsd/netpgp/dist/src/bin: netpgp.1 netpgp.c
src/crypto/external/bsd/netpgp/dist/src/lib: compress.c create.c
netpgp.c signature.c validate.c
src/crypto/external/bsd/netpgp/lib: Makefile

Log Message:
Make this code WARNS=4
Add an option to the netpgp command to produce a detached signature.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/netpgp/dist/TODO
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/include/netpgp.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/lib/compress.c \
src/crypto/external/bsd/netpgp/dist/src/lib/create.c \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/netpgp/dist/TODO
diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.1.1.1 src/crypto/external/bsd/netpgp/dist/TODO:1.2
--- src/crypto/external/bsd/netpgp/dist/TODO:1.1.1.1	Thu Apr 23 06:31:56 2009
+++ src/crypto/external/bsd/netpgp/dist/TODO	Sat May  2 02:38:54 2009
@@ -41,3 +41,4 @@
 get rid of malloc() instances -> calloc()
 change include directory
 Install man pages
+WARNS=4 (again)

Index: src/crypto/external/bsd/netpgp/dist/include/netpgp.h
diff -u src/crypto/external/bsd/netpgp/dist/include/netpgp.h:1.1.1.1 src/crypto/external/bsd/netpgp/dist/include/netpgp.h:1.2
--- src/crypto/external/bsd/netpgp/dist/include/netpgp.h:1.1.1.1	Thu Apr 23 06:31:57 2009
+++ src/crypto/external/bsd/netpgp/dist/include/netpgp.h	Sat May  2 02:38:54 2009
@@ -57,7 +57,7 @@
 /* file management */
 int netpgp_encrypt_file(netpgp_t *, char *, char *, char *, int);
 int netpgp_decrypt_file(netpgp_t *, char *, char *, int);
-int netpgp_sign_file(netpgp_t *, char *, char *, char *, int, int);
+int netpgp_sign_file(netpgp_t *, char *, char *, char *, int, int, int);
 int netpgp_verify_file(netpgp_t *, char *, int);
 
 #endif /* !NETPGP_H_ */

Index: src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.3 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.4
--- src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1:1.3	Tue Apr 28 09:19:15 2009
+++ src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1	Sat May  2 02:38:54 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: netpgp.1,v 1.3 2009/04/28 09:19:15 wiz Exp $
+.\" $NetBSD: netpgp.1,v 1.4 2009/05/02 02:38:54 agc Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 1, 2009
+.Dd May 1, 2009
 .Dt NETPGP 1
 .Os
 .Sh NAME
@@ -38,6 +38,7 @@
 .Op Fl Fl armour
 .Op Fl Fl clearsign
 .Op Fl Fl decrypt
+.Op Fl Fl detached
 .Op Fl Fl encrypt
 .Op Fl Fl export-key
 .Op Fl Fl find-key
@@ -94,6 +95,9 @@
 The pass phrase will be optained by prompting the user
 to type it in, using
 .Xr getpass 3 .
+.It Fl Fl detached
+when signing a file, place the resulting signature in a separate
+file from the one being signed.
 .It Fl Fl encrypt
 Use the user's public key to encrypt the files named on the command line.
 .It Fl Fl export-key

Index: src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c:1.1.1.1 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c:1.1.1.1	Thu Apr 23 06:32:02 2009
+++ src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c	Sat May  2 02:38:54 2009
@@ -67,6 +67,7 @@
 	ARMOUR,
 	HOMEDIR,
 	NUMBITS,
+	DETACHED,
 
 	/* debug */
 	OPS_DEBUG
@@ -101,6 +102,7 @@
 	{"armor", no_argument, NULL, ARMOUR},
 	{"armour", no_argument, NULL, ARMOUR},
 	{"numbits", required_argument, NULL, NUMBITS},
+	{"detached", no_argument, NULL, DETACHED},
 
 	/* debug */
 	{"debug", required_argument, NULL, OPS_DEBUG},
@@ -118,6 +120,7 @@
 	int		overwrite;			/* overwrite files? */
 	int numbits;			/* # of bits */
 	int armour;/* ASCII armor */
+	int		detached;			/* use separate file */
 	int cmd;/* netpgp command */
 	int ex;/* exit code */
 } prog_t;
@@ -160,10 +163,12 @@
 		netpgp_decrypt_file(netpgp, f, N

CVS commit: src/crypto/external/lib

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Sat May  2 02:31:36 UTC 2009

Modified Files:
src/crypto/external/lib: Makefile

Log Message:
Fix a build failure reported by Perry


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/lib/Makefile
diff -u src/crypto/external/lib/Makefile:1.1 src/crypto/external/lib/Makefile:1.2
--- src/crypto/external/lib/Makefile:1.1	Tue Jan 20 07:12:16 2009
+++ src/crypto/external/lib/Makefile	Sat May  2 02:31:35 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2009/01/20 07:12:16 agc Exp $
+#	$NetBSD: Makefile,v 1.2 2009/05/02 02:31:35 agc Exp $
 
 #
 # This Makefile exists to provide a single point to build
@@ -8,6 +8,6 @@
 
 .include 
 
-SUBDIR+= ../bsd/openpgpsdk/lib
+SUBDIR+= ../bsd/netpgp/lib
 
 .include

CVS commit: src/distrib/sets/lists/base

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Sat May  2 02:20:20 UTC 2009

Modified Files:
src/distrib/sets/lists/base: md.amd64 md.sparc64

Log Message:
more libc.so.12.166->libc.so.12.167 -- hopefully the end


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/md.sparc64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.44 src/distrib/sets/lists/base/md.amd64:1.45
--- src/distrib/sets/lists/base/md.amd64:1.44	Fri Apr 17 20:38:04 2009
+++ src/distrib/sets/lists/base/md.amd64	Sat May  2 02:20:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.44 2009/04/17 20:38:04 dyoung Exp $
+# $NetBSD: md.amd64,v 1.45 2009/05/02 02:20:20 perry Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./usr/bin/fdformatbase-util-bin
@@ -63,7 +63,7 @@
 ./usr/lib/i386/libbz2.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libbz2.so.1.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libc.so.12			base-compat-shlib	compat,pic
-./usr/lib/i386/libc.so.12.166			base-compat-shlib	compat,pic
+./usr/lib/i386/libc.so.12.167			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcom_err.so.6			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/i386/libcom_err.so.6.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/i386/libcrypt.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.39 src/distrib/sets/lists/base/md.sparc64:1.40
--- src/distrib/sets/lists/base/md.sparc64:1.39	Sun Apr 12 20:54:41 2009
+++ src/distrib/sets/lists/base/md.sparc64	Sat May  2 02:20:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.39 2009/04/12 20:54:41 christos Exp $
+# $NetBSD: md.sparc64,v 1.40 2009/05/02 02:20:20 perry Exp $
 ./sbin/edlabel	base-sysutil-root
 ./usr/bin/fdformatbase-util-bin
 ./usr/lib/sparc	base-compat-lib		compat
@@ -62,7 +62,7 @@
 ./usr/lib/sparc/libbz2.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libbz2.so.1.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libc.so.12			base-compat-shlib	compat,pic
-./usr/lib/sparc/libc.so.12.166			base-compat-shlib	compat,pic
+./usr/lib/sparc/libc.so.12.167			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libcom_err.so.6			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libcom_err.so.6.0		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libcrypt.so.1			base-compat-shlib	compat,pic

CVS commit: [netbsd-5] src/doc

2009-05-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat May  2 01:58:58 UTC 2009

Modified Files:
src/doc [netbsd-5]: CHANGES-5.1

Log Message:
Fix a typo: 5.1, not 4.1.  Pointed out by Richard Ben Aleya.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-5.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.2 src/doc/CHANGES-5.1:1.1.2.3
--- src/doc/CHANGES-5.1:1.1.2.2	Fri May  1 03:18:34 2009
+++ src/doc/CHANGES-5.1	Sat May  2 01:58:58 2009
@@ -1,6 +1,6 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.2 2009/05/01 03:18:34 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.3 2009/05/02 01:58:58 snj Exp $
 
-A complete list of changes from the NetBSD 5.0 release to the NetBSD 4.1
+A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
 
 gnu/usr.bin/groff/tmac/mdoc.local		patched by hand

CVS commit: src

2009-05-01 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Sat May  2 01:15:54 UTC 2009

Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/lib/libukfs: ukfs.c
src/sys/rump/fs: Makefile.rumpfs
src/sys/rump/fs/lib/libffs: Makefile
src/tests/fs/ffs: Makefile
src/usr.sbin/puffs/rump_ext2fs: Makefile
src/usr.sbin/puffs/rump_ffs: Makefile
src/usr.sbin/puffs/rump_lfs: Makefile
Removed Files:
src/sys/rump/fs/lib/libufs: Makefile fs_ffs.h shlib_version

Log Message:
Merge librumpfs_ufs into librumpfs_ffs.  This reflects what happened
with the ffs kernel module and follows the trend of retiring ufs.
It also allows to get rid of a special case kludge in runtime module
loading, since ufs was not really a module.  librumpfs_ufs is now
obsoleted and ffs consumers should be linked solely against
librumpfs_ffs.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.468 -r1.469 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1249 -r1.1250 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.24 -r1.25 src/lib/libukfs/ukfs.c
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/fs/lib/libffs/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/rump/fs/lib/libufs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libufs/fs_ffs.h \
src/sys/rump/fs/lib/libufs/shlib_version
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_ext2fs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_lfs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.170 src/distrib/sets/lists/base/shl.elf:1.171
--- src/distrib/sets/lists/base/shl.elf:1.170	Fri May  1 22:59:52 2009
+++ src/distrib/sets/lists/base/shl.elf	Sat May  2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.170 2009/05/01 22:59:52 agc Exp $
+# $NetBSD: shl.elf,v 1.171 2009/05/02 01:15:54 pooka Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -248,8 +248,8 @@
 ./usr/lib/librumpfs_tmpfs.so.0			base-rump-shlib
 ./usr/lib/librumpfs_udf.so			base-rump-shlib
 ./usr/lib/librumpfs_udf.so.0			base-rump-shlib
-./usr/lib/librumpfs_ufs.so			base-rump-shlib
-./usr/lib/librumpfs_ufs.so.0			base-rump-shlib
+./usr/lib/librumpfs_ufs.so			base-obsolete		obsolete
+./usr/lib/librumpfs_ufs.so.0			base-obsolete		obsolete
 ./usr/lib/librumpnet.sobase-rump-shlib
 ./usr/lib/librumpnet.so.0			base-rump-shlib
 ./usr/lib/librumpnet_local.so			base-rump-shlib

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.468 src/distrib/sets/lists/base/shl.mi:1.469
--- src/distrib/sets/lists/base/shl.mi:1.468	Fri May  1 22:59:52 2009
+++ src/distrib/sets/lists/base/shl.mi	Sat May  2 01:15:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.468 2009/05/01 22:59:52 agc Exp $
+# $NetBSD: shl.mi,v 1.469 2009/05/02 01:15:54 pooka Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -131,7 +131,7 @@
 ./usr/lib/librumpfs_sysvbfs.so.0.0		base-rump-shlib
 ./usr/lib/librumpfs_tmpfs.so.0.0		base-rump-shlib
 ./usr/lib/librumpfs_udf.so.0.0			base-rump-shlib
-./usr/lib/librumpfs_ufs.so.0.0			base-rump-shlib
+./usr/lib/librumpfs_ufs.so.0.0			base-obsolete		obsolete
 ./usr/lib/librumpnet.so.0.0			base-rump-shlib
 ./usr/lib/librumpnet_local.so.0.0		base-rump-shlib
 ./usr/lib/librumpnet_net.so.0.0			base-rump-shlib

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1249 src/distrib/sets/lists/comp/mi:1.1250
--- src/distrib/sets/lists/comp/mi:1.1249	Fri May  1 22:59:52 2009
+++ src/distrib/sets/lists/comp/mi	Sat May  2 01:15:54 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1249 2009/05/01 22:59:52 agc Exp $
+#	$NetBSD: mi,v 1.1250 2009/05/02 01:15:54 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2549,9 +2549,9 @@
 ./usr/lib/librumpfs_udf.a			comp-c-lib
 ./usr/lib/librumpfs_udf_g.a			-unknown-		debuglib
 ./usr/lib/librumpfs_udf_p.a			comp-c-proflib		profile
-./usr/lib/librumpfs_ufs.a			comp-c-lib
-./usr/lib/librumpfs_ufs_g.a			-unknown-		debuglib
-./usr/lib/librumpfs_ufs_p.a			comp-c-proflib		profile
+./usr/lib/librumpfs_ufs.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_ufs_g.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_ufs_p.a			comp-obsolete		obsolete
 ./usr/lib/librumpnet.acomp-c-lib
 ./usr/lib/librumpnet_g.a			-unknown-		debuglib
 ./usr/lib/librumpnet_local.a			comp-c-lib

Index: sr

CVS commit: src/usr.sbin/iscsi

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Fri May  1 23:40:33 UTC 2009

Modified Files:
src/usr.sbin/iscsi: Makefile
Removed Files:
src/usr.sbin/iscsi/harness: Makefile
src/usr.sbin/iscsi/iscsiconfig: Makefile

Log Message:
Get rid of files which aren't used


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/iscsi/Makefile
cvs rdiff -u -r1.3 -r0 src/usr.sbin/iscsi/harness/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.sbin/iscsi/iscsiconfig/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/iscsi/Makefile
diff -u src/usr.sbin/iscsi/Makefile:1.1 src/usr.sbin/iscsi/Makefile:1.2
--- src/usr.sbin/iscsi/Makefile:1.1	Wed Feb  8 18:57:49 2006
+++ src/usr.sbin/iscsi/Makefile	Fri May  1 23:40:32 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2006/02/08 18:57:49 agc Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/01 23:40:32 agc Exp $
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
 
-SUBDIR= target # harness works, but does not need to be installed
+SUBDIR= target
 
 .include

CVS commit: src/crypto/external/bsd/openpgpsdk

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Fri May  1 23:10:42 UTC 2009

Removed Files:
src/crypto/external/bsd/openpgpsdk: Makefile
src/crypto/external/bsd/openpgpsdk/bin: Makefile openpgp.1
src/crypto/external/bsd/openpgpsdk/dist: Licence Makefile
OpenPGPSDK.dsw configure
src/crypto/external/bsd/openpgpsdk/dist/coverity: README
src/crypto/external/bsd/openpgpsdk/dist/doc: Makefile deliverable.txt
doxygen-user.cfg spec.txt
src/crypto/external/bsd/openpgpsdk/dist/examples: README
src/crypto/external/bsd/openpgpsdk/dist/examples/original:
Makefile.template build-keyring.c common.c common.h
create-crypted-gpg-key.sh create-gpg-key.sh create-key.c
create-signed-key.c decrypt.c encrypt-gpg-message.sh encrypt.c
packet-dump.c sign-detached.c sign-inline.c verify.c verify2.c
src/crypto/external/bsd/openpgpsdk/dist/include/openpgpsdk: Makefile
accumulate.h armour.h callback.h compress.h configure.h
configure.h.template create.h crypto.h defs.h errors.h final.h
hash.h keyring.h lists.h memory.h openpgpsdk.h packet-parse.h
packet-show-cast.h packet-show.h packet.h random.h readerwriter.h
signature.h std_print.h streamwriter.h types.h util.h validate.h
version.h writer.h writer_armoured.h
src/crypto/external/bsd/openpgpsdk/dist/plan: tasklist-071011.pdf
tasklist-071026.pdf tasklist-071030-reformatted.pdf
tasklist-071030.pdf tasklist-080201.pdf
src/crypto/external/bsd/openpgpsdk/dist/plan/OpenPGP.omniplan:
contents.xml
src/crypto/external/bsd/openpgpsdk/dist/presentations:
openpgpsdk-euroscon.pdf openpgpsdk.ppt
src/crypto/external/bsd/openpgpsdk/dist/ref:
draft-ietf-openpgp-rfc2440bis-12-ben.txt
draft-ietf-openpgp-rfc2440bis-12-comments.txt
draft-ietf-openpgp-rfc2440bis-12.txt
draft-ietf-openpgp-rfc2440bis-13.txt
draft-ietf-openpgp-rfc2440bis-14.txt
draft-ietf-openpgp-rfc2440bis-15.txt
draft-ietf-openpgp-rfc2440bis-22.txt rfc1991.txt rfc2437.txt
rfc2440.txt rfc4880.txt
src/crypto/external/bsd/openpgpsdk/dist/src: Makefile.template
doxygen.c libops.dsp
src/crypto/external/bsd/openpgpsdk/dist/src/app: Makefile.template
openpgp.c
src/crypto/external/bsd/openpgpsdk/dist/src/lib: Makefile.template
accumulate.c compress.c create.c crypto.c errors.c fingerprint.c
hash.c keyring.c keyring_local.h lists.c memory.c openssl_crypto.c
packet-parse.c packet-print.c packet-show.c parse_local.h random.c
reader.c reader_armoured.c reader_encrypted_se.c
reader_encrypted_seip.c reader_fd.c reader_hashed.c reader_mem.c
readerwriter.c signature.c symmetric.c util.c validate.c writer.c
writer_armour.c writer_encrypt.c writer_encrypt_se_ip.c writer_fd.c
writer_memory.c writer_skey_checksum.c
writer_stream_encrypt_se_ip.c
src/crypto/external/bsd/openpgpsdk/dist/test: README
src/crypto/external/bsd/openpgpsdk/dist/test/original:
91A285AE301B7D6B.pub clearsign.txt dsa-public-key-2118CF83.raw
pgp1.eml pgp2.eml rsa-public-key-2719AF35.raw
rsa-public-key-v4-A0CFDA99.raw signtest signtest.gpg
subpacket-10.raw subpacket-28.raw testfile user-attribute-key.raw
v3-pubring.pgp v3-secring.pgp
src/crypto/external/bsd/openpgpsdk/dist/test/original/err:
rsa-public-key-2719AF35.raw.too-short
src/crypto/external/bsd/openpgpsdk/dist/tests: Makefile.template
test_cmdline.c test_common.c test_crypt_mpi.c test_crypto.c
test_dsa_signature.c test_dsa_verify.c test_packet_types.c
test_rsa_decrypt.c test_rsa_encrypt.c test_rsa_keys.c
test_rsa_signature.c test_rsa_verify.c tests.c tests.dsp tests.h
src/crypto/external/bsd/openpgpsdk/dist/util: Makefile.oink.template
caster.pl oink_cc.pl
src/crypto/external/bsd/openpgpsdk/lib: Makefile openpgpsdk.3
shlib_version

Log Message:
Retire openpgpsdk - replaced by netpgp


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/openpgpsdk/Makefile
cvs rdiff -u -r1.6 -r0 src/crypto/external/bsd/openpgpsdk/bin/Makefile
cvs rdiff -u -r1.5 -r0 src/crypto/external/bsd/openpgpsdk/bin/openpgp.1
cvs rdiff -u -r1.1.1.1 -r0 src/crypto/external/bsd/openpgpsdk/dist/Licence \
src/crypto/external/bsd/openpgpsdk/dist/Makefile \
src/crypto/external/bsd/openpgpsdk/dist/OpenPGPSDK.dsw \
src/crypto/external/bsd/openpgpsdk/dist/configure
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openpgpsdk/dist/coverity/README
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external

CVS commit: src

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 23:08:26 UTC 2009

Modified Files:
src: UPDATING

Log Message:
note a new failure mode thanks to the new string functions
requested by mrg


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/UPDATING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/UPDATING
diff -u src/UPDATING:1.194 src/UPDATING:1.195
--- src/UPDATING:1.194	Sun Mar 29 18:33:56 2009
+++ src/UPDATING	Fri May  1 23:08:25 2009
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.194 2009/03/29 18:33:56 mrg Exp $
+$NetBSD: UPDATING,v 1.195 2009/05/01 23:08:25 perry Exp $
 
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
@@ -16,6 +16,14 @@
 Recent changes:
 ^^^
 
+20090501:
+	Several new functions were added to string.h/libc, and this
+	can cause autoconf problems during the tool build for people
+	who fail to clean out their tools objects properly. If you
+	note messages about stpcpy, stpncpy or strnlen accompanying a
+	failure during the tool build, clean out all your tools
+	objects and start again.
+
 20090325:
 	The i386 port was switched to i486 default toolchain.  This requires
 	cleaning your src/tools directory and $TOOLDIR and rebuilding them.

CVS commit: src/crypto/external/bsd

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Fri May  1 23:00:37 UTC 2009

Modified Files:
src/crypto/external/bsd: Makefile

Log Message:
Don't descend into openpgpsdk directory - it's about to go away.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/Makefile
diff -u src/crypto/external/bsd/Makefile:1.3 src/crypto/external/bsd/Makefile:1.4
--- src/crypto/external/bsd/Makefile:1.3	Sat Apr 25 05:54:51 2009
+++ src/crypto/external/bsd/Makefile	Fri May  1 23:00:37 2009
@@ -1,6 +1,5 @@
-#	$NetBSD: Makefile,v 1.3 2009/04/25 05:54:51 agc Exp $
+#	$NetBSD: Makefile,v 1.4 2009/05/01 23:00:37 agc Exp $
 
 SUBDIR+= netpgp
-SUBDIR+= openpgpsdk
 
 .include

CVS commit: src/distrib/sets/lists

2009-05-01 Thread Alistair G. Crooks

Module Name:src
Committed By:   agc
Date:   Fri May  1 22:59:53 UTC 2009

Modified Files:
src/distrib/sets/lists/base: mi shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/man: mi

Log Message:
Remove openpgp files from the build (replaced by netpgp)


To generate a diff of this commit:
cvs rdiff -u -r1.806 -r1.807 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.467 -r1.468 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1248 -r1.1249 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1134 -r1.1135 src/distrib/sets/lists/man/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.806 src/distrib/sets/lists/base/mi:1.807
--- src/distrib/sets/lists/base/mi:1.806	Mon Apr 27 14:22:40 2009
+++ src/distrib/sets/lists/base/mi	Fri May  1 22:59:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.806 2009/04/27 14:22:40 njoly Exp $
+# $NetBSD: mi,v 1.807 2009/05/01 22:59:51 agc Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -834,6 +834,7 @@
 ./usr/bin/msgs	base-util-bin
 ./usr/bin/nbsvtoolbase-crypto-bin		crypto
 ./usr/bin/netgroupbase-nis-bin
+./usr/bin/netpgpbase-crypto-bin		crypto
 ./usr/bin/netstatbase-netutil-bin
 ./usr/bin/newaliasesbase-mailwrapper-bin
 ./usr/bin/newgrpbase-util-bin
@@ -848,8 +849,7 @@
 ./usr/bin/nvi	base-obsolete		obsolete
 ./usr/bin/nview	base-obsolete		obsolete
 ./usr/bin/od	base-util-bin
-./usr/bin/openpgpbase-crypto-bin		crypto
-./usr/bin/netpgpbase-crypto-bin		crypto
+./usr/bin/openpgpbase-obsolete		obsolete
 ./usr/bin/opensslbase-crypto-bin		crypto
 ./usr/bin/page	base-util-bin
 ./usr/bin/pagesizebase-util-bin
@@ -1112,7 +1112,7 @@
 ./usr/include/nfsbase-c-usr
 ./usr/include/ntfsbase-c-usr
 ./usr/include/objcbase-objc-usr
-./usr/include/openpgpsdk			base-c-usr
+./usr/include/openpgpsdk			base-obsolete		obsolete
 ./usr/include/opensslbase-c-usr
 ./usr/include/propbase-c-usr
 ./usr/include/protocolsbase-c-usr

Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.169 src/distrib/sets/lists/base/shl.elf:1.170
--- src/distrib/sets/lists/base/shl.elf:1.169	Fri May  1 15:30:46 2009
+++ src/distrib/sets/lists/base/shl.elf	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.169 2009/05/01 15:30:46 christos Exp $
+# $NetBSD: shl.elf,v 1.170 2009/05/01 22:59:52 agc Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -186,8 +186,8 @@
 ./usr/lib/libnetpgp.so.0			base-crypto-shlib	crypto
 ./usr/lib/libobjc.sobase-sys-shlib		gcc
 ./usr/lib/libobjc.so.3base-sys-shlib		gcc
-./usr/lib/libopenpgpsdk.so			base-crypto-shlib	crypto
-./usr/lib/libopenpgpsdk.so.0			base-crypto-shlib	crypto
+./usr/lib/libopenpgpsdk.so			base-obsolete		obsolete
+./usr/lib/libopenpgpsdk.so.0			base-obsolete		obsolete
 ./usr/lib/libossaudio.so			base-sys-shlib
 ./usr/lib/libossaudio.so.1			base-sys-shlib
 ./usr/lib/libp2k.sobase-puffs-shlib

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.467 src/distrib/sets/lists/base/shl.mi:1.468
--- src/distrib/sets/lists/base/shl.mi:1.467	Fri May  1 21:45:45 2009
+++ src/distrib/sets/lists/base/shl.mi	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.467 2009/05/01 21:45:45 perry Exp $
+# $NetBSD: shl.mi,v 1.468 2009/05/01 22:59:52 agc Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -100,7 +100,7 @@
 ./usr/lib/libnetpgp.so.0.9			base-crypto-shlib	crypto
 ./usr/lib/libobjc.so.2.0			base-sys-shlib		gcc=3
 ./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=4
-./usr/lib/libopenpgpsdk.so.0.9			base-crypto-shlib	crypto
+./usr/lib/libopenpgpsdk.so.0.9			base-obsolete		obsolete
 ./usr/lib/libossaudio.so.1.0			base-sys-shlib
 ./usr/lib/libp2k.so.1.0base-puffs-shlib
 ./usr/lib/libpam.so.2.0base-sys-shlib		pam

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1248 src/distrib/sets/lists/comp/mi:1.1249
--- src/distrib/sets/lists/comp/mi:1.1248	Fri May  1 21:49:59 2009
+++ src/distrib/sets/lists/comp/mi	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1248 2009/05/01 21:49:59 perry Exp $
+#	$NetBSD: mi,v 1.1249 2009/05/01 22:59:52 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1664,36 +1664,36 @@
 ./usr/include/objc/sarray.h			comp-c-include
 ./usr/include/objc/thr.h			comp-c-include
 ./usr/include/objc/typedstream.h		comp-c-include
-./usr/includ

CVS commit: src/regress/usr.bin/xlint/lint1

2009-05-01 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri May  1 22:06:07 UTC 2009

Added Files:
src/regress/usr.bin/xlint/lint1: test24.c

Log Message:
add test for c99 for loops


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/regress/usr.bin/xlint/lint1/test24.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/regress/usr.bin/xlint/lint1/test24.c
diff -u /dev/null src/regress/usr.bin/xlint/lint1/test24.c:1.3
--- /dev/null	Fri May  1 18:06:07 2009
+++ src/regress/usr.bin/xlint/lint1/test24.c	Fri May  1 18:06:06 2009
@@ -0,0 +1,10 @@
+/* c99 for loops */
+extern void foo(int);
+
+int
+main(void)
+{
+	for (int i = 0; i < 10; i++)
+		foo(i);
+	return 0;
+}

CVS commit: src/usr.bin/xlint/lint1

2009-05-01 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri May  1 22:03:36 UTC 2009

Modified Files:
src/usr.bin/xlint/lint1: Makefile cgram.y err.c

Log Message:
add variable declarations in for loops for c99


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/xlint/lint1/Makefile \
src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/xlint/lint1/err.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.42 src/usr.bin/xlint/lint1/Makefile:1.43
--- src/usr.bin/xlint/lint1/Makefile:1.42	Tue Apr 14 05:10:00 2009
+++ src/usr.bin/xlint/lint1/Makefile	Fri May  1 18:03:36 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.42 2009/04/14 09:10:00 lukem Exp $
+#	$NetBSD: Makefile,v 1.43 2009/05/01 22:03:36 christos Exp $
 
 .include 
 
@@ -8,6 +8,7 @@
 MAN=		lint.7
 YHEADER=
 #CFLAGS+=-g
+#CPPFLAGS+=-DYYDEBUG=1
 
 CPPFLAGS+=	-I${.CURDIR} -I. -DPASS=\"${PROG}.h\"
 
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.42 src/usr.bin/xlint/lint1/cgram.y:1.43
--- src/usr.bin/xlint/lint1/cgram.y:1.42	Sun Nov 16 02:06:37 2008
+++ src/usr.bin/xlint/lint1/cgram.y	Fri May  1 18:03:36 2009
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.42 2008/11/16 07:06:37 dholland Exp $ */
+/* $NetBSD: cgram.y,v 1.43 2009/05/01 22:03:36 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.42 2008/11/16 07:06:37 dholland Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.43 2009/05/01 22:03:36 christos Exp $");
 #endif
 
 #include 
@@ -107,7 +107,7 @@
 #endif
 %}
 
-%expect 1
+%expect 3
 
 %union {
 	int	y_int;
@@ -1462,7 +1462,13 @@
 	;
 
 for_exprs:
-	  T_FOR T_LPARN opt_expr T_SEMI opt_expr T_SEMI opt_expr T_RPARN {
+	T_FOR T_LPARN declspecs deftyp notype_init_decls T_SEMI opt_expr
+	T_SEMI opt_expr T_RPARN {
+		c99ism(325);
+		for1(NULL, $7, $9);
+		CLRWFLGS(__FILE__, __LINE__);
+	}
+	  | T_FOR T_LPARN opt_expr T_SEMI opt_expr T_SEMI opt_expr T_RPARN {
 		for1($3, $5, $7);
 		CLRWFLGS(__FILE__, __LINE__);
 	  }

Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.40 src/usr.bin/xlint/lint1/err.c:1.41
--- src/usr.bin/xlint/lint1/err.c:1.40	Tue Apr 14 21:20:57 2009
+++ src/usr.bin/xlint/lint1/err.c	Fri May  1 18:03:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: err.c,v 1.40 2009/04/15 01:20:57 christos Exp $	*/
+/*	$NetBSD: err.c,v 1.41 2009/05/01 22:03:36 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.40 2009/04/15 01:20:57 christos Exp $");
+__RCSID("$NetBSD: err.c,v 1.41 2009/05/01 22:03:36 christos Exp $");
 #endif
 
 #include 
@@ -384,6 +384,7 @@
 	"zero sized array is a C99 extension",			  /* 322 */
 	"continue in 'do ... while (0)' loop",			  /* 323 */
 	"suggest cast from '%s' to '%s' on op %s to avoid overflow",  /* 324 */
+	"variable declaration in for loop", 			  /* 325 */
 };
 
 /*

CVS commit: src/distrib/sets/lists/comp

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 21:50:00 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
fix a tyop


To generate a diff of this commit:
cvs rdiff -u -r1.1247 -r1.1248 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1247 src/distrib/sets/lists/comp/mi:1.1248
--- src/distrib/sets/lists/comp/mi:1.1247	Fri May  1 18:02:24 2009
+++ src/distrib/sets/lists/comp/mi	Fri May  1 21:49:59 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1247 2009/05/01 18:02:24 perry Exp $
+#	$NetBSD: mi,v 1.1248 2009/05/01 21:49:59 perry Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7491,7 +7491,7 @@
 ./usr/share/man/cat3/stdarg.0			comp-c-catman		.cat
 ./usr/share/man/cat3/stdio.0			comp-c-catman		.cat
 ./usr/share/man/cat3/stpcpy.0			comp-c-catman		.cat
-./usr/share/man/cat3/stpnpy.0			comp-c-catman		.cat
+./usr/share/man/cat3/stpncpy.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strcasecmp.0		comp-c-catman		.cat
 ./usr/share/man/cat3/strcasestr.0		comp-c-catman		.cat
 ./usr/share/man/cat3/strcat.0			comp-c-catman		.cat

CVS commit: src/usr.bin/xinstall

2009-05-01 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri May  1 21:38:19 UTC 2009

Modified Files:
src/usr.bin/xinstall: install.1

Log Message:
Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/xinstall/install.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xinstall/install.1
diff -u src/usr.bin/xinstall/install.1:1.43 src/usr.bin/xinstall/install.1:1.44
--- src/usr.bin/xinstall/install.1:1.43	Fri May  1 20:16:23 2009
+++ src/usr.bin/xinstall/install.1	Fri May  1 21:38:19 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: install.1,v 1.43 2009/05/01 20:16:23 apb Exp $
+.\"	$NetBSD: install.1,v 1.44 2009/05/01 21:38:19 wiz Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)install.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd January 29, 2003
+.Dd May 1, 2009
 .Dt INSTALL 1
 .Os
 .Sh NAME

CVS commit: src/distrib/sets/lists/base

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 21:45:46 UTC 2009

Modified Files:
src/distrib/sets/lists/base: shl.mi

Log Message:
update libc minor number


To generate a diff of this commit:
cvs rdiff -u -r1.466 -r1.467 src/distrib/sets/lists/base/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.466 src/distrib/sets/lists/base/shl.mi:1.467
--- src/distrib/sets/lists/base/shl.mi:1.466	Fri May  1 15:30:46 2009
+++ src/distrib/sets/lists/base/shl.mi	Fri May  1 21:45:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.466 2009/05/01 15:30:46 christos Exp $
+# $NetBSD: shl.mi,v 1.467 2009/05/01 21:45:45 perry Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -13,7 +13,7 @@
 #
 # Note:	libtermcap and libtermlib are hardlinked and share the same version.
 #
-./lib/libc.so.12.166base-sys-shlib		dynamicroot
+./lib/libc.so.12.167base-sys-shlib		dynamicroot
 ./lib/libcrypt.so.1.0base-sys-shlib		dynamicroot
 ./lib/libcrypto.so.5.0base-crypto-shlib	crypto,dynamicroot
 ./lib/libdevmapper.so.1.0			base-lvm-shlib		lvm,dynamicroot
@@ -60,7 +60,7 @@
 ./usr/lib/libbluetooth.so.4.0			base-sys-shlib
 ./usr/lib/libbsdmalloc.so.0.0			base-sys-shlib
 ./usr/lib/libbz2.so.1.1base-sys-shlib
-./usr/lib/libc.so.12.166			base-sys-shlib
+./usr/lib/libc.so.12.167			base-sys-shlib
 ./usr/lib/libcom_err.so.6.0			base-krb5-shlib		kerberos
 ./usr/lib/libcrypt.so.1.0			base-sys-shlib
 ./usr/lib/libcrypto.so.5.0			base-crypto-shlib	crypto

CVS commit: src/lib/libc/time

2009-05-01 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri May  1 21:34:45 UTC 2009

Modified Files:
src/lib/libc/time: strptime.3

Log Message:
Drop trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/time/strptime.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/strptime.3
diff -u src/lib/libc/time/strptime.3:1.24 src/lib/libc/time/strptime.3:1.25
--- src/lib/libc/time/strptime.3:1.24	Fri May  1 20:15:05 2009
+++ src/lib/libc/time/strptime.3	Fri May  1 21:34:45 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strptime.3,v 1.24 2009/05/01 20:15:05 ginsbach Exp $
+.\"	$NetBSD: strptime.3,v 1.25 2009/05/01 21:34:45 wiz Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -267,7 +267,7 @@
 .Dq A
 through
 .Dq I
-and 
+and
 .Dq K
 through
 .Dq Y .

CVS commit: src/doc

2009-05-01 Thread Alan Barrett

Module Name:src
Committed By:   apb
Date:   Fri May  1 20:53:20 UTC 2009

Modified Files:
src/doc: CHANGES

Log Message:
Mention sha256 changes in install(1) and build system.
Also reformat previous entry to fix a long line.


To generate a diff of this commit:
cvs rdiff -u -r1.1218 -r1.1219 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1218 src/doc/CHANGES:1.1219
--- src/doc/CHANGES:1.1218	Thu Apr 30 18:13:01 2009
+++ src/doc/CHANGES	Fri May  1 20:53:19 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1218 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1219 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -186,6 +186,10 @@
 	sdmmc(4): Add a driver for SD/MMC from OpenBSD. [nonaka 20090421]
 	zx(4): Add wscons support [macallan 20090423]
 	dhcpcd(8): Import dhcpcd-5.0.0. [roy 20090428]
-	hppa: Merge the nick-hppapmap branch which includes a port of the OpenBSD
-		pmap, improves support for machines without the PA7100LC or
-		PA7300LC CPUs, and much more.  [skrll 20090429]
+	hppa: Merge the nick-hppapmap branch which includes a port of the
+		OpenBSD pmap, improves support for machines without the
+		PA7100LC or PA7300LC CPUs, and much more.  [skrll 20090429]
+	install(1): Add support for writing sha256, sha384, or sha512 hashes
+		to a METALOG.  [apb 20090501]
+	build: Use sha256 instead of sha1 hashes in METALOG and
+		/etc/mtree/set.* files.  [apb 20090501]

CVS commit: src/share/mk

2009-05-01 Thread Alan Barrett

Module Name:src
Committed By:   apb
Date:   Fri May  1 20:47:53 UTC 2009

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Switch from sha1 to sha256 in the METALOG.  The same information
also ends up in /etc/mtree/set.* after installation.


To generate a diff of this commit:
cvs rdiff -u -r1.561 -r1.562 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.561 src/share/mk/bsd.own.mk:1.562
--- src/share/mk/bsd.own.mk:1.561	Fri Apr 10 16:14:54 2009
+++ src/share/mk/bsd.own.mk	Fri May  1 20:47:53 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.561 2009/04/10 16:14:54 bouyer Exp $
+#	$NetBSD: bsd.own.mk,v 1.562 2009/05/01 20:47:53 apb Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -749,7 +749,7 @@
 METALOG.add?=	${TOOL_CAT} -l >> ${METALOG}
 .if (${_SRC_TOP_} != "")	# only set INSTPRIV if inside ${NETBSDSRCDIR}
 .if ${MKUNPRIVED} != "no"
-INSTPRIV.unpriv=-U -M ${METALOG} -D ${DESTDIR} -h sha1
+INSTPRIV.unpriv=-U -M ${METALOG} -D ${DESTDIR} -h sha256
 .else
 INSTPRIV.unpriv=
 .endif

CVS commit: src/sys/dev/raidframe

2009-05-01 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri May  1 20:43:41 UTC 2009

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Use device_t, cfdata_t, device_private().


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 src/sys/dev/raidframe/rf_netbsdkintf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.260 src/sys/dev/raidframe/rf_netbsdkintf.c:1.261
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.260	Fri Apr  3 16:23:41 2009
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Fri May  1 20:43:41 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.260 2009/04/03 16:23:41 sborrill Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.261 2009/05/01 20:43:41 dyoung Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -139,7 +139,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.260 2009/04/03 16:23:41 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.261 2009/05/01 20:43:41 dyoung Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -218,9 +218,9 @@
 static void raidinit(RF_Raid_t *);
 
 void raidattach(int);
-static int raid_match(struct device *, struct cfdata *, void *);
-static void raid_attach(struct device *, struct device *, void *);
-static int raid_detach(struct device *, int);
+static int raid_match(device_t, cfdata_t, void *);
+static void raid_attach(device_t, device_t, void *);
+static int raid_detach(device_t, int);
 
 dev_type_open(raidopen);
 dev_type_close(raidclose);
@@ -248,7 +248,7 @@
 */
 
 struct raid_softc {
-	struct device *sc_dev;
+	device_t sc_dev;
 	int sc_flags;	/* flags */
 	int sc_cflags;	/* configuration flags */
 	uint64_t sc_size;	/* size of the raid device */
@@ -312,7 +312,7 @@
 void rf_RewriteParityThread(RF_Raid_t *raidPtr);
 void rf_CopybackThread(RF_Raid_t *raidPtr);
 void rf_ReconstructInPlaceThread(struct rf_recon_req *);
-int rf_autoconfig(struct device *self);
+int rf_autoconfig(device_t);
 void rf_buildroothack(RF_ConfigSet_t *);
 
 RF_AutoConfig_t *rf_find_raid_components(void);
@@ -417,7 +417,7 @@
 }
 
 int
-rf_autoconfig(struct device *self)
+rf_autoconfig(device_t self)
 {
 	RF_AutoConfig_t *ac_list;
 	RF_ConfigSet_t *config_sets;
@@ -2847,7 +2847,7 @@
 {
 	struct vnode *vp;
 	struct disklabel label;
-	struct device *dv;
+	device_t dv;
 	dev_t dev;
 	int bmajor, bminor, wedge;
 	int error;
@@ -3598,24 +3598,22 @@
 }
 
 static int
-raid_match(struct device *self, struct cfdata *cfdata,
-void *aux)
+raid_match(device_t self, cfdata_t cfdata, void *aux)
 {
 	return 1;
 }
 
 static void
-raid_attach(struct device *parent, struct device *self,
-void *aux)
+raid_attach(device_t parent, device_t self, void *aux)
 {
 
 }
 
 
 static int
-raid_detach(struct device *self, int flags)
+raid_detach(device_t self, int flags)
 {
-	struct raid_softc *rs = (struct raid_softc *)self;
+	struct raid_softc *rs = device_private(self);
 
 	if (rs->sc_flags & RAIDF_INITED)
 		return EBUSY;

CVS commit: src/usr.bin/xinstall

2009-05-01 Thread Alan Barrett

Module Name:src
Committed By:   apb
Date:   Fri May  1 20:16:23 UTC 2009

Modified Files:
src/usr.bin/xinstall: install.1 xinstall.c

Log Message:
Add support for writing sha256, sha384, and sha512 digests to
a metalog.  mtree(8) has supported these for a long time.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/xinstall/install.1
cvs rdiff -u -r1.108 -r1.109 src/usr.bin/xinstall/xinstall.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xinstall/install.1
diff -u src/usr.bin/xinstall/install.1:1.42 src/usr.bin/xinstall/install.1:1.43
--- src/usr.bin/xinstall/install.1:1.42	Thu Jan 29 11:17:37 2004
+++ src/usr.bin/xinstall/install.1	Fri May  1 20:16:23 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: install.1,v 1.42 2004/01/29 11:17:37 wiz Exp $
+.\"	$NetBSD: install.1,v 1.43 2009/05/01 20:16:23 apb Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -249,6 +249,18 @@
 The RMD-160 cryptographic message digest.
 .It Sy sha1
 The SHA-1 cryptographic message digest.
+.It Sy sha256
+The 256-bits
+.Tn SHA-2
+cryptographic message digest of the file.
+.It Sy sha384
+The 384-bits
+.Tn SHA-2
+cryptographic message digest of the file.
+.It Sy sha512
+The 512-bits
+.Tn SHA-2
+cryptographic message digest of the file.
 .El
 .It Fl l Ar linkflags
 Instead of copying the file make a link to the source.

Index: src/usr.bin/xinstall/xinstall.c
diff -u src/usr.bin/xinstall/xinstall.c:1.108 src/usr.bin/xinstall/xinstall.c:1.109
--- src/usr.bin/xinstall/xinstall.c:1.108	Fri Apr 17 06:09:08 2009
+++ src/usr.bin/xinstall/xinstall.c	Fri May  1 20:16:23 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: xinstall.c,v 1.108 2009/04/17 06:09:08 apb Exp $	*/
+/*	$NetBSD: xinstall.c,v 1.109 2009/05/01 20:16:23 apb Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.108 2009/04/17 06:09:08 apb Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.109 2009/05/01 20:16:23 apb Exp $");
 #endif
 #endif /* not lint */
 
@@ -75,6 +75,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "pathnames.h"
 #include "mtree.h"
@@ -102,6 +103,9 @@
 	DIGEST_MD5,
 	DIGEST_RMD160,
 	DIGEST_SHA1,
+	DIGEST_SHA256,
+	DIGEST_SHA384,
+	DIGEST_SHA512,
 } digesttype = DIGEST_NONE;
 char	*digest;
 
@@ -294,6 +298,12 @@
 			digesttype = DIGEST_RMD160;
 		} else if (strcmp(digest, "sha1") == 0) {
 			digesttype = DIGEST_SHA1;
+		} else if (strcmp(digest, "sha256") == 0) {
+			digesttype = DIGEST_SHA256;
+		} else if (strcmp(digest, "sha384") == 0) {
+			digesttype = DIGEST_SHA384;
+		} else if (strcmp(digest, "sha512") == 0) {
+			digesttype = DIGEST_SHA512;
 		} else {
 			warnx("unknown digest `%s'", digest);
 			usage();
@@ -509,6 +519,15 @@
 case DIGEST_SHA1:
 	dres = SHA1File(from_name, NULL);
 	break;
+case DIGEST_SHA256:
+	dres = SHA256_File(from_name, NULL);
+	break;
+case DIGEST_SHA384:
+	dres = SHA384_File(from_name, NULL);
+	break;
+case DIGEST_SHA512:
+	dres = SHA512_File(from_name, NULL);
+	break;
 default:
 	dres = NULL;
 }
@@ -793,6 +812,9 @@
 	MD5_CTX		ctxMD5;
 	RMD160_CTX	ctxRMD160;
 	SHA1_CTX	ctxSHA1;
+	SHA256_CTX	ctxSHA256;
+	SHA384_CTX	ctxSHA384;
+	SHA512_CTX	ctxSHA512;
 
 	switch (digesttype) {
 	case DIGEST_MD5:
@@ -804,6 +826,15 @@
 	case DIGEST_SHA1:
 		SHA1Init(&ctxSHA1);
 		break;
+	case DIGEST_SHA256:
+		SHA256_Init(&ctxSHA256);
+		break;
+	case DIGEST_SHA384:
+		SHA384_Init(&ctxSHA384);
+		break;
+	case DIGEST_SHA512:
+		SHA512_Init(&ctxSHA512);
+		break;
 	case DIGEST_NONE:
 		if (to_fd < 0)
 			return NULL; /* no need to do anything */
@@ -850,6 +881,15 @@
 			case DIGEST_SHA1:
 SHA1Update(&ctxSHA1, p, size);
 break;
+			case DIGEST_SHA256:
+SHA256_Update(&ctxSHA256, p, size);
+break;
+			case DIGEST_SHA384:
+SHA384_Update(&ctxSHA384, p, size);
+break;
+			case DIGEST_SHA512:
+SHA512_Update(&ctxSHA512, p, size);
+break;
 			default:
 break;
 			}
@@ -874,6 +914,15 @@
 case DIGEST_SHA1:
 	SHA1Update(&ctxSHA1, buf, nr);
 	break;
+case DIGEST_SHA256:
+	SHA256_Update(&ctxSHA256, buf, nr);
+	break;
+case DIGEST_SHA384:
+	SHA384_Update(&ctxSHA384, buf, nr);
+	break;
+case DIGEST_SHA512:
+	SHA512_Update(&ctxSHA512, buf, nr);
+	break;
 default:
 	break;
 }
@@ -892,6 +941,12 @@
 		return RMD160End(&ctxRMD160, NULL);
 	case DIGEST_SHA1:
 		return SHA1End(&ctxSHA1, NULL);
+	case DIGEST_SHA256:
+		return SHA256_End(&ctxSHA256, NULL);
+	case DIGEST_SHA384:
+		return SHA384_End(&ctxSHA384, NULL);
+	case DIGEST_SHA512:
+		return SHA512_End(&ctxSHA512, NULL);
 	default:
 		return NULL;
 	}

CVS commit: src/lib/libc/time

2009-05-01 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Fri May  1 20:15:05 UTC 2009

Modified Files:
src/lib/libc/time: strptime.3 strptime.c

Log Message:
Extend %z to support all RFC-2822 timezone formats.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/time/strptime.3
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/strptime.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/strptime.3
diff -u src/lib/libc/time/strptime.3:1.23 src/lib/libc/time/strptime.3:1.24
--- src/lib/libc/time/strptime.3:1.23	Mon Mar  9 19:24:27 2009
+++ src/lib/libc/time/strptime.3	Fri May  1 20:15:05 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: strptime.3,v 1.23 2009/03/09 19:24:27 joerg Exp $
+.\"	$NetBSD: strptime.3,v 1.24 2009/05/01 20:15:05 ginsbach Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 4, 2008
+.Dd April 30, 2009
 .Dt STRPTIME 3
 .Os
 .Sh NAME
@@ -188,9 +188,11 @@
 If it has fewer than four days in the new year, then it is considered
 the last week of the previous year.
 Weeks are numbered from 1 to 53.
+.Po
 A
 .Nx
 extension.
+.Pc
 .It Cm \&%w
 the weekday as a decimal number [0,6], with 0 representing Sunday;
 leading zeros are permitted but not required.
@@ -211,17 +213,64 @@
 .It Cm \&%Y
 the year, including the century (i.e., 1996).
 .It Cm \&%z
-an ISO 8601 timezone specification.
-This is either,
+an ISO 8601 or RFC-2822 timezone specification.
+This is one of the following:
+the offset from
+Coordinated Universal Time
+.Pq Ql UTC
+specified as:
+.Dq [+-]hhmm ,
+.Dq [+-]hh:mm ,
+or
+.Dq [+-]hh ;
+.Ql UTC
+specified as:
+.Dq GMT
+.Pq Ql Greenwich Mean Time ,
+.Dq UT
+.Pq Ql Universal Time ,
+or
 .Dq Z
-for
-.Ql UTC ,
-or the offset specified as:
-.Dq [+-]hhmm
+.Pq Ql Zulu Time ;
+a three character US timezone specified as:
+.Dq EDT ,
+.Dq EST ,
+.Dq CDT ,
+.Dq CST ,
+.Dq MDT ,
+.Dq MST ,
+.Dq PDT ,
 or
-.Dq [+-]hh:mm
+.Dq PST ,
+with the first letter standing for
+.Ql Eastern
+.Pq Dq E ,
+.Ql Central
+.Pq Dq C ,
+.Ql Mountain
+.Pq Dq M
+or
+.Ql Pacific
+.Pq Dq P ,
+and the second letter standing for
+.Ql Daylight
+.Po
+.Dq D
+or summer
+.Pc
+time
 or
-.Dq [+-]hh .
+.Ql Standard
+.Pq Dq S
+time;
+a single letter military timezone specified as:
+.Dq A
+through
+.Dq I
+and 
+.Dq K
+through
+.Dq Y .
 .Po
 A
 .Nx

Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.31 src/lib/libc/time/strptime.c:1.32
--- src/lib/libc/time/strptime.c:1.31	Tue Nov  4 21:08:33 2008
+++ src/lib/libc/time/strptime.c	Fri May  1 20:15:05 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: strptime.c,v 1.31 2008/11/04 21:08:33 christos Exp $	*/
+/*	$NetBSD: strptime.c,v 1.32 2009/05/01 20:15:05 ginsbach Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.31 2008/11/04 21:08:33 christos Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.32 2009/05/01 20:15:05 ginsbach Exp $");
 #endif
 
 #include "namespace.h"
@@ -59,6 +59,13 @@
 
 static char gmt[] = { "GMT" };
 static char utc[] = { "UTC" };
+/* RFC-822/RFC-2822 */
+static const char * const nast[5] = {
+   "EST","CST","MST","PST","\0\0\0"
+};
+static const char * const nadt[5] = {
+   "EDT","CDT","MDT","PDT","\0\0\0"
+};
 
 static const u_char *conv_num(const unsigned char *, int *, uint, uint);
 static const u_char *find_string(const u_char *, int *, const char * const *,
@@ -69,8 +76,8 @@
 strptime(const char *buf, const char *fmt, struct tm *tm)
 {
 	unsigned char c;
-	const unsigned char *bp;
-	int alt_format, i, split_year = 0, neg, offs;
+	const unsigned char *bp, *ep;
+	int alt_format, i, split_year = 0, neg = 0, offs;
 	const char *new_fmt;
 
 	bp = (const u_char *)buf;
@@ -320,8 +327,6 @@
 #endif
 bp += 3;
 			} else {
-const unsigned char *ep;
-
 ep = find_string(bp, &i,
 	   	 (const char * const *)tzname,
 	   	  NULL, 2);
@@ -345,11 +350,29 @@
 			 * [+-]hhmm
 			 * [+-]hh:mm
 			 * [+-]hh
+			 * We recognize all RFC-822/RFC-2822 formats:
+			 * UT|GMT
+			 *  North American : UTC offsets
+			 * E[DS]T = Eastern : -4 | -5
+			 * C[DS]T = Central : -5 | -6
+			 * M[DS]T = Mountain: -6 | -7
+			 * P[DS]T = Pacific : -7 | -8
+			 *  Military
+			 * [A-IL-M] = -1 ... -9 (J not used)
+			 * [N-Y]  = +1 ... +12
 			 */
 			while (isspace(*bp))
 bp++;
 
 			switch (*bp++) {
+			case 'G':
+if (*bp++ != 'M')
+	return NULL;
+/*FALLTHROUGH*/
+			case 'U':
+if (*bp++ != 'T')
+	return NULL;
+/*FALLTHROUGH*/
 			case 'Z':
 tm->tm_isdst = 0;
 #ifdef TM_GMTOFF
@@ -366,6 +389,49 @@
 neg = 1;
 break;

CVS commit: src/include

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 20:01:23 UTC 2009

Modified Files:
src/include: string.h

Log Message:
note that we have strsignal but it is in the wrong include file.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/include/string.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/string.h
diff -u src/include/string.h:1.37 src/include/string.h:1.38
--- src/include/string.h:1.37	Fri May  1 17:16:49 2009
+++ src/include/string.h	Fri May  1 20:01:23 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.37 2009/05/01 17:16:49 perry Exp $	*/
+/*	$NetBSD: string.h,v 1.38 2009/05/01 20:01:23 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -88,8 +88,9 @@
  * For POSIX compliance, we still need:
  * strcoll_l
  * strerror_l
- * strsignal
  * strxfrm_l
+ *
+ * and strsignal needs to be moved from unistd.h to here.
  */
 #endif

CVS commit: src

2009-05-01 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri May  1 19:42:18 UTC 2009

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc
src/external/mit/xorg/lib/freetype: Makefile

Log Message:
Introduce MKSUBPIXEL, which allows enabling subpixel rendering code
in FreeType.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/BUILDING
cvs rdiff -u -r1.71 -r1.72 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/freetype/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.82 src/BUILDING:1.83
--- src/BUILDING:1.82	Tue Dec  2 22:28:21 2008
+++ src/BUILDING	Fri May  1 19:42:18 2009
@@ -295,6 +295,12 @@
 
  Default: ``no''
 
+ MKSUBPIXEL  Can be set to ``yes'' or ``no''.  For X builds, decides if
+ subpixel rendering code in FreeType is turned on.  Turned off
+ by default because of patent issues.
+
+ Default: ``no''
+
  MKTTINTERP  Can be set to ``yes'' or ``no''.  For X builds, decides if
  the TrueType bytecode interpreter is turned on.  See
  http://www.freetype.org/patents.html for details.
@@ -900,4 +906,4 @@
  The build.sh based build scheme was introduced for NetBSD 1.6 as
  USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that.
 
-NetBSDSeptember 10, 2008NetBSD
+NetBSDMay 1, 2009   NetBSD

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.71 src/doc/BUILDING.mdoc:1.72
--- src/doc/BUILDING.mdoc:1.71	Tue Dec  2 22:28:21 2008
+++ src/doc/BUILDING.mdoc	Fri May  1 19:42:18 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.71 2008/12/02 22:28:21 mrg Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.72 2009/05/01 19:42:18 snj Exp $
 .\"
 .\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd September 10, 2008
+.Dd May 1, 2009
 .Dt BUILDING 8
 .Os NetBSD
 .
@@ -541,6 +541,13 @@
 .Xr ident 1 .
 .DFLTn
 .
+.It Sy MKSUBPIXEL
+.YorN
+For X builds, decides if subpixel rendering code in FreeType
+is turned on.
+Turned off by default because of patent issues.
+.DFLTn
+.
 .It Sy MKTTINTERP
 .YorN
 For X builds, decides if the TrueType bytecode interpreter

Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.4 src/external/mit/xorg/lib/freetype/Makefile:1.5
--- src/external/mit/xorg/lib/freetype/Makefile:1.4	Mon Apr 13 18:58:08 2009
+++ src/external/mit/xorg/lib/freetype/Makefile	Fri May  1 19:42:18 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/04/13 18:58:08 snj Exp $
+#	$NetBSD: Makefile,v 1.5 2009/05/01 19:42:18 snj Exp $
 
 .include 
 
@@ -83,6 +83,10 @@
 		-I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
 		-I${X11SRCDIR.${LIB}}/include
 
+.if defined(MKSUBPIXEL) && ${MKSUBPIXEL} != "no"
+CPPFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
+.endif
+
 .if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
 CPPFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
 .endif

CVS commit: src/distrib/sets/lists/comp

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 18:02:24 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
add stpcpy, stpncpy, strnlen pages.
also sort


To generate a diff of this commit:
cvs rdiff -u -r1.1246 -r1.1247 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1246 src/distrib/sets/lists/comp/mi:1.1247
--- src/distrib/sets/lists/comp/mi:1.1246	Sat Apr 25 05:54:50 2009
+++ src/distrib/sets/lists/comp/mi	Fri May  1 18:02:24 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1246 2009/04/25 05:54:50 agc Exp $
+#	$NetBSD: mi,v 1.1247 2009/05/01 18:02:24 perry Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1624,6 +1624,7 @@
 ./usr/include/netns/spp_debug.h			comp-obsolete		obsolete
 ./usr/include/netns/spp_timer.h			comp-obsolete		obsolete
 ./usr/include/netns/spp_var.h			comp-obsolete		obsolete
+./usr/include/netpgp.hcomp-c-include		crypto
 ./usr/include/nfs/krpc.h			comp-c-include
 ./usr/include/nfs/nfs.hcomp-c-include
 ./usr/include/nfs/nfs_var.h			comp-obsolete		obsolete
@@ -1663,7 +1664,6 @@
 ./usr/include/objc/sarray.h			comp-c-include
 ./usr/include/objc/thr.h			comp-c-include
 ./usr/include/objc/typedstream.h		comp-c-include
-./usr/include/netpgp.hcomp-c-include		crypto
 ./usr/include/openpgpsdk/accumulate.h		comp-c-include		crypto
 ./usr/include/openpgpsdk/armour.h		comp-c-include		crypto
 ./usr/include/openpgpsdk/callback.h		comp-c-include		crypto
@@ -7490,6 +7490,8 @@
 ./usr/share/man/cat3/stat_flags.0		comp-c-catman		.cat
 ./usr/share/man/cat3/stdarg.0			comp-c-catman		.cat
 ./usr/share/man/cat3/stdio.0			comp-c-catman		.cat
+./usr/share/man/cat3/stpcpy.0			comp-c-catman		.cat
+./usr/share/man/cat3/stpnpy.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strcasecmp.0		comp-c-catman		.cat
 ./usr/share/man/cat3/strcasestr.0		comp-c-catman		.cat
 ./usr/share/man/cat3/strcat.0			comp-c-catman		.cat
@@ -7517,6 +7519,7 @@
 ./usr/share/man/cat3/strncmp.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strncpy.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strndup.0			comp-c-catman		.cat
+./usr/share/man/cat3/strnlen.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strpbrk.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strptime.0			comp-c-catman		.cat
 ./usr/share/man/cat3/strrchr.0			comp-c-catman		.cat
@@ -12798,6 +12801,8 @@
 ./usr/share/man/html3/stat_flags.html		comp-c-htmlman		html
 ./usr/share/man/html3/stdarg.html		comp-c-htmlman		html
 ./usr/share/man/html3/stdio.html		comp-c-htmlman		html
+./usr/share/man/html3/stpcpy.html		comp-c-htmlman		html
+./usr/share/man/html3/stpncpy.html		comp-c-htmlman		html
 ./usr/share/man/html3/strcasecmp.html		comp-c-htmlman		html
 ./usr/share/man/html3/strcasestr.html		comp-c-htmlman		html
 ./usr/share/man/html3/strcat.html		comp-c-htmlman		html
@@ -12825,6 +12830,7 @@
 ./usr/share/man/html3/strncmp.html		comp-c-htmlman		html
 ./usr/share/man/html3/strncpy.html		comp-c-htmlman		html
 ./usr/share/man/html3/strndup.html		comp-c-htmlman		html
+./usr/share/man/html3/strnlen.html		comp-c-htmlman		html
 ./usr/share/man/html3/strpbrk.html		comp-c-htmlman		html
 ./usr/share/man/html3/strptime.html		comp-c-htmlman		html
 ./usr/share/man/html3/strrchr.html		comp-c-htmlman		html
@@ -18145,6 +18151,8 @@
 ./usr/share/man/man3/stat_flags.3		comp-c-man		.man
 ./usr/share/man/man3/stdarg.3			comp-c-man		.man
 ./usr/share/man/man3/stdio.3			comp-c-man		.man
+./usr/share/man/man3/stpcpy.3			comp-c-man		.man
+./usr/share/man/man3/stpncpy.3			comp-c-man		.man
 ./usr/share/man/man3/strcasecmp.3		comp-c-man		.man
 ./usr/share/man/man3/strcasestr.3		comp-c-man		.man
 ./usr/share/man/man3/strcat.3			comp-c-man		.man
@@ -18172,6 +18180,7 @@
 ./usr/share/man/man3/strncmp.3			comp-c-man		.man
 ./usr/share/man/man3/strncpy.3			comp-c-man		.man
 ./usr/share/man/man3/strndup.3			comp-c-man		.man
+./usr/share/man/man3/strnlen.3			comp-c-man		.man
 ./usr/share/man/man3/strpbrk.3			comp-c-man		.man
 ./usr/share/man/man3/strptime.3			comp-c-man		.man
 ./usr/share/man/man3/strrchr.3			comp-c-man		.man

CVS commit: src/share/tmac

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 17:52:27 UTC 2009

Modified Files:
src/share/tmac: doc2html

Log Message:
add support for St -p1003.1-2008


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/share/tmac/doc2html

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/tmac/doc2html
diff -u src/share/tmac/doc2html:1.59 src/share/tmac/doc2html:1.60
--- src/share/tmac/doc2html:1.59	Sun Sep 14 20:29:10 2008
+++ src/share/tmac/doc2html	Fri May  1 17:52:27 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: doc2html,v 1.59 2008/09/14 20:29:10 apb Exp $
+.\" $NetBSD: doc2html,v 1.60 2009/05/01 17:52:27 perry Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1198,6 +1198,11 @@
 .			as std-tmp1 " \"exactly one space
 .			as std-tmp1 (``\\*(Px.1'')
 .		\}
+.		if "\\$1"-p1003.1-2008" \{\
+.			ds std-tmp1 \&IEEE Std 1003.1-2008
+.			as std-tmp1 " \"exactly one space
+.			as std-tmp1 (``\\*(Px.1'')
+.		\}
 .\" POSIX Part 2: Shell and Utilities
 .		if "\\$1"-p1003.2" \{\
 .			ds std-tmp1 \&IEEE Std 1003.2

CVS commit: src/gnu/dist/groff/tmac

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 17:31:56 UTC 2009

Modified Files:
src/gnu/dist/groff/tmac: doc-syms

Log Message:
add a POSIX 2008 macro


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/gnu/dist/groff/tmac/doc-syms

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/gnu/dist/groff/tmac/doc-syms
diff -u src/gnu/dist/groff/tmac/doc-syms:1.11 src/gnu/dist/groff/tmac/doc-syms:1.12
--- src/gnu/dist/groff/tmac/doc-syms:1.11	Sat Jun  9 10:19:43 2007
+++ src/gnu/dist/groff/tmac/doc-syms	Fri May  1 17:31:56 2009
@@ -567,6 +567,8 @@
 .as doc-str-St--p1003.1-2001   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-2004   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004
 .as doc-str-St--p1003.1-2004   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
+.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .
 .\" POSIX Part 2: Shell and Utilities
 .ds doc-str-St--p1003.2\*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2

CVS commit: src/lib/libc

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 17:27:01 UTC 2009

Modified Files:
src/lib/libc: shlib_version
src/lib/libc/string: Makefile.inc strcpy.3 string.3 strlen.3 wmemchr.3
Added Files:
src/lib/libc/string: stpcpy.c stpncpy.c strnlen.c

Log Message:
Add versions of stpcpy(3), stpncpy(3), strnlen(3), all from FreeBSD.
These are defined in the latest POSIX

Also make related updates to documentation, mostly from FreeBSD,
though I cleaned a few other things up along the way.

Bump shlib_version.

We are still missing strcoll_l, strerror_l, strsignal, strxfrm_l to be
POSIX conformant.


To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/lib/libc/shlib_version
cvs rdiff -u -r1.70 -r1.71 src/lib/libc/string/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/string/stpcpy.c \
src/lib/libc/string/stpncpy.c src/lib/libc/string/strnlen.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/string/strcpy.3
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/string/string.3
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/string/strlen.3
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/string/wmemchr.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/shlib_version
diff -u src/lib/libc/shlib_version:1.210 src/lib/libc/shlib_version:1.211
--- src/lib/libc/shlib_version:1.210	Sun Apr 12 17:07:16 2009
+++ src/lib/libc/shlib_version	Fri May  1 17:27:01 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.210 2009/04/12 17:07:16 christos Exp $
+#	$NetBSD: shlib_version,v 1.211 2009/05/01 17:27:01 perry Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 # things we wish to do on next major version bump:
@@ -35,4 +35,4 @@
 #   it's insufficient bitwidth to implement all ctype class.
 #   see isblank's comment in ctype.h.
 major=12
-minor=166
+minor=167

Index: src/lib/libc/string/Makefile.inc
diff -u src/lib/libc/string/Makefile.inc:1.70 src/lib/libc/string/Makefile.inc:1.71
--- src/lib/libc/string/Makefile.inc:1.70	Fri Apr 10 23:13:38 2009
+++ src/lib/libc/string/Makefile.inc	Fri May  1 17:27:01 2009
@@ -1,11 +1,13 @@
 #	from: @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$NetBSD: Makefile.inc,v 1.70 2009/04/10 23:13:38 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.71 2009/05/01 17:27:01 perry Exp $
 
 # string sources
 .PATH: ${ARCHDIR}/string ${.CURDIR}/string
 
-SRCS+=	bm.c strcasecmp.c strncasecmp.c strcasestr.c strcoll.c strdup.c \
-	strerror.c strlcat.c strlcpy.c strmode.c strsignal.c strtok.c \
+SRCS+=	bm.c stpcpy.c stpncpy.c \
+	strcasecmp.c strncasecmp.c strcasestr.c strcoll.c strdup.c \
+	strerror.c strlcat.c strlcpy.c strnlen.c \
+	strmode.c strsignal.c strtok.c \
 	strtok_r.c strxfrm.c __strsignal.c strerror_r.c strndup.c \
 	stresep.c memrchr.c
 
@@ -66,8 +68,9 @@
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
-MLINKS+=strcpy.3 strncpy.3
+MLINKS+=strcpy.3 strncpy.3 strcpy.3 stpcpy.3 strcpy.3 stpncpy.3
 MLINKS+=strlcpy.3 strlcat.3
+MLINKS+=strlen.3 strnlen.3
 MLINKS+=strstr.3 strcasestr.3
 MLINKS+=memchr.3 memrchr.3
 MLINKS+=strtok.3 strtok_r.3

Index: src/lib/libc/string/strcpy.3
diff -u src/lib/libc/string/strcpy.3:1.17 src/lib/libc/string/strcpy.3:1.18
--- src/lib/libc/string/strcpy.3:1.17	Mon Oct 16 08:48:45 2006
+++ src/lib/libc/string/strcpy.3	Fri May  1 17:27:01 2009
@@ -30,12 +30,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\" from: @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\"	$NetBSD: strcpy.3,v 1.17 2006/10/16 08:48:45 wiz Exp $
+.\"	$NetBSD: strcpy.3,v 1.18 2009/05/01 17:27:01 perry Exp $
 .\"
-.Dd May 6, 2002
+.Dd May 1, 2009
 .Dt STRCPY 3
 .Os
 .Sh NAME
+.Nm stpcpy ,
+.Nm stpncpy ,
 .Nm strcpy ,
 .Nm strncpy
 .Nd copy strings
@@ -44,14 +46,18 @@
 .Sh SYNOPSIS
 .In string.h
 .Ft char *
+.Fn stpcpy "char * restrict dst" "const char * restrict src"
+.Ft char *
+.Fn stpncpy "char * restrict dst" "const char * restrict src" "size_t len"
+.Ft char *
 .Fn strcpy "char * restrict dst" "const char * restrict src"
 .Ft char *
 .Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len"
 .Sh DESCRIPTION
 The
-.Fn strcpy
+.Fn stpcpy
 and
-.Fn strncpy
+.Fn strcpy
 functions
 copy the string
 .Fa src
@@ -62,26 +68,30 @@
 character).
 .Pp
 The
+.Fn stpncpy
+and
 .Fn strncpy
-function copies not more than
+functions copy at most
 .Fa len
-characters into
-.Fa dst ,
-appending
-.Ql \e0
-characters if
+characters from
+.Fa src
+into
+.Fa dst .
+If
 .Fa src
 is less than
 .Fa len
-characters long, and
-.Em not
-terminating
+characters long,
+the remainder of
+.Fa dst
+is filled with
+.Ql \e0
+characters.
+Otherwise,
 .Fa dst
-if
-.Fa src
 is
-.Fa len
-or more characters long.
+.Em not
+terminated.
 .Sh RETURN VALUES
 The
 .Fn strcpy
@@ -90,64 +100,105 @@
 functions
 return
 .Fa dst .
+The
+.Fn stpcpy
+and
+.Fn stpncpy
+functions return a pointer to the terminating
+.Ql \e0
+character of
+.Fa dst .
+If
+.Fn stpncpy
+does not termina

CVS commit: src/include

2009-05-01 Thread Perry E. Metzger

Module Name:src
Committed By:   perry
Date:   Fri May  1 17:16:49 UTC 2009

Modified Files:
src/include: string.h

Log Message:
Add prototypes for stpcpy, stpncpy, strnlen, added in the latest POSIX.

Implementations in libc to follow.

For POSIX compliance, we are still missing:

strcoll_l
strerror_l
strsignal
strxfrm_l


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/include/string.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/string.h
diff -u src/include/string.h:1.36 src/include/string.h:1.37
--- src/include/string.h:1.36	Fri Apr 10 23:00:53 2009
+++ src/include/string.h	Fri May  1 17:16:49 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.36 2009/04/10 23:00:53 christos Exp $	*/
+/*	$NetBSD: string.h,v 1.37 2009/05/01 17:16:49 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -79,6 +79,20 @@
 char	*strdup(const char *);
 #endif
 
+#if (_POSIX_C_SOURCE - 0 >= 200809L) || (_XOPEN_SOURCE - 0 >= 700) || \
+defined(_NETBSD_SOURCE)
+char	*stpcpy(char * __restrict, const char * __restrict);
+char	*stpncpy(char * __restrict, const char * __restrict, size_t);
+size_t	strnlen(const char *, size_t);
+/*
+ * For POSIX compliance, we still need:
+ * strcoll_l
+ * strerror_l
+ * strsignal
+ * strxfrm_l
+ */
+#endif
+
 #if defined(_NETBSD_SOURCE)
 #include 		/* for backwards-compatibilty */
 void	*memmem(const void *, size_t, const void *, size_t);

CVS commit: src/distrib/sets/lists/base

2009-05-01 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri May  1 15:30:46 UTC 2009

Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi

Log Message:
Put libgcc_s.so in /lib for MKPIE=yes


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.465 -r1.466 src/distrib/sets/lists/base/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.168 src/distrib/sets/lists/base/shl.elf:1.169
--- src/distrib/sets/lists/base/shl.elf:1.168	Sat Apr 25 01:54:50 2009
+++ src/distrib/sets/lists/base/shl.elf	Fri May  1 11:30:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.168 2009/04/25 05:54:50 agc Exp $
+# $NetBSD: shl.elf,v 1.169 2009/05/01 15:30:46 christos Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -22,6 +22,8 @@
 ./lib/libedit.so.3base-sys-shlib		dynamicroot
 ./lib/libevent.sobase-sys-shlib		dynamicroot
 ./lib/libevent.so.3base-sys-shlib		dynamicroot
+./lib/libgcc_s.sobase-sys-shlib		gcc
+./lib/libgcc_s.so.1base-sys-shlib		gcc 
 ./lib/libipsec.sobase-net-shlib		dynamicroot
 ./lib/libipsec.so.3base-net-shlib		dynamicroot
 ./lib/libkvm.so	base-sys-shlib		dynamicroot

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.465 src/distrib/sets/lists/base/shl.mi:1.466
--- src/distrib/sets/lists/base/shl.mi:1.465	Sat Apr 25 01:54:50 2009
+++ src/distrib/sets/lists/base/shl.mi	Fri May  1 11:30:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.465 2009/04/25 05:54:50 agc Exp $
+# $NetBSD: shl.mi,v 1.466 2009/05/01 15:30:46 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -19,6 +19,7 @@
 ./lib/libdevmapper.so.1.0			base-lvm-shlib		lvm,dynamicroot
 ./lib/libedit.so.3.0base-sys-shlib		dynamicroot
 ./lib/libevent.so.3.0base-sys-shlib		dynamicroot
+./lib/libgcc_s.so.1.0base-sys-shlib		gcc
 ./lib/libipsec.so.3.0base-net-shlib		dynamicroot
 ./lib/libkvm.so.6.0base-sys-shlib		dynamicroot
 ./lib/libm.so.0.6base-sys-shlib		dynamicroot

CVS commit: src/gnu/lib/libgcc4/libgcc_s

2009-05-01 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri May  1 15:27:20 UTC 2009

Modified Files:
src/gnu/lib/libgcc4/libgcc_s: Makefile

Log Message:
install libgcc_s.so in /lib for MKPIE=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/gnu/lib/libgcc4/libgcc_s/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/gnu/lib/libgcc4/libgcc_s/Makefile
diff -u src/gnu/lib/libgcc4/libgcc_s/Makefile:1.7 src/gnu/lib/libgcc4/libgcc_s/Makefile:1.8
--- src/gnu/lib/libgcc4/libgcc_s/Makefile:1.7	Sat Oct 25 18:27:35 2008
+++ src/gnu/lib/libgcc4/libgcc_s/Makefile	Fri May  1 11:27:20 2009
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.7 2008/10/25 22:27:35 apb Exp $
+#	$NetBSD: Makefile,v 1.8 2009/05/01 15:27:20 christos Exp $
 
+USE_SHLIBDIR=	yes
 REQUIRETOOLS=	yes
 NOLINT=		# defined

CVS commit: xsrc/external/mit/xman/dist

2009-05-01 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May  1 15:18:54 UTC 2009

Modified Files:
xsrc/external/mit/xman/dist: misc.c vendor.h

Log Message:
s/PIC/XMAN_PIC/


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xman/dist/vendor.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.1.1.1 xsrc/external/mit/xman/dist/misc.c:1.2
--- xsrc/external/mit/xman/dist/misc.c:1.1.1.1	Wed Jul 30 00:30:15 2008
+++ xsrc/external/mit/xman/dist/misc.c	Fri May  1 11:18:54 2009
@@ -739,7 +739,7 @@
 filter = GRAP;
 break;
  case 'p':
-filter = PIC;
+filter = XMAN_PIC;
 break;
  case 't':
 filter = TBL;

Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.2 xsrc/external/mit/xman/dist/vendor.h:1.3
--- xsrc/external/mit/xman/dist/vendor.h:1.2	Wed Jan 28 09:07:22 2009
+++ xsrc/external/mit/xman/dist/vendor.h	Fri May  1 11:18:54 2009
@@ -187,8 +187,7 @@
 # define EQN		"eqn"
 # define TBL		"tbl"
 # define GRAP		"grap"
-# undef PIC	/* we don't care about position independent code */
-# define PIC		"pic"
+# define XMAN_PIC	"pic"
 # define VGRIND		"vgrind"
 # define REFER		"refer"
 # if defined(CSRG_BASED)

CVS commit: src/usr.bin/who

2009-05-01 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri May  1 14:26:10 UTC 2009

Modified Files:
src/usr.bin/who: utmpentry.c

Log Message:
PR/41313: Chris Spiegel: getutentries() in src/usr.bin/who/utmpentry.c thinks
there are no entries if only one of utmp/utmpx support is selected
mangled && -> ||


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/who/utmpentry.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/who/utmpentry.c
diff -u src/usr.bin/who/utmpentry.c:1.16 src/usr.bin/who/utmpentry.c:1.17
--- src/usr.bin/who/utmpentry.c:1.16	Tue Oct 28 10:01:46 2008
+++ src/usr.bin/who/utmpentry.c	Fri May  1 10:26:10 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: utmpentry.c,v 1.16 2008/10/28 14:01:46 christos Exp $	*/
+/*	$NetBSD: utmpentry.c,v 1.17 2009/05/01 14:26:10 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.16 2008/10/28 14:01:46 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.17 2009/05/01 14:26:10 christos Exp $");
 #endif
 
 #include 
@@ -242,7 +242,7 @@
 	}
 #endif
 	numutmp = 0;
-#if defined(SUPPORT_UTMP) && defined(SUPPORT_UTMPX)
+#if defined(SUPPORT_UTMP) || defined(SUPPORT_UTMPX)
 	if (ehead != NULL) {
 		struct utmpentry *from = ehead, *save;

CVS commit: src/sys/rump/librump/rumpvfs

2009-05-01 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Fri May  1 11:01:34 UTC 2009

Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs.c

Log Message:
in case of error, return instead of continuing


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpvfs/rump_vfs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.17 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.18
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.17	Wed Apr 29 15:49:01 2009
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c	Fri May  1 11:01:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump_vfs.c,v 1.17 2009/04/29 15:49:01 pooka Exp $	*/
+/*	$NetBSD: rump_vfs.c,v 1.18 2009/05/01 11:01:34 pooka Exp $	*/
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -158,8 +158,10 @@
 
 	(void) VFS_STATVFS(mp, &mp->mnt_stat);
 	rv = VFS_START(mp, 0);
-	if (rv)
+	if (rv) {
 		VFS_UNMOUNT(mp, MNT_FORCE);
+		return rv;
+	}
 
 	/*
 	 * XXX: set a root for lwp0.  This is strictly not correct,

CVS commit: src/sys/rump/librump/rumpvfs

2009-05-01 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Fri May  1 11:00:49 UTC 2009

Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c

Log Message:
fix editing artifact


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpvfs/rumpfs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.14 src/sys/rump/librump/rumpvfs/rumpfs.c:1.15
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.14	Wed Apr 29 16:05:41 2009
+++ src/sys/rump/librump/rumpvfs/rumpfs.c	Fri May  1 11:00:49 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpfs.c,v 1.14 2009/04/29 16:05:41 pooka Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.15 2009/05/01 11:00:49 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.14 2009/04/29 16:05:41 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.15 2009/05/01 11:00:49 pooka Exp $");
 
 #include 
 #include 
@@ -123,7 +123,7 @@
 	struct vattr *va;
 	struct timespec ts;
 
-	rn = kmem_alloc(sizeof(*va), KM_SLEEP);
+	rn = kmem_alloc(sizeof(*rn), KM_SLEEP);
 	LIST_INIT(&rn->rn_dir);
 	nanotime(&ts);

CVS commit: src/libexec/ftpd

2009-05-01 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri May  1 10:53:28 UTC 2009

Modified Files:
src/libexec/ftpd: ftpd.8

Log Message:
Drop trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/libexec/ftpd/ftpd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ftpd/ftpd.8
diff -u src/libexec/ftpd/ftpd.8:1.84 src/libexec/ftpd/ftpd.8:1.85
--- src/libexec/ftpd/ftpd.8:1.84	Fri May  1 09:47:26 2009
+++ src/libexec/ftpd/ftpd.8	Fri May  1 10:53:27 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ftpd.8,v 1.84 2009/05/01 09:47:26 lukem Exp $
+.\"	$NetBSD: ftpd.8,v 1.85 2009/05/01 10:53:27 wiz Exp $
 .\"
 .\" Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -867,5 +867,5 @@
 the current transfer
 .Sy TYPE
 is
-.Sq Li A 
+.Sq Li A
 (ASCII).

CVS commit: src/libexec/ftpd

2009-05-01 Thread Luke Mewburn

Module Name:src
Committed By:   lukem
Date:   Fri May  1 09:47:26 UTC 2009

Modified Files:
src/libexec/ftpd: ftpd.8

Log Message:
Simplify the example command used to extract a wu-ftpd compatible xferlog.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/libexec/ftpd/ftpd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ftpd/ftpd.8
diff -u src/libexec/ftpd/ftpd.8:1.83 src/libexec/ftpd/ftpd.8:1.84
--- src/libexec/ftpd/ftpd.8:1.83	Sun Mar 15 08:07:22 2009
+++ src/libexec/ftpd/ftpd.8	Fri May  1 09:47:26 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ftpd.8,v 1.83 2009/03/15 08:07:22 joerg Exp $
+.\"	$NetBSD: ftpd.8,v 1.84 2009/05/01 09:47:26 lukem Exp $
 .\"
 .\" Copyright (c) 1997-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -56,7 +56,7 @@
 .\"
 .\" @(#)ftpd.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd September 21, 2008
+.Dd May 1, 2009
 .Dt FTPD 8
 .Os
 .Sh NAME
@@ -278,8 +278,7 @@
 .Pa xferlog
 file suitable for input into a third-party log analysis tool with a command
 similar to:
-.Dl "grep 'xferlog: ' /var/log/xferlog | \e"
-.Dl "\ \ \ sed -e 's/^.*xferlog: //' \*[Gt] wuxferlog"
+.Dl "sed -ne 's/^.*xferlog: //p' /var/log/xferlog \*[Gt] wuxferlog"
 .El
 .Pp
 The file

CVS commit: src/sys/arch/xen/xen

2009-05-01 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Fri May  1 09:43:11 UTC 2009

Modified Files:
src/sys/arch/xen/xen: isa_machdep.c pci_machdep.c pciide_machdep.c

Log Message:
struct device * -> device_t


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/xen/isa_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/xen/pci_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/xen/pciide_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/xen/xen/isa_machdep.c
diff -u src/sys/arch/xen/xen/isa_machdep.c:1.18 src/sys/arch/xen/xen/isa_machdep.c:1.19
--- src/sys/arch/xen/xen/isa_machdep.c:1.18	Mon Mar 16 06:18:32 2009
+++ src/sys/arch/xen/xen/isa_machdep.c	Fri May  1 09:43:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.18 2009/03/16 06:18:32 cegger Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.19 2009/05/01 09:43:11 cegger Exp $	*/
 /*	NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp 	*/
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2009/03/16 06:18:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.19 2009/05/01 09:43:11 cegger Exp $");
 
 #include 
 #include 
@@ -199,7 +199,7 @@
 }
 
 void
-isa_attach_hook(struct device *parent, struct device *self, struct isabus_attach_args *iba)
+isa_attach_hook(device_t parent, device_t self, struct isabus_attach_args *iba)
 {
 	extern struct x86_isa_chipset x86_isa_chipset;
 	extern int isa_has_been_seen;

Index: src/sys/arch/xen/xen/pci_machdep.c
diff -u src/sys/arch/xen/xen/pci_machdep.c:1.13 src/sys/arch/xen/xen/pci_machdep.c:1.14
--- src/sys/arch/xen/xen/pci_machdep.c:1.13	Mon Apr 14 13:38:03 2008
+++ src/sys/arch/xen/xen/pci_machdep.c	Fri May  1 09:43:11 2009
@@ -1,4 +1,4 @@
-/*  $NetBSD: pci_machdep.c,v 1.13 2008/04/14 13:38:03 cegger Exp $  */
+/*  $NetBSD: pci_machdep.c,v 1.14 2009/05/01 09:43:11 cegger Exp $  */
 
 /*
  * Copyright (c) 2005 Manuel Bouyer.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.13 2008/04/14 13:38:03 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.14 2009/05/01 09:43:11 cegger Exp $");
 
 #include 
 #include 
@@ -73,7 +73,7 @@
 };
 
 void
-pci_attach_hook(struct device *parent, struct device *self,
+pci_attach_hook(device_t parent, device_t self,
 struct pcibus_attach_args * pba)
 {
 	int bus = pba->pba_bus;

Index: src/sys/arch/xen/xen/pciide_machdep.c
diff -u src/sys/arch/xen/xen/pciide_machdep.c:1.14 src/sys/arch/xen/xen/pciide_machdep.c:1.15
--- src/sys/arch/xen/xen/pciide_machdep.c:1.14	Mon Mar 16 06:18:32 2009
+++ src/sys/arch/xen/xen/pciide_machdep.c	Fri May  1 09:43:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_machdep.c,v 1.14 2009/03/16 06:18:32 cegger Exp $	*/
+/*	$NetBSD: pciide_machdep.c,v 1.15 2009/05/01 09:43:11 cegger Exp $	*/
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.14 2009/03/16 06:18:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.15 2009/05/01 09:43:11 cegger Exp $");
 
 #include 
 #include 
@@ -64,7 +64,7 @@
 #endif  
 
 void *
-pciide_machdep_compat_intr_establish(struct device *dev,
+pciide_machdep_compat_intr_establish(device_t dev,
 	struct pci_attach_args *pa, int chan,
 	int (*func)(void *), void *arg)
 {

CVS commit: src/sys/arch/x86/x86

2009-05-01 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Fri May  1 09:38:24 UTC 2009

Modified Files:
src/sys/arch/x86/x86: ioapic.c

Log Message:
struct device * -> device_t


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x86/x86/ioapic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.41 src/sys/arch/x86/x86/ioapic.c:1.42
--- src/sys/arch/x86/x86/ioapic.c:1.41	Wed Apr 22 22:31:26 2009
+++ src/sys/arch/x86/x86/ioapic.c	Fri May  1 09:38:24 2009
@@ -1,4 +1,4 @@
-/* 	$NetBSD: ioapic.c,v 1.41 2009/04/22 22:31:26 ad Exp $	*/
+/* 	$NetBSD: ioapic.c,v 1.42 2009/05/01 09:38:24 cegger Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.41 2009/04/22 22:31:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.42 2009/05/01 09:38:24 cegger Exp $");
 
 #include "opt_ddb.h"
 
@@ -99,8 +99,8 @@
  * XXX locking
  */
 
-int ioapic_match(struct device *, struct cfdata *, void *);
-voidioapic_attach(struct device *, struct device *, void *);
+int ioapic_match(device_t, cfdata_t, void *);
+voidioapic_attach(device_t, device_t, void *);
 
 extern int x86_mem_add_mapping(bus_addr_t, bus_size_t,
 int, bus_space_handle_t *); /* XXX XXX */
@@ -248,7 +248,7 @@
 ioapic_match, ioapic_attach, NULL, NULL);
 
 int
-ioapic_match(struct device *parent, struct cfdata *match, void *aux)
+ioapic_match(device_t parent, cfdata_t match, void *aux)
 {
 
 	return 1;
@@ -258,7 +258,7 @@
  * can't use bus_space_xxx as we don't have a bus handle ...
  */
 void 
-ioapic_attach(struct device *parent, struct device *self, void *aux)
+ioapic_attach(device_t parent, device_t self, void *aux)
 {
 	struct ioapic_softc *sc = device_private(self);  
 	struct apic_attach_args *aaa = (struct apic_attach_args *)aux;

CVS commit: src/sys/arch/x86/pci

2009-05-01 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Fri May  1 09:26:34 UTC 2009

Modified Files:
src/sys/arch/x86/pci: pciide_machdep.c

Log Message:
- struct device * -> device_t
- remove useless parenthesis


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/pci/pciide_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/pci/pciide_machdep.c
diff -u src/sys/arch/x86/pci/pciide_machdep.c:1.8 src/sys/arch/x86/pci/pciide_machdep.c:1.9
--- src/sys/arch/x86/pci/pciide_machdep.c:1.8	Wed Apr 16 16:06:51 2008
+++ src/sys/arch/x86/pci/pciide_machdep.c	Fri May  1 09:26:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_machdep.c,v 1.8 2008/04/16 16:06:51 cegger Exp $	*/
+/*	$NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $	*/
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.8 2008/04/16 16:06:51 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $");
 
 #include 
 #include 
@@ -62,7 +62,7 @@
 #endif
 
 void *
-pciide_machdep_compat_intr_establish(struct device *dev,
+pciide_machdep_compat_intr_establish(device_t dev,
 struct pci_attach_args *pa, int chan, int (*func)(void *),
 void *arg)
 {
@@ -75,7 +75,7 @@
 	irq = PCIIDE_COMPAT_IRQ(chan);
 	cookie = isa_intr_establish(NULL, irq, IST_EDGE, IPL_BIO, func, arg);
 	if (cookie == NULL)
-		return (NULL);
+		return NULL;
 #if NIOAPIC > 0
 	if (mp_busses != NULL &&
 	(intr_find_mpmapping(mp_isa_bus, irq, &mpih) == 0 ||
@@ -88,5 +88,5 @@
 #endif
 	aprint_normal_dev(dev, "%s channel interrupting at irq %d\n",
 	PCIIDE_CHANNEL_NAME(chan), irq);
-	return (cookie);
+	return cookie;
 }

CVS commit: src/sys/arch/x86/x86

2009-05-01 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Fri May  1 09:20:02 UTC 2009

Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c

Log Message:
struct device * -> device_t


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/x86/x86_autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.38 src/sys/arch/x86/x86/x86_autoconf.c:1.39
--- src/sys/arch/x86/x86/x86_autoconf.c:1.38	Tue Feb 17 11:16:10 2009
+++ src/sys/arch/x86/x86/x86_autoconf.c	Fri May  1 09:20:02 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_autoconf.c,v 1.38 2009/02/17 11:16:10 jmcneill Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.39 2009/05/01 09:20:02 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.38 2009/02/17 11:16:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.39 2009/05/01 09:20:02 cegger Exp $");
 
 #include 
 #include 
@@ -79,7 +79,7 @@
 }
 
 static void
-handle_wedges(struct device *dv, int par)
+handle_wedges(device_t dv, int par)
 {
 	if (config_handle_wedges(dv, par) == 0)
 		return;
@@ -88,7 +88,7 @@
 }
 
 static int
-is_valid_disk(struct device *dv)
+is_valid_disk(device_t dv)
 {
 
 	if (device_class(dv) != DV_DISK)
@@ -110,7 +110,7 @@
 {
 	struct btinfo_biosgeom *big;
 	struct bi_biosgeom_entry *be;
-	struct device *dv;
+	device_t dv;
 	int i, ck, error, m, n;
 	struct vnode *tv;
 	char mbr[DEV_BSIZE];
@@ -217,7 +217,7 @@
  * Return non-zero if wedge device matches bootinfo.
  */
 static int
-match_bootwedge(struct device *dv, struct btinfo_bootwedge *biw)
+match_bootwedge(device_t dv, struct btinfo_bootwedge *biw)
 {
 	MD5_CTX ctx;
 	struct vnode *tmpvn;
@@ -266,7 +266,7 @@
  * Return non-zero if disk device matches bootinfo.
  */
 static int
-match_bootdisk(struct device *dv, struct btinfo_bootdisk *bid)
+match_bootdisk(device_t dv, struct btinfo_bootdisk *bid)
 {
 	struct vnode *tmpvn;
 	int error;
@@ -500,7 +500,7 @@
 }
 
 void
-device_register(struct device *dev, void *aux)
+device_register(device_t dev, void *aux)
 {
 	static bool found_console = false;

CVS commit: src/sys/kern

2009-05-01 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Fri May  1 08:27:41 UTC 2009

Modified Files:
src/sys/kern: subr_autoconf.c

Log Message:
remove useless parenthesis


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/kern/subr_autoconf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.174 src/sys/kern/subr_autoconf.c:1.175
--- src/sys/kern/subr_autoconf.c:1.174	Thu Apr  2 00:09:34 2009
+++ src/sys/kern/subr_autoconf.c	Fri May  1 08:27:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.174 2009/04/02 00:09:34 dyoung Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.175 2009/05/01 08:27:41 cegger Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.174 2009/04/02 00:09:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.175 2009/05/01 08:27:41 cegger Exp $");
 
 #include "opt_ddb.h"
 #include "drvctl.h"
@@ -513,13 +513,13 @@
 	/* Make sure this driver isn't already in the system. */
 	LIST_FOREACH(lcd, &allcfdrivers, cd_list) {
 		if (STREQ(lcd->cd_name, cd->cd_name))
-			return (EEXIST);
+			return EEXIST;
 	}
 
 	LIST_INIT(&cd->cd_attach);
 	LIST_INSERT_HEAD(&allcfdrivers, cd, cd_list);
 
-	return (0);
+	return 0;
 }
 
 /*
@@ -533,18 +533,18 @@
 	/* Make sure there are no active instances. */
 	for (i = 0; i < cd->cd_ndevs; i++) {
 		if (cd->cd_devs[i] != NULL)
-			return (EBUSY);
+			return EBUSY;
 	}
 
 	/* ...and no attachments loaded. */
 	if (LIST_EMPTY(&cd->cd_attach) == 0)
-		return (EBUSY);
+		return EBUSY;
 
 	LIST_REMOVE(cd, cd_list);
 
 	KASSERT(cd->cd_devs == NULL);
 
-	return (0);
+	return 0;
 }
 
 /*
@@ -557,10 +557,10 @@
 
 	LIST_FOREACH(cd, &allcfdrivers, cd_list) {
 		if (STREQ(cd->cd_name, name))
-			return (cd);
+			return cd;
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 /*
@@ -574,17 +574,17 @@
 
 	cd = config_cfdriver_lookup(driver);
 	if (cd == NULL)
-		return (ESRCH);
+		return ESRCH;
 
 	/* Make sure this attachment isn't already on this driver. */
 	LIST_FOREACH(lca, &cd->cd_attach, ca_list) {
 		if (STREQ(lca->ca_name, ca->ca_name))
-			return (EEXIST);
+			return EEXIST;
 	}
 
 	LIST_INSERT_HEAD(&cd->cd_attach, ca, ca_list);
 
-	return (0);
+	return 0;
 }
 
 /*
@@ -599,19 +599,19 @@
 
 	cd = config_cfdriver_lookup(driver);
 	if (cd == NULL)
-		return (ESRCH);
+		return ESRCH;
 
 	/* Make sure there are no active instances. */
 	for (i = 0; i < cd->cd_ndevs; i++) {
 		if ((dev = cd->cd_devs[i]) == NULL)
 			continue;
 		if (dev->dv_cfattach == ca)
-			return (EBUSY);
+			return EBUSY;
 	}
 
 	LIST_REMOVE(ca, ca_list);
 
-	return (0);
+	return 0;
 }
 
 /*
@@ -624,10 +624,10 @@
 
 	LIST_FOREACH(ca, &cd->cd_attach, ca_list) {
 		if (STREQ(ca->ca_name, atname))
-			return (ca);
+			return ca;
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 /*
@@ -640,9 +640,9 @@
 
 	cd = config_cfdriver_lookup(name);
 	if (cd == NULL)
-		return (NULL);
+		return NULL;
 
-	return (config_cfattach_lookup_cd(cd, atname));
+	return config_cfattach_lookup_cd(cd, atname);
 }
 
 /*
@@ -682,10 +682,10 @@
 		if ((!(cl->cld_defaultstr)
 		 || (cf->cf_loc[i] != cl->cld_default))
 		&& cf->cf_loc[i] != locs[i])
-			return (0);
+			return 0;
 	}
 
-	return (config_match(parent, cf, aux));
+	return config_match(parent, cf, aux);
 }
 
 /*
@@ -698,15 +698,15 @@
 	const struct cfiattrdata * const *cpp;
 
 	if (cd->cd_attrs == NULL)
-		return (0);
+		return 0;
 
 	for (cpp = cd->cd_attrs; *cpp; cpp++) {
 		if (STREQ((*cpp)->ci_name, ia)) {
 			/* Match. */
-			return (*cpp);
+			return *cpp;
 		}
 	}
-	return (0);
+	return 0;
 }
 
 /*
@@ -720,14 +720,14 @@
 	const struct cfiattrdata *ia;
 
 	if (cd)
-		return (cfdriver_get_iattr(cd, name));
+		return cfdriver_get_iattr(cd, name);
 
 	LIST_FOREACH(d, &allcfdrivers, cd_list) {
 		ia = cfdriver_get_iattr(d, name);
 		if (ia)
-			return (ia);
+			return ia;
 	}
-	return (0);
+	return 0;
 }
 
 /*
@@ -741,7 +741,7 @@
 
 	/* We don't match root nodes here. */
 	if (cfp == NULL)
-		return (0);
+		return 0;
 
 	pcd = parent->dv_cfdriver;
 	KASSERT(pcd != NULL);
@@ -751,30 +751,30 @@
 	 * attribute.
 	 */
 	if (!cfdriver_get_iattr(pcd, cfp->cfp_iattr))
-		return (0);
+		return 0;
 
 	/*
 	 * If no specific parent device instance was specified (i.e.
 	 * we're attaching to the attribute only), we're done!
 	 */
 	if (cfp->cfp_parent == NULL)
-		return (1);
+		return 1;
 
 	/*
 	 * Check the parent device's name.
 	 */
 	if (STREQ(pcd->cd_name, cfp->cfp_parent) == 0)
-		return (0);	/* not the same parent */
+		return 0;	/* not the same parent */
 
 	/*
 	 * Make sure the unit number matches.
 	 */
 	if (cfp->cfp_unit == DVUNIT_ANY ||	/* wildcard */
 	cfp->cfp_unit == parent->dv_unit)
-		return (1);
+		return 1;
 
 	/* Unit numbers don't match. */
-	return (0);
+	retu

46 matches

Mail list logo