summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 09:44:09 +0000
committeragc <agc@NetBSD.org>2003-08-07 09:44:09 +0000
commit039cc95684ed0da206d259b9445f65310484658e (patch)
tree67d8e5623d3e1569ebf0e34e5dabc6cdab33bb8c /include
parentb3b0c404d28f2627e5ba6071f748dd6effa0f442 (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22270, verified by myself.
Diffstat (limited to 'include')
-rw-r--r--include/a.out.h33
-rw-r--r--include/ar.h8
-rw-r--r--include/arpa/ftp.h8
-rw-r--r--include/arpa/inet.h8
-rw-r--r--include/arpa/nameser.h8
-rw-r--r--include/arpa/telnet.h8
-rw-r--r--include/arpa/tftp.h8
-rw-r--r--include/assert.h8
-rw-r--r--include/bitstring.h8
-rw-r--r--include/bm.h8
-rw-r--r--include/ctype.h8
-rw-r--r--include/db.h8
-rw-r--r--include/dirent.h8
-rw-r--r--include/disktab.h8
-rw-r--r--include/err.h8
-rw-r--r--include/errno.h8
-rw-r--r--include/fnmatch.h8
-rw-r--r--include/fstab.h8
-rw-r--r--include/fts.h8
-rw-r--r--include/glob.h8
-rw-r--r--include/grp.h8
-rw-r--r--include/kvm.h8
-rw-r--r--include/limits.h8
-rw-r--r--include/locale.h8
-rw-r--r--include/memory.h8
-rw-r--r--include/mntopts.h8
-rw-r--r--include/mpool.h8
-rw-r--r--include/ndbm.h8
-rw-r--r--include/netdb.h8
-rw-r--r--include/nlist.h8
-rw-r--r--include/paths.h8
-rw-r--r--include/protocols/dumprestore.h8
-rw-r--r--include/protocols/routed.h8
-rw-r--r--include/protocols/rwhod.h8
-rw-r--r--include/protocols/talkd.h8
-rw-r--r--include/protocols/timed.h8
-rw-r--r--include/pwd.h31
-rw-r--r--include/ranlib.h8
-rw-r--r--include/regex.h36
-rw-r--r--include/regexp.h36
-rw-r--r--include/resolv.h8
-rw-r--r--include/setjmp.h8
-rw-r--r--include/sgtty.h8
-rw-r--r--include/signal.h8
-rw-r--r--include/stab.h8
-rw-r--r--include/stddef.h8
-rw-r--r--include/stdio.h8
-rw-r--r--include/stdlib.h8
-rw-r--r--include/string.h8
-rw-r--r--include/struct.h8
-rw-r--r--include/sysexits.h8
-rw-r--r--include/tar.h8
-rw-r--r--include/time.h8
-rw-r--r--include/ttyent.h8
-rw-r--r--include/tzfile.h8
-rw-r--r--include/unistd.h8
-rw-r--r--include/util.h8
-rw-r--r--include/utime.h8
-rw-r--r--include/utmp.h8
-rw-r--r--include/vis.h8
60 files changed, 241 insertions, 343 deletions
diff --git a/include/a.out.h b/include/a.out.h
index 193750b6551..19cd4ba61a2 100644
--- a/include/a.out.h
+++ b/include/a.out.h
@@ -1,7 +1,6 @@
-/* $NetBSD: a.out.h,v 1.16 1998/02/02 21:07:17 perry Exp $ */
+/* $NetBSD: a.out.h,v 1.17 2003/08/07 09:44:09 agc Exp $ */
/*-
- * Copyright (c) 1993 Theo de Raadt
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -13,6 +12,36 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)a.out.h 8.1 (Berkeley) 6/2/93
+ */
+
+/*-
+ * Copyright (c) 1993 Theo de Raadt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/include/ar.h b/include/ar.h
index ac2e4ca920d..37d7347e239 100644
--- a/include/ar.h
+++ b/include/ar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ar.h,v 1.4 1994/10/26 00:55:43 cgd Exp $ */
+/* $NetBSD: ar.h,v 1.5 2003/08/07 09:44:09 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -20,11 +20,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h
index 52be7c154b3..544e530f7ff 100644
--- a/include/arpa/ftp.h
+++ b/include/arpa/ftp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.h,v 1.5 1998/02/10 00:32:50 perry Exp $ */
+/* $NetBSD: ftp.h,v 1.6 2003/08/07 09:44:12 agc Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 5b957ed3785..a7ec6ff73c9 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.h,v 1.17 2003/06/30 15:45:02 kleink Exp $ */
+/* $NetBSD: inet.h,v 1.18 2003/08/07 09:44:12 agc Exp $ */
/*
* ++Copyright++ 1983, 1993
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 9e40b4404fd..67c95ad7fa5 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -77,7 +73,7 @@
/*
* @(#)nameser.h 8.1 (Berkeley) 6/2/93
- * $NetBSD: nameser.h,v 1.14 2000/08/09 14:41:00 itojun Exp $
+ * $NetBSD: nameser.h,v 1.15 2003/08/07 09:44:12 agc Exp $
*/
#ifndef _ARPA_NAMESER_H_
diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h
index 0b949f0f171..6abf35d6ed2 100644
--- a/include/arpa/telnet.h
+++ b/include/arpa/telnet.h
@@ -1,4 +1,4 @@
-/* $NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp $ */
+/* $NetBSD: telnet.h,v 1.10 2003/08/07 09:44:12 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h
index 96841af5e55..70c33565a49 100644
--- a/include/arpa/tftp.h
+++ b/include/arpa/tftp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tftp.h,v 1.7 2003/06/11 01:41:14 briggs Exp $ */
+/* $NetBSD: tftp.h,v 1.8 2003/08/07 09:44:12 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/assert.h b/include/assert.h
index 1eca68ad593..53f395d1b00 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,4 +1,4 @@
-/* $NetBSD: assert.h,v 1.14 2003/06/05 18:37:45 bjh21 Exp $ */
+/* $NetBSD: assert.h,v 1.15 2003/08/07 09:44:09 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/bitstring.h b/include/bitstring.h
index 22353009630..8cec7330003 100644
--- a/include/bitstring.h
+++ b/include/bitstring.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bitstring.h,v 1.6 1998/02/02 21:07:19 perry Exp $ */
+/* $NetBSD: bitstring.h,v 1.7 2003/08/07 09:44:09 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/bm.h b/include/bm.h
index 2cdd5e83b60..e2178e91810 100644
--- a/include/bm.h
+++ b/include/bm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $ */
+/* $NetBSD: bm.h,v 1.4 2003/08/07 09:44:09 agc Exp $ */
/*-
* Copyright (c) 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/ctype.h b/include/ctype.h
index 99e458d2be9..5be77c42701 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ctype.h,v 1.23 2003/04/29 12:49:38 bjh21 Exp $ */
+/* $NetBSD: ctype.h,v 1.24 2003/08/07 09:44:09 agc Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/db.h b/include/db.h
index f235e4cf82d..00fc06c93b9 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db.h,v 1.19 2003/07/09 01:59:34 kristerw Exp $ */
+/* $NetBSD: db.h,v 1.20 2003/08/07 09:44:09 agc Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/dirent.h b/include/dirent.h
index fc9a2dd1fdb..bd666e4573f 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dirent.h,v 1.20 2003/05/28 20:04:12 christos Exp $ */
+/* $NetBSD: dirent.h,v 1.21 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/disktab.h b/include/disktab.h
index 9b1efae0a37..5db089b673e 100644
--- a/include/disktab.h
+++ b/include/disktab.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disktab.h,v 1.7 1999/01/19 06:24:09 abs Exp $ */
+/* $NetBSD: disktab.h,v 1.8 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/err.h b/include/err.h
index c204895748d..ce9388f648a 100644
--- a/include/err.h
+++ b/include/err.h
@@ -1,4 +1,4 @@
-/* $NetBSD: err.h,v 1.12 1998/07/30 00:44:15 mycroft Exp $ */
+/* $NetBSD: err.h,v 1.13 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/errno.h b/include/errno.h
index df2d6966d58..b3795c44ac7 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -1,4 +1,4 @@
-/* $NetBSD: errno.h,v 1.5 2003/04/28 23:16:13 bjh21 Exp $ */
+/* $NetBSD: errno.h,v 1.6 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/fnmatch.h b/include/fnmatch.h
index b6d71a35de3..9e57b2a2af5 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fnmatch.h,v 1.10 2003/04/28 23:16:13 bjh21 Exp $ */
+/* $NetBSD: fnmatch.h,v 1.11 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/fstab.h b/include/fstab.h
index 5d52cf35db3..93ce286294f 100644
--- a/include/fstab.h
+++ b/include/fstab.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fstab.h,v 1.9 1999/02/23 17:00:53 mrg Exp $ */
+/* $NetBSD: fstab.h,v 1.10 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/fts.h b/include/fts.h
index 33e90acef4c..7d517cb6bb7 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fts.h,v 1.10 2002/11/11 01:07:08 thorpej Exp $ */
+/* $NetBSD: fts.h,v 1.11 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/glob.h b/include/glob.h
index b51a4962f96..cde42ef6f1e 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.h,v 1.16 2003/04/28 23:16:13 bjh21 Exp $ */
+/* $NetBSD: glob.h,v 1.17 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/grp.h b/include/grp.h
index c5cdbd5ad16..823eb8990b9 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grp.h,v 1.17 2003/04/28 23:16:13 bjh21 Exp $ */
+/* $NetBSD: grp.h,v 1.18 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/kvm.h b/include/kvm.h
index 42eb665221e..7e67bee894f 100644
--- a/include/kvm.h
+++ b/include/kvm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.h,v 1.11 2003/01/18 10:32:11 thorpej Exp $ */
+/* $NetBSD: kvm.h,v 1.12 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/limits.h b/include/limits.h
index 0a1b60dd75b..a2eaf2d3dcf 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.21 2003/07/16 21:03:54 nathanw Exp $ */
+/* $NetBSD: limits.h,v 1.22 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/locale.h b/include/locale.h
index 2d904c4ec97..6d2c49dc0c7 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,4 +1,4 @@
-/* $NetBSD: locale.h,v 1.12 2001/01/02 10:53:24 kleink Exp $ */
+/* $NetBSD: locale.h,v 1.13 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/memory.h b/include/memory.h
index 4971441fb8a..a4c1b0c32a5 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,4 +1,4 @@
-/* $NetBSD: memory.h,v 1.4 1998/02/02 21:07:32 perry Exp $ */
+/* $NetBSD: memory.h,v 1.5 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/mntopts.h b/include/mntopts.h
index 074fac9b508..44a95f891d3 100644
--- a/include/mntopts.h
+++ b/include/mntopts.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mntopts.h,v 1.2 2003/04/11 17:36:57 christos Exp $ */
+/* $NetBSD: mntopts.h,v 1.3 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/mpool.h b/include/mpool.h
index 8cd9efb3680..552280c358d 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mpool.h,v 1.9 2000/07/07 10:43:54 ad Exp $ */
+/* $NetBSD: mpool.h,v 1.10 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/ndbm.h b/include/ndbm.h
index 0c8baa1de03..0b1adcaf6bd 100644
--- a/include/ndbm.h
+++ b/include/ndbm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ndbm.h,v 1.9 2003/04/28 23:16:13 bjh21 Exp $ */
+/* $NetBSD: ndbm.h,v 1.10 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/netdb.h b/include/netdb.h
index 5c3081d8af2..72b6c464852 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: netdb.h,v 1.30 2003/05/05 14:20:03 bjh21 Exp $ */
+/* $NetBSD: netdb.h,v 1.31 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/nlist.h b/include/nlist.h
index 430720235b8..e4d772470c5 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist.h,v 1.10 1998/12/17 23:15:21 pk Exp $ */
+/* $NetBSD: nlist.h,v 1.11 2003/08/07 09:44:10 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/paths.h b/include/paths.h
index 0828e4b1c7c..f9215658de8 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.h,v 1.23 2003/06/25 09:51:26 tshiozak Exp $ */
+/* $NetBSD: paths.h,v 1.24 2003/08/07 09:44:10 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index b157b8b9ccd..d9e954858af 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dumprestore.h,v 1.11 2003/04/02 10:39:21 fvdl Exp $ */
+/* $NetBSD: dumprestore.h,v 1.12 2003/08/07 09:44:13 agc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index 0d41344b67d..a1a431a73f5 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -1,4 +1,4 @@
-/* $NetBSD: routed.h,v 1.12 2002/11/30 04:02:19 christos Exp $ */
+/* $NetBSD: routed.h,v 1.13 2003/08/07 09:44:13 agc Exp $ */
/*-
* Copyright (c) 1983, 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h
index 8be2a7f1ab5..2f35150d27a 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rwhod.h,v 1.6 1998/02/10 00:38:20 perry Exp $ */
+/* $NetBSD: rwhod.h,v 1.7 2003/08/07 09:44:13 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 44f5c56afed..4f44974536b 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: talkd.h,v 1.7 1998/02/10 00:38:22 perry Exp $ */
+/* $NetBSD: talkd.h,v 1.8 2003/08/07 09:44:13 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index e79f89d0986..b23337f2de0 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -1,4 +1,4 @@
-/* $NetBSD: timed.h,v 1.7 1998/02/10 00:38:24 perry Exp $ */
+/* $NetBSD: timed.h,v 1.8 2003/08/07 09:44:13 agc Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/pwd.h b/include/pwd.h
index 27b354d4b56..b30ed13cd29 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pwd.h,v 1.28 2003/05/05 14:49:31 bjh21 Exp $ */
+/* $NetBSD: pwd.h,v 1.29 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -8,6 +8,35 @@
* to the University of California by American Telephone and Telegraph
* Co. or Unix System Laboratories, Inc. and are reproduced herein with
* the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)pwd.h 8.2 (Berkeley) 1/21/94
+ */
+
+/*-
* Portions Copyright(C) 1995, Jason Downs. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/include/ranlib.h b/include/ranlib.h
index 8a71a917016..7921c98b4d3 100644
--- a/include/ranlib.h
+++ b/include/ranlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ranlib.h,v 1.5 1998/02/02 21:07:37 perry Exp $ */
+/* $NetBSD: ranlib.h,v 1.6 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/regex.h b/include/regex.h
index 8fe5e431e2d..7bd19705e2a 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,7 +1,6 @@
-/* $NetBSD: regex.h,v 1.10 2003/02/05 23:13:07 kleink Exp $ */
+/* $NetBSD: regex.h,v 1.11 2003/08/07 09:44:11 agc Exp $ */
/*-
- * Copyright (c) 1992 Henry Spencer.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)regex.h 8.2 (Berkeley) 1/3/94
+ */
+
+/*-
+ * Copyright (c) 1992 Henry Spencer.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Henry Spencer of the University of Toronto.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/include/regexp.h b/include/regexp.h
index e4277aec7a5..63205a19cfa 100644
--- a/include/regexp.h
+++ b/include/regexp.h
@@ -1,7 +1,6 @@
-/* $NetBSD: regexp.h,v 1.5 1998/09/14 20:25:02 tv Exp $ */
+/* $NetBSD: regexp.h,v 1.6 2003/08/07 09:44:11 agc Exp $ */
/*
- * Copyright (c) 1986 by University of Toronto.
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -16,6 +15,39 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)regexp.h 8.1 (Berkeley) 6/2/93
+ */
+
+/*
+ * Copyright (c) 1986 by University of Toronto.
+ *
+ * This code is derived from software contributed to Berkeley
+ * by Henry Spencer.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
diff --git a/include/resolv.h b/include/resolv.h
index bf4c689eecf..ee9086d89b2 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: resolv.h,v 1.21 2003/07/09 01:59:34 kristerw Exp $ */
+/* $NetBSD: resolv.h,v 1.22 2003/08/07 09:44:11 agc Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/setjmp.h b/include/setjmp.h
index 76a6cf43501..4d382c00034 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.h,v 1.19 2003/04/28 23:16:14 bjh21 Exp $ */
+/* $NetBSD: setjmp.h,v 1.20 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/sgtty.h b/include/sgtty.h
index dc2fbb38824..aac5cd2f62a 100644
--- a/include/sgtty.h
+++ b/include/sgtty.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sgtty.h,v 1.6 1998/02/10 00:30:00 perry Exp $ */
+/* $NetBSD: sgtty.h,v 1.7 2003/08/07 09:44:11 agc Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/signal.h b/include/signal.h
index 6feabebbfcd..663dda715e9 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.32 2003/07/18 17:54:35 nathanw Exp $ */
+/* $NetBSD: signal.h,v 1.33 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/stab.h b/include/stab.h
index dd259640cbd..15b5f84bd68 100644
--- a/include/stab.h
+++ b/include/stab.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stab.h,v 1.5 1998/02/02 21:07:50 perry Exp $ */
+/* $NetBSD: stab.h,v 1.6 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/stddef.h b/include/stddef.h
index c944caa2e27..253b9408bdc 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stddef.h,v 1.9 2000/11/10 06:35:45 tshiozak Exp $ */
+/* $NetBSD: stddef.h,v 1.10 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/stdio.h b/include/stdio.h
index 247bf3c9361..0598b46ee5d 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.52 2003/06/05 17:51:10 bjh21 Exp $ */
+/* $NetBSD: stdio.h,v 1.53 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/stdlib.h b/include/stdlib.h
index 2884f636abf..48f570259d2 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.63 2003/07/08 01:43:28 kristerw Exp $ */
+/* $NetBSD: stdlib.h,v 1.64 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/string.h b/include/string.h
index 021b38ed761..5359bb783ad 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.24 2003/04/28 23:16:15 bjh21 Exp $ */
+/* $NetBSD: string.h,v 1.25 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/struct.h b/include/struct.h
index 8f99736f8eb..615557bd1b6 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1,4 +1,4 @@
-/* $NetBSD: struct.h,v 1.4 1998/02/02 21:08:00 perry Exp $ */
+/* $NetBSD: struct.h,v 1.5 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/sysexits.h b/include/sysexits.h
index 13ead0cc964..beaa473882e 100644
--- a/include/sysexits.h
+++ b/include/sysexits.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysexits.h,v 1.5 1998/02/02 21:08:02 perry Exp $ */
+/* $NetBSD: sysexits.h,v 1.6 2003/08/07 09:44:11 agc Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/tar.h b/include/tar.h
index 63b1e36f513..8e774176834 100644
--- a/include/tar.h
+++ b/include/tar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tar.h,v 1.3 1998/02/02 17:10:19 perry Exp $ */
+/* $NetBSD: tar.h,v 1.4 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1994
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/time.h b/include/time.h
index a177cf85105..bffdbc41597 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.30 2003/04/28 23:16:15 bjh21 Exp $ */
+/* $NetBSD: time.h,v 1.31 2003/08/07 09:44:11 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/ttyent.h b/include/ttyent.h
index d8424f4e929..e6f9339806e 100644
--- a/include/ttyent.h
+++ b/include/ttyent.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ttyent.h,v 1.11 1999/01/15 18:47:48 tsarna Exp $ */
+/* $NetBSD: ttyent.h,v 1.12 2003/08/07 09:44:11 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/tzfile.h b/include/tzfile.h
index e10f0bf82d2..0029eae2ab0 100644
--- a/include/tzfile.h
+++ b/include/tzfile.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tzfile.h,v 1.6 1998/07/30 14:11:22 kleink Exp $ */
+/* $NetBSD: tzfile.h,v 1.7 2003/08/07 09:44:11 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/unistd.h b/include/unistd.h
index 01c4c4477cc..6513828deeb 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.93 2003/07/08 01:43:28 kristerw Exp $ */
+/* $NetBSD: unistd.h,v 1.94 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/util.h b/include/util.h
index 8a840c53cb7..311352241ab 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.30 2003/01/24 21:55:02 fvdl Exp $ */
+/* $NetBSD: util.h,v 1.31 2003/08/07 09:44:11 agc Exp $ */
/*-
* Copyright (c) 1995
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/utime.h b/include/utime.h
index a779f63e1e8..8d3075c42e2 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -1,4 +1,4 @@
-/* $NetBSD: utime.h,v 1.6 1998/05/06 17:30:12 kleink Exp $ */
+/* $NetBSD: utime.h,v 1.7 2003/08/07 09:44:12 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/utmp.h b/include/utmp.h
index 54c8b769238..ea510f91156 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: utmp.h,v 1.9 2002/07/28 22:48:38 christos Exp $ */
+/* $NetBSD: utmp.h,v 1.10 2003/08/07 09:44:12 agc Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/include/vis.h b/include/vis.h
index 9da8cc986e2..abba772f25a 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.h,v 1.13 2002/12/12 23:00:37 lukem Exp $ */
+/* $NetBSD: vis.h,v 1.14 2003/08/07 09:44:12 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*