ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update the Free Software Foundation's address as needed in the copyright 

notices taken from other sources


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3231 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-11-30 18:57:05 +00:00
parent 783062a0cc
commit 13b6115894
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -94,7 +94,8 @@ CVS code -
which was apparently in 1999. (DLR)
- For functions originally adapted from other sources, add
notices from the original files, as we do with the tab
completion functions adapted from busybox. Also, invoke LGPL
completion functions adapted from busybox, updating the Free
Software Foundation's address as needed. Also, invoke LGPL
clause 3 to convert the LGPLed ngetdelim() and ngetline()
functions to use the GPL instead. This is done so that we
don't have to include a copy of the LGPL, and because the

7
src/chars.c
View File

@ -555,7 +555,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
#ifndef HAVE_STRCASESTR
/* This function, nstrcasestr() (originally mutt_stristr()), was adapted
* from mutt 1.2.4i (lib.c). Here is the notice from that file:
* from mutt 1.2.4i (lib.c). Here is the notice from that file, with
* the Free Software Foundation's address updated:
*
* Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>
* Copyright (C) 1999-2000 Thomas Roessler <roessler@guug.de>
@ -574,8 +575,8 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111, USA. */
* Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA. */
/* This function is equivalent to strcasestr(). */
const char *nstrcasestr(const char *haystack, const char *needle)

6
src/utils.c
View File

@ -161,7 +161,8 @@ void sunder(char *str)
/* These functions, ngetline() (originally getline()) and ngetdelim()
* (originally getdelim()), were adapted from GNU mailutils 0.5
* (mailbox/getline.c). Here is the notice from that file, after
* converting to the GPL via LGPL clause 3:
* converting to the GPL via LGPL clause 3, and with the Free Software
* Foundation's address updated:
*
* GNU Mailutils -- a suite of utilities for electronic mail
* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
@ -178,7 +179,8 @@ void sunder(char *str)
*
* You should have received a copy of the GNU General Public License
* along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301, USA. */
#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
#ifndef HAVE_GETLINE