summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-06-17 07:30:43 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-06-17 07:30:43 +0000
commit02fc2227010abbc7f2ea42e45532802ba0231f68 (patch)
tree622652997ab9201e3464ec043625ae0f7e56efcd /usr.bin
parenta273c1f511c12d52e83b5c5a23b74190105537f1 (diff)
Vern says:
Yes, this came up a while ago, and I put together a flex release with a modified copyright that begins: Redistribution and use in source and binary forms, with or without modification, are permitted provided that: [...] feel free to update the copyrights in each of the files with the one in COPYING.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/lex/COPYING8
-rw-r--r--usr.bin/lex/FlexLexer.h24
-rw-r--r--usr.bin/lex/ccl.c24
-rw-r--r--usr.bin/lex/dfa.c24
-rw-r--r--usr.bin/lex/ecs.c24
-rw-r--r--usr.bin/lex/flexdef.h24
-rw-r--r--usr.bin/lex/gen.c24
-rw-r--r--usr.bin/lex/main.c24
-rw-r--r--usr.bin/lex/misc.c24
-rw-r--r--usr.bin/lex/nfa.c24
-rw-r--r--usr.bin/lex/parse.y24
-rw-r--r--usr.bin/lex/scan.l24
-rw-r--r--usr.bin/lex/sym.c24
-rw-r--r--usr.bin/lex/tblcmp.c24
-rw-r--r--usr.bin/lex/yylex.c24
15 files changed, 172 insertions, 172 deletions
diff --git a/usr.bin/lex/COPYING b/usr.bin/lex/COPYING
index dcb775e7c60..63c8555826d 100644
--- a/usr.bin/lex/COPYING
+++ b/usr.bin/lex/COPYING
@@ -12,10 +12,10 @@ which operates under a contract with the Department of Energy:
to contract no. DE-AC03-76SF00098 between the United States
Department of Energy and the University of California.
- Redistribution and use in source and binary forms are permitted
- provided that: (1) source distributions retain this entire
- copyright notice and comment, and (2) distributions including
- binaries display the following acknowledgement: ``This product
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that: (1) source distributions
+ retain this entire copyright notice and comment, and (2) distributions
+ including binaries display the following acknowledgement: ``This product
includes software developed by the University of California,
Berkeley and its contributors'' in the documentation or other
materials provided with the distribution and in all advertising
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index d61c88d8c16..8776f187873 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: FlexLexer.h,v 1.3 1996/07/13 22:21:55 millert Exp $ */
+/* $OpenBSD: FlexLexer.h,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
-// $Header: /cvs/OpenBSD/src/usr.bin/lex/FlexLexer.h,v 1.3 1996/07/13 22:21:55 millert Exp $
+// $Header: /cvs/OpenBSD/src/usr.bin/lex/FlexLexer.h,v 1.4 2001/06/17 07:30:42 deraadt Exp $
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex
@@ -11,16 +11,16 @@
// This code is derived from software contributed to Berkeley by
// Kent Williams and Tom Epperly.
//
-// Redistribution and use in source and binary forms are permitted provided
-// that: (1) source distributions retain this entire copyright notice and
-// comment, and (2) distributions including binaries display the following
-// acknowledgement: ``This product includes software developed by the
-// University of California, Berkeley and its contributors'' in the
-// documentation or other materials provided with the distribution and in
-// all advertising materials mentioning features or use of this software.
-// 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.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that: (1) source distributions
+// retain this entire copyright notice and comment, and (2) distributions
+// including binaries display the following acknowledgement: ``This product
+// includes software developed by the University of California, Berkeley
+// and its contributors'' in the documentation or other materials provided
+// with the distribution and in all advertising materials mentioning
+// features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index e4a41999f5e..b2dea68f6f3 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccl.c,v 1.3 1996/07/13 22:21:56 millert Exp $ */
+/* $OpenBSD: ccl.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* ccl - routines for character classes */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ccl.c,v 1.3 1996/07/13 22:21:56 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ccl.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 629b52fe1dd..5d630a92b1f 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dfa.c,v 1.3 1996/07/13 22:21:57 millert Exp $ */
+/* $OpenBSD: dfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* dfa - DFA construction routines */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/dfa.c,v 1.3 1996/07/13 22:21:57 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/dfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index 7b2f1022114..84a01fca828 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs.c,v 1.3 1996/07/13 22:21:57 millert Exp $ */
+/* $OpenBSD: ecs.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* ecs - equivalence class routines */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ecs.c,v 1.3 1996/07/13 22:21:57 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/ecs.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index a6c76e811e5..4e4368c879d 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: flexdef.h,v 1.4 1997/07/25 21:05:28 mickey Exp $ */
+/* $OpenBSD: flexdef.h,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
/* flexdef - definitions file for flex */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* @(#) $Header: /cvs/OpenBSD/src/usr.bin/lex/flexdef.h,v 1.4 1997/07/25 21:05:28 mickey Exp $ (LBL) */
+/* @(#) $Header: /cvs/OpenBSD/src/usr.bin/lex/flexdef.h,v 1.5 2001/06/17 07:30:42 deraadt Exp $ (LBL) */
#include <stdio.h>
#include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index 0f9099823f1..7efbdd5163d 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gen.c,v 1.4 1998/11/24 01:21:36 deraadt Exp $ */
+/* $OpenBSD: gen.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
/* gen - actual generation (writing) of flex scanners */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/gen.c,v 1.4 1998/11/24 01:21:36 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/gen.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 4316f267dee..e4378a99f31 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.4 1998/08/17 03:20:25 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -13,16 +13,16 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -34,7 +34,7 @@ char copyright[] =
All rights reserved.\n";
#endif /* not lint */
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.4 1998/08/17 03:20:25 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 9ebc0cf28a4..a16bb265f23 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.4 1997/07/25 21:05:30 mickey Exp $ */
+/* $OpenBSD: misc.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
/* misc - miscellaneous flex routines */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/misc.c,v 1.4 1997/07/25 21:05:30 mickey Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/misc.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 67a47a59df8..7cb84cd41bb 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfa.c,v 1.3 1996/07/13 22:22:10 millert Exp $ */
+/* $OpenBSD: nfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* nfa - NFA construction routines */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/nfa.c,v 1.3 1996/07/13 22:22:10 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/nfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index cdbb9dcd806..7b2f872efd3 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.3 1996/07/13 22:22:12 millert Exp $ */
+/* $OpenBSD: parse.y,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* parse.y - parser for flex input */
@@ -20,22 +20,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/parse.y,v 1.3 1996/07/13 22:22:12 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/parse.y,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index 6f1721b1a10..2b14b11a85f 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -1,4 +1,4 @@
-/* $OpenBSD: scan.l,v 1.3 1996/07/13 22:22:13 millert Exp $ */
+/* $OpenBSD: scan.l,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* scan.l - scanner for flex input */
@@ -14,22 +14,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/scan.l,v 1.3 1996/07/13 22:22:13 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/scan.l,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
#include "parse.h"
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index 774395addb3..4b805602603 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sym.c,v 1.3 1996/07/13 22:22:13 millert Exp $ */
+/* $OpenBSD: sym.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* sym - symbol table routines */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/sym.c,v 1.3 1996/07/13 22:22:13 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/sym.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index 76d0a23c342..ee5dc15506d 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tblcmp.c,v 1.3 1996/07/13 22:22:14 millert Exp $ */
+/* $OpenBSD: tblcmp.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* tblcmp - table compression routines */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/tblcmp.c,v 1.3 1996/07/13 22:22:14 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/tblcmp.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include "flexdef.h"
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index d9f554b9998..d0c5cc30394 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yylex.c,v 1.3 1996/07/13 22:22:15 millert Exp $ */
+/* $OpenBSD: yylex.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
/* yylex - scanner front-end for flex */
@@ -13,22 +13,22 @@
* to contract no. DE-AC03-76SF00098 between the United States
* Department of Energy and the University of California.
*
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement: ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement: ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/yylex.c,v 1.3 1996/07/13 22:22:15 millert Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/yylex.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
#include <ctype.h>
#include "flexdef.h"