[src/trunk]: src Move Mark Nudelman's code from a 4-clause to a 3-clause lice...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e22d9861c64d
branches:  trunk
changeset: 553265:e22d9861c64d
user:      agc <agc%NetBSD.org@localhost>
date:      Mon Oct 13 14:34:25 2003 +0000

description:
Move Mark Nudelman's code from a 4-clause to a 3-clause licence by removing
the advertising clause. Diffs provided in PR 22549 by Joel Baker, confirmed
to the board by Mark Nudelman.

diffstat:

 distrib/utils/more/ch.c       |  37 +++----------------------------------
 distrib/utils/more/command.c  |  37 +++----------------------------------
 distrib/utils/more/decode.c   |  37 +++----------------------------------
 distrib/utils/more/help.c     |  37 +++----------------------------------
 distrib/utils/more/input.c    |  37 +++----------------------------------
 distrib/utils/more/less.h     |  37 ++-----------------------------------
 distrib/utils/more/line.c     |  37 +++----------------------------------
 distrib/utils/more/linenum.c  |  37 +++----------------------------------
 distrib/utils/more/main.c     |  39 ++++-----------------------------------
 distrib/utils/more/option.c   |  37 +++----------------------------------
 distrib/utils/more/os.c       |  37 +++----------------------------------
 distrib/utils/more/output.c   |  37 +++----------------------------------
 distrib/utils/more/position.c |  37 +++----------------------------------
 distrib/utils/more/prim.c     |  37 +++----------------------------------
 distrib/utils/more/screen.c   |  37 +++----------------------------------
 distrib/utils/more/signal.c   |  37 +++----------------------------------
 distrib/utils/more/ttyin.c    |  37 +++----------------------------------
 share/man/man0/title.cdrom    |   4 ++--
 share/man/man0/title.urm      |   4 ++--
 19 files changed, 55 insertions(+), 584 deletions(-)

diffs (truncated from 1024 to 300 lines):

diff -r 203b07b1e832 -r e22d9861c64d distrib/utils/more/ch.c
--- a/distrib/utils/more/ch.c   Mon Oct 13 14:22:20 2003 +0000
+++ b/distrib/utils/more/ch.c   Mon Oct 13 14:34:25 2003 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: ch.c,v 1.5 2003/08/07 09:27:58 agc Exp $       */
+/*     $NetBSD: ch.c,v 1.6 2003/10/13 14:34:25 agc Exp $       */
 
 /*
+ * Copyright (c) 1988 Mark Nudelman
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -29,44 +30,12 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 1988 Mark Nudleman
- *
- * 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
- *     California, Berkeley and its contributors.
- * 4. 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.
- */
-
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)ch.c       8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: ch.c,v 1.5 2003/08/07 09:27:58 agc Exp $");
+__RCSID("$NetBSD: ch.c,v 1.6 2003/10/13 14:34:25 agc Exp $");
 #endif
 #endif /* not lint */
 
diff -r 203b07b1e832 -r e22d9861c64d distrib/utils/more/command.c
--- a/distrib/utils/more/command.c      Mon Oct 13 14:22:20 2003 +0000
+++ b/distrib/utils/more/command.c      Mon Oct 13 14:34:25 2003 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: command.c,v 1.8 2003/08/07 09:27:59 agc Exp $  */
+/*     $NetBSD: command.c,v 1.9 2003/10/13 14:34:25 agc Exp $  */
 
 /*
+ * Copyright (c) 1988 Mark Nudelman
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -29,44 +30,12 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 1988 Mark Nudleman
- *
- * 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
- *     California, Berkeley and its contributors.
- * 4. 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.
- */
-
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)command.c  8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: command.c,v 1.8 2003/08/07 09:27:59 agc Exp $");
+__RCSID("$NetBSD: command.c,v 1.9 2003/10/13 14:34:25 agc Exp $");
 #endif
 #endif /* not lint */
 
diff -r 203b07b1e832 -r e22d9861c64d distrib/utils/more/decode.c
--- a/distrib/utils/more/decode.c       Mon Oct 13 14:22:20 2003 +0000
+++ b/distrib/utils/more/decode.c       Mon Oct 13 14:34:25 2003 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: decode.c,v 1.4 2003/08/07 09:27:59 agc Exp $   */
+/*     $NetBSD: decode.c,v 1.5 2003/10/13 14:34:25 agc Exp $   */
 
 /*
+ * Copyright (c) 1988 Mark Nudelman
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -29,44 +30,12 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 1988 Mark Nudleman
- *
- * 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
- *     California, Berkeley and its contributors.
- * 4. 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.
- */
-
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)decode.c   8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: decode.c,v 1.4 2003/08/07 09:27:59 agc Exp $");
+__RCSID("$NetBSD: decode.c,v 1.5 2003/10/13 14:34:25 agc Exp $");
 #endif
 #endif /* not lint */
 
diff -r 203b07b1e832 -r e22d9861c64d distrib/utils/more/help.c
--- a/distrib/utils/more/help.c Mon Oct 13 14:22:20 2003 +0000
+++ b/distrib/utils/more/help.c Mon Oct 13 14:34:25 2003 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: help.c,v 1.5 2003/08/07 09:27:59 agc Exp $     */
+/*     $NetBSD: help.c,v 1.6 2003/10/13 14:34:25 agc Exp $     */
 
 /*
+ * Copyright (c) 1988 Mark Nudelman
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -29,44 +30,12 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 1988 Mark Nudleman
- *
- * 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
- *     California, Berkeley and its contributors.
- * 4. 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.
- */
-
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)help.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.5 2003/08/07 09:27:59 agc Exp $");
+__RCSID("$NetBSD: help.c,v 1.6 2003/10/13 14:34:25 agc Exp $");
 #endif
 #endif /* not lint */
 
diff -r 203b07b1e832 -r e22d9861c64d distrib/utils/more/input.c
--- a/distrib/utils/more/input.c        Mon Oct 13 14:22:20 2003 +0000
+++ b/distrib/utils/more/input.c        Mon Oct 13 14:34:25 2003 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: input.c,v 1.5 2003/08/07 09:27:59 agc Exp $    */
+/*     $NetBSD: input.c,v 1.6 2003/10/13 14:34:25 agc Exp $    */
 
 /*
+ * Copyright (c) 1988 Mark Nudelman
  * Copyright (c) 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -29,44 +30,12 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 1988 Mark Nudleman
- *
- * 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
- *     California, Berkeley and its contributors.
- * 4. 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.
- */
-
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)input.c    8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.5 2003/08/07 09:27:59 agc Exp $");
+__RCSID("$NetBSD: input.c,v 1.6 2003/10/13 14:34:25 agc Exp $");
 #endif
 #endif /* not lint */
 
diff -r 203b07b1e832 -r e22d9861c64d distrib/utils/more/less.h
--- a/distrib/utils/more/less.h Mon Oct 13 14:22:20 2003 +0000
+++ b/distrib/utils/more/less.h Mon Oct 13 14:34:25 2003 +0000
@@ -1,6 +1,7 @@
-/*     $NetBSD: less.h,v 1.4 2003/08/07 09:27:59 agc Exp $     */
+/*     $NetBSD: less.h,v 1.5 2003/10/13 14:34:25 agc Exp $     */
 
 /*
+ * Copyright (c) 1988 Mark Nudelman
  * Copyright (c) 1988, 1993