[src/trunk]: src/lib/libc/time license clarification, from openbsd

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

details:   https://anonhg.NetBSD.org/src/rev/62b62343630f
branches:  trunk
changeset: 537516:62b62343630f
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Oct 02 06:56:24 2002 +0000

description:
license clarification, from openbsd

diffstat:

 lib/libc/time/strftime.c |  46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diffs (67 lines):

diff -r 254ea76c6378 -r 62b62343630f lib/libc/time/strftime.c
--- a/lib/libc/time/strftime.c  Wed Oct 02 06:51:59 2002 +0000
+++ b/lib/libc/time/strftime.c  Wed Oct 02 06:56:24 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: strftime.c,v 1.13 2002/01/29 12:40:34 kleink Exp $     */
+/*     $NetBSD: strftime.c,v 1.14 2002/10/02 06:56:24 itojun Exp $     */
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char    elsieid[] = "@(#)strftime.c     7.64";
 #else
-__RCSID("$NetBSD: strftime.c,v 1.13 2002/01/29 12:40:34 kleink Exp $");
+__RCSID("$NetBSD: strftime.c,v 1.14 2002/10/02 06:56:24 itojun Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -19,20 +19,36 @@
 #include "private.h"
 
 /*
-** Copyright (c) 1989 The Regents of the University of California.
-** All rights reserved.
+** Copyright (c) 1989, 1993
+**     The Regents of the University of California.  All rights reserved.
 **
-** Redistribution and use in source and binary forms are permitted
-** provided that the above copyright notice and this paragraph are
-** duplicated in all such forms and that any documentation,
-** advertising materials, and other materials related to such
-** distribution and use acknowledge that the software was developed
-** by the University of California, Berkeley.  The name of the
-** University may not 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.
+** 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.
 */
 
 #ifndef LIBC_SCCS