public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
From: Keith Packard <keithp@keithp.com>
To: newlib@sourceware.org
Cc: Keith Packard <keithp@keithp.com>
Subject: [PATCH 07/27] Transfer copyright from locale.c to derived files
Date: Wed, 05 Feb 2020 06:54:00 -0000	[thread overview]
Message-ID: <20200205064844.929131-8-keithp@keithp.com> (raw)
In-Reply-To: <20200205064844.929131-1-keithp@keithp.com>

Functions in locale.c were moved to separate files, but
the copyright didn't follow.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 newlib/libc/locale/duplocale.c  | 33 +++++++++++++++++++++++++++++++++
 newlib/libc/locale/freelocale.c | 29 +++++++++++++++++++++++++++++
 newlib/libc/locale/locale.tex   | 29 +++++++++++++++++++++++++++++
 newlib/libc/locale/localeconv.c | 29 +++++++++++++++++++++++++++++
 newlib/libc/locale/newlocale.c  | 29 +++++++++++++++++++++++++++++
 newlib/libc/locale/uselocale.c  | 29 +++++++++++++++++++++++++++++
 6 files changed, 178 insertions(+)

diff --git a/newlib/libc/locale/duplocale.c b/newlib/libc/locale/duplocale.c
index d3e7d782e..ca555a1bd 100644
--- a/newlib/libc/locale/duplocale.c
+++ b/newlib/libc/locale/duplocale.c
@@ -1,3 +1,36 @@
+/* Parts of this code are originally taken from FreeBSD. */
+/*
+ * Copyright (c) 1996 - 2002 FreeBSD Project
+ * Copyright (c) 1991, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Borman at Krystal Technologies.
+ *
+ * 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.
+ * 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.
+ */
 /*
 FUNCTION
 	<<duplocale>>---duplicate a locale object
diff --git a/newlib/libc/locale/freelocale.c b/newlib/libc/locale/freelocale.c
index f5d55f5e2..4bccdb75c 100644
--- a/newlib/libc/locale/freelocale.c
+++ b/newlib/libc/locale/freelocale.c
@@ -1,4 +1,33 @@
 /*
+Copyright (c) 1996 - 2002 FreeBSD Project
+Copyright (c) 1991, 1993
+The Regents of the University of California.  All rights reserved.
+
+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.
+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.
+ */
+/*
 FUNCTION
 	<<freelocale>>---free resources allocated for a locale object
 
diff --git a/newlib/libc/locale/locale.tex b/newlib/libc/locale/locale.tex
index eee7d77cb..be0cc3dd1 100644
--- a/newlib/libc/locale/locale.tex
+++ b/newlib/libc/locale/locale.tex
@@ -1,3 +1,32 @@
+#
+#Copyright (c) 1996 - 2002 FreeBSD Project
+#Copyright (c) 1991, 1993
+#The Regents of the University of California.  All rights reserved.
+#
+#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.
+#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.
+#
 @node Locale
 @chapter Locale (@file{locale.h})
 
diff --git a/newlib/libc/locale/localeconv.c b/newlib/libc/locale/localeconv.c
index 5f34a785f..5737709ff 100644
--- a/newlib/libc/locale/localeconv.c
+++ b/newlib/libc/locale/localeconv.c
@@ -1,3 +1,32 @@
+/*
+Copyright (c) 1996 - 2002 FreeBSD Project
+Copyright (c) 1991, 1993
+The Regents of the University of California.  All rights reserved.
+
+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.
+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 "newlib.h"
 #include <reent.h>
 #include "setlocale.h"
diff --git a/newlib/libc/locale/newlocale.c b/newlib/libc/locale/newlocale.c
index 0789d5fd9..5cee6d276 100644
--- a/newlib/libc/locale/newlocale.c
+++ b/newlib/libc/locale/newlocale.c
@@ -1,4 +1,33 @@
 /*
+Copyright (c) 1996 - 2002 FreeBSD Project
+Copyright (c) 1991, 1993
+The Regents of the University of California.  All rights reserved.
+
+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.
+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.
+ */
+/*
 FUNCTION
 	<<newlocale>>---create or modify a locale object
 
diff --git a/newlib/libc/locale/uselocale.c b/newlib/libc/locale/uselocale.c
index 83ebcdd19..c07f28f74 100644
--- a/newlib/libc/locale/uselocale.c
+++ b/newlib/libc/locale/uselocale.c
@@ -1,4 +1,33 @@
 /*
+Copyright (c) 1996 - 2002 FreeBSD Project
+Copyright (c) 1991, 1993
+The Regents of the University of California.  All rights reserved.
+
+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.
+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.
+ */
+/*
 FUNCTION
 	<<uselocale>>---free resources allocated for a locale object
 
-- 
2.25.0

  parent reply	other threads:[~2020-02-05  6:54 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-05  6:48 [PATCH 00/27] Add missing copyright information to many files Keith Packard
2020-02-05  6:48 ` [PATCH 01/27] Typo in license terms for newlib/libm/common/log2.c Keith Packard
2020-02-06 10:59   ` Corinna Vinschen
2020-02-05  6:48 ` [PATCH 02/27] Typo in license for newlib/libc/stdio/flags.c Keith Packard
2020-02-06 10:59   ` Corinna Vinschen
2020-02-05  6:48 ` [PATCH 06/27] Add copyrights in newlib/libc/iconv/lib Keith Packard
2020-02-05  6:49 ` [PATCH 24/27] Add missing copyrights in newlib/libm/math Keith Packard
2020-02-05  6:49 ` [PATCH 25/27] Add missing copyrights in newlib/testsuite Keith Packard
2020-02-05  6:49 ` [PATCH 05/27] Add Copyright where missing to newlib/libc/include files Keith Packard
2020-02-05  6:49 ` [PATCH 18/27] Add missing copyrights in newlib/libc/string Keith Packard
2020-02-05  6:49 ` [PATCH 08/27] Add missing copyrights for newlib/libc/locale Keith Packard
2020-02-06 10:58   ` Corinna Vinschen
2020-02-05  6:49 ` [PATCH 13/27] Add missing copyrights in newlib/libc/signal Keith Packard
2020-02-05  6:49 ` [PATCH 16/27] Add missing copyrights in newlib/libc/stdio64 Keith Packard
2020-02-05  6:49 ` [PATCH 26/27] Add missing copyrights in newlib/doc Keith Packard
2020-02-05  6:49 ` [PATCH 23/27] Add missing copyrights to newlib/libm/machine/i386 Keith Packard
2020-02-05  6:49 ` [PATCH 21/27] Add missing copyrights in newlib/libm/complex Keith Packard
2020-02-05  6:49 ` [PATCH 15/27] Add missing copyrights in newlib/libc/stdio Keith Packard
2020-02-05  6:49 ` [PATCH 04/27] Add copyright attribution for files in newlib/libc/ctype Keith Packard
2020-02-05  6:49 ` [PATCH 09/27] Add missing copyrights to newlib/libc/machine Keith Packard
2020-02-05  6:49 ` [PATCH 03/27] Add copyright and license to newlib/libm/test/*.c Keith Packard
2020-02-05  6:49 ` [PATCH 20/27] Add missing copyrights in newlib/libm/common Keith Packard
2020-02-05  6:49 ` [PATCH 12/27] Add missing copyrights to newlib/libc/search Keith Packard
2020-02-05  6:49 ` [PATCH 27/27] Add missing copyrights in newlib/libm/machine/i386 Keith Packard
2020-02-05  6:54 ` [PATCH 11/27] Add missing copyrights to newlib/libc/reent Keith Packard
2020-02-05  6:54 ` Keith Packard [this message]
2020-02-06 10:56   ` [PATCH 07/27] Transfer copyright from locale.c to derived files Corinna Vinschen
2020-02-05  6:59 ` [PATCH 10/27] Add missing copyrights in newlib/libc/misc Keith Packard
2020-02-05  6:59 ` [PATCH 22/27] Add missing copyrights in newlib/libm/machine/spu Keith Packard
2020-02-05  6:59 ` [PATCH 14/27] Add missing copyrights in newlib/libc/ssp Keith Packard
2020-02-05  6:59 ` [PATCH 17/27] Add missing copyrights in newlib/libc/stdlib Keith Packard
2020-02-05  7:09 ` [PATCH 19/27] Add missing copyright information to newlib/libc/time Keith Packard
2020-02-06 11:01 ` [PATCH 00/27] Add missing copyright information to many files Corinna Vinschen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200205064844.929131-8-keithp@keithp.com \
    --to=keithp@keithp.com \
    --cc=newlib@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).