summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-06-19 14:56:29 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-06-19 14:56:29 +0000
commitd896156aa4a1cfb73de4a669ec15c080ba4ce4a0 (patch)
tree4e9a7c8664f2381659057f59904606b3d17cfb65 /lib
parent92f4cf3e028da1e7e1fa3c8ab703ebff34f5dbf8 (diff)
Update license based on lite2 version
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/time/strftime.c44
1 files changed, 30 insertions, 14 deletions
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index 281c8e482fc..1444b8fbfe8 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,6 +1,6 @@
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
static char elsieid[] = "@(#)strftime.c 7.64";
-static char *rcsid = "$OpenBSD: strftime.c,v 1.10 2002/05/26 00:21:40 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strftime.c,v 1.11 2002/06/19 14:56:28 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include "private.h"
@@ -9,20 +9,36 @@ static char *rcsid = "$OpenBSD: strftime.c,v 1.10 2002/05/26 00:21:40 deraadt Ex
** Based on the UCB version with the ID appearing below.
** This is ANSIish only when "multibyte character == plain character".
**
-** 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.
*/
#if 0