From 3f7c8c51588eb562c3a63a126d3e17e79b27b577 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Mon, 14 Nov 2005 22:20:35 +0000
Subject: [PATCH] fix copyright years on source files; all functions in
browser.c were originally added in 2001; the oldest function in color.c is
do_colorinit() (now color_init()), which was originally added in 2001; the
oldest function in chars.c is revstrstr(), which was originally added in
2001; the oldest function in help.c is do_help(), which was originally added
in 2000; the oldest function in prompt.c is statusq() (now do_prompt()),
which was originally added before 0.6.6, which was apparently in 1999; all
functions in rcfile.c were originally added in 2001; one of the oldest
functions in search.c is do_search(), which was originally added in 0.2.7,
which was apparently in 1999; and one of the oldest functions in text.c is
do_wrap(), which was originally added in 0.3.1, which was apparently in 1999;
also, for functions originally adapted from other sources, add notices from
the original files, as we do with the tab completion functions adapted from
busybox
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3172 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 17 +++++++++++++++++
src/browser.c | 2 +-
src/chars.c | 28 +++++++++++++++++++++++++---
src/color.c | 2 +-
src/files.c | 2 +-
src/help.c | 2 +-
src/prompt.c | 2 +-
src/rcfile.c | 2 +-
src/search.c | 2 +-
src/text.c | 2 +-
src/utils.c | 27 +++++++++++++++++++++++----
11 files changed, 73 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 01ec3296..2101c8a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,23 @@ CVS code -
do_prompt()), statusq_abort() (renamed do_prompt_abort()), and
do_yesno() (renamed do_yesno_prompt()). (DLR)
- Initialize the static pid_t pid in text.c to -1. (DLR)
+ - Fix copyright years on source files. All functions in
+ browser.c were originally added in 2001; the oldest function
+ in color.c is do_colorinit() (now color_init()), which was
+ originally added in 2001; the oldest function in chars.c is
+ revstrstr(), which was originally added in 2001; the oldest
+ function in help.c is do_help(), which was originally added in
+ 2000; the oldest function in prompt.c is statusq() (now
+ do_prompt()), which was originally added before 0.6.6, which
+ was apparently in 1999; all functions in rcfile.c were
+ originally added in 2001; one of the oldest functions in
+ search.c is do_search(), which was originally added in 0.2.7,
+ which was apparently in 1999; and one of the oldest functions
+ in text.c is do_wrap(), which was originally added in 0.3.1,
+ 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. (DLR)
- chars.c:
mbwidth()
- If wcwidth() returns -1 for the character passed in, treat the
diff --git a/src/browser.c b/src/browser.c
index 8eca7d20..9c5cc16d 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -2,7 +2,7 @@
/**************************************************************************
* browser.c *
* *
- * Copyright (C) 2005 Chris Allegretta *
+ * Copyright (C) 2001-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/chars.c b/src/chars.c
index ef704422..84a0446a 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -2,7 +2,7 @@
/**************************************************************************
* chars.c *
* *
- * Copyright (C) 2005 Chris Allegretta *
+ * Copyright (C) 2001-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
@@ -553,8 +553,30 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
}
#ifndef HAVE_STRCASESTR
-/* This function is equivalent to strcasestr(). It was adapted from
- * mutt's mutt_stristr() function. */
+/* This function (nstrcasestr(), originally mutt_stristr()) was adapted
+ * from mutt 1.2.4i (lib.c). Here is the notice from that file:
+ *
+ * Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>
+ * Copyright (C) 1999-2000 Thomas Roessler <roessler@guug.de>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * 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. */
+
+/* This function is equivalent to strcasestr(). */
const char *nstrcasestr(const char *haystack, const char *needle)
{
assert(haystack != NULL && needle != NULL);
diff --git a/src/color.c b/src/color.c
index ee58d9dc..6e6d3967 100644
--- a/src/color.c
+++ b/src/color.c
@@ -2,7 +2,7 @@
/**************************************************************************
* color.c *
* *
- * Copyright (C) 1999-2005 Chris Allegretta *
+ * Copyright (C) 2001-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/files.c b/src/files.c
index aa37635c..2b4d5f25 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1947,7 +1947,7 @@ int is_dir(const char *buf)
}
/* These functions (username_tab_completion(), cwd_tab_completion(), and
- * input_tab()) were taken from busybox 0.46 (cmdedit.c). Here is the
+ * input_tab()) were adapted from busybox 0.46 (cmdedit.c). Here is the
* notice from that file:
*
* Termios command line History and Editting, originally
diff --git a/src/help.c b/src/help.c
index 327d492e..74bb3e6f 100644
--- a/src/help.c
+++ b/src/help.c
@@ -2,7 +2,7 @@
/**************************************************************************
* help.c *
* *
- * Copyright (C) 2005 Chris Allegretta *
+ * Copyright (C) 2000-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/prompt.c b/src/prompt.c
index 3890d2bf..a14424eb 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -2,7 +2,7 @@
/**************************************************************************
* prompt.c *
* *
- * Copyright (C) 2005 Chris Allegretta *
+ * Copyright (C) 1999-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/rcfile.c b/src/rcfile.c
index e1573bfe..fb021932 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -2,7 +2,7 @@
/**************************************************************************
* rcfile.c *
* *
- * Copyright (C) 1999-2005 Chris Allegretta *
+ * Copyright (C) 2001-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/search.c b/src/search.c
index aa77f741..47ea52d4 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2,7 +2,7 @@
/**************************************************************************
* search.c *
* *
- * Copyright (C) 2000-2005 Chris Allegretta *
+ * Copyright (C) 1999-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/text.c b/src/text.c
index d28ddd47..60cc68d1 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2,7 +2,7 @@
/**************************************************************************
* text.c *
* *
- * Copyright (C) 2005 Chris Allegretta *
+ * Copyright (C) 1999-2005 Chris Allegretta *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2, or (at your option) *
diff --git a/src/utils.c b/src/utils.c
index 009b525e..bd9bd96b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -157,10 +157,30 @@ void sunder(char *str)
}
}
+/* These functions (ngetline() and ngetdelim(), originally getline() and
+ * getdelim()) were adapted from GNU mailutils 0.5 (mailbox/getline.c).
+ * Here is the notice from that file:
+ *
+ * GNU Mailutils -- a suite of utilities for electronic mail
+ * Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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 */
+
#if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
#ifndef HAVE_GETLINE
-/* This function is equivalent to getline(). It was adapted from
- * GNU mailutils' getline() function. */
+/* This function is equivalent to getline(). */
ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
{
return getdelim(lineptr, n, '\n', stream);
@@ -168,8 +188,7 @@ ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
#endif
#ifndef HAVE_GETDELIM
-/* This function is equivalent to getdelim(). It was adapted from
- * GNU mailutils' getdelim() function. */
+/* This function is equivalent to getdelim(). */
ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream)
{
size_t indx = 0;
--
GitLab