From c799593a3c53795f16007d2c5903e1fa47a8f82f Mon Sep 17 00:00:00 2001 From: ache Date: Sat, 18 Feb 1995 01:39:00 +0000 Subject: [PATCH] Copyrights cleanup --- lib/libc/string/strcoll.3 | 24 ++++++++++++++++++------ lib/libc/string/strcoll.c | 4 +--- lib/libc/string/strxfrm.3 | 24 ++++++++++++++++++------ lib/libc/string/strxfrm.c | 8 +------- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3 index bea37110b07b..180434f79be5 100644 --- a/lib/libc/string/strcoll.3 +++ b/lib/libc/string/strcoll.3 @@ -1,6 +1,9 @@ -.\" Copyright (c) 1995 Alex Tatmanjants -.\" at Electronni Visti IA, Kiev, Ukraine. -.\" All rights reserved. +.\" Copyright (c) 1990, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" Chris Torek and the American National Standards Committee X3, +.\" on Information Processing Systems. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -10,11 +13,18 @@ .\" 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 AUTHOR ``AS IS'' AND +.\" 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 AUTHOR BE LIABLE +.\" 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) @@ -23,7 +33,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 27, 1995 +.\" @(#)strcoll.3 8.1 (Berkeley) 6/4/93 +.\" +.Dd June 4, 1993 .Dt STRCOLL 3 .Os .Sh NAME diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index faa858bbdee5..544f9b946e05 100644 --- a/lib/libc/string/strcoll.c +++ b/lib/libc/string/strcoll.c @@ -24,15 +24,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: strcoll.c,v 1.4 1995/01/27 12:51:06 alex Exp alex $ + * $Id: strcoll.c,v 1.2 1995/02/16 17:01:09 ache Exp $ */ #include #include #include "collate.h" -/* Compare strings according to LC_COLLATE category of current locale */ - int strcoll(s, s2) const char *s, *s2; diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3 index 7b5174bc476b..560267183f9e 100644 --- a/lib/libc/string/strxfrm.3 +++ b/lib/libc/string/strxfrm.3 @@ -1,6 +1,9 @@ -.\" Copyright (c) 1995 Alex Tatmanjants -.\" at Electronni Visti IA, Kiev, Ukraine. -.\" All rights reserved. +.\" Copyright (c) 1990, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" This code is derived from software contributed to Berkeley by +.\" Chris Torek and the American National Standards Committee X3, +.\" on Information Processing Systems. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -10,11 +13,18 @@ .\" 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 AUTHOR ``AS IS'' AND +.\" 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 AUTHOR BE LIABLE +.\" 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) @@ -23,7 +33,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 27, 1995 +.\" @(#)strxfrm.3 8.1 (Berkeley) 6/4/93 +.\" +.Dd June 4, 1993 .Dt STRXFRM 3 .Os .Sh NAME diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index 73206decacaa..6d6a13ec7c01 100644 --- a/lib/libc/string/strxfrm.c +++ b/lib/libc/string/strxfrm.c @@ -24,19 +24,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: strxfrm.c,v 1.5 1995/01/27 12:51:06 alex Exp alex $ + * $Id: strxfrm.c,v 1.2 1995/02/16 17:01:11 ache Exp $ */ #include #include #include "collate.h" -/* - * Transform src, storing the result in dest, such that strcmp() - * on transformed strings returns what strcoll() on the original - * untransformed strings would return. - */ - size_t strxfrm(dest, src, len) char *dest;