Correct licensing info for realpath

diff --git a/AUTHORS b/AUTHORS
index e0a5b720a440c1f1838fd596ed41e2404f0c00b1..a62bdc52f7021c5a99c4d47f3b4fe08fdd60347e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ Jorg Schaible  <joerg.schaible@gft.com>
 Steven Barker  <scbarker@uiuc.edu>
   realpath.c (submitted to bug-sh-utils on 6 October 2001)
   -- adapted by Charles Wilson
-  (GPLv2)
+  (GPLv2+)
 
 Rick Rankin  <rick_rankin@yahoo.com>
   lpr.c

diff --git a/ChangeLog b/ChangeLog
index 98c7be2b88a0b5a6cb4c2a10679fd8596ebbbeb4..c0ccf6a0032d2f7ad88218e2ad7931e6b9befae1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-15  Charles Wilson  <cwilson@...>
+
+       * src/realpath/realpath.c: Correct licensing info.
+       Original code was GPLv2+, not GPLv2 only (see
+       http://lists.gnu.org/archive/html/bug-sh-utils/2001-10/msg00002.html)
+       As all subsequent modifications to this file were by
+       me, this reversion to the original licensing terms is OK.
+       * AUTHORS: Ditto.
+       * TODO: Ditto.
+
 2010-08-15  Charles Wilson  <cwilson@...>
 
        Various code cleanups

diff --git a/TODO b/TODO
index 195c13183d9fc19fa99bc89bd9ea5a8bed7154ad..eabc4d588426e2b78e743b591c20f7ea7f74ef07 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,7 +18,7 @@
   - banner is GPLv2 only. Contact original author.
   - lpr is GPLv2 only. Contact original author.
   - readshortcut is GPLv2 only. Contact original author.
-  - realpath is GPLv2 only. Contact original author.
+  - realpath is GPLv2+, but courtesy contact original author
   - cygstart is GPLv2+, but courtesy contact original author
   - cygdrop is GPLv2+, but courtesy contact original author
   - mkshortcut is GPLv2+, but courtesy contact original author

diff --git a/src/realpath/realpath.c b/src/realpath/realpath.c
index 1470cd833b5969800b16dc92d7a4f1750bf06052..59ce96ed8ab80e92636d1f81ee4472e5c8148be6 100644 (file)
--- a/src/realpath/realpath.c
+++ b/src/realpath/realpath.c
@@ -3,16 +3,17 @@
  *
  * 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 in version 2 of the License.
+ * the Free Software Foundation; either version 2, 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-1307  USA
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /* Modified 2002-01-26 Charles Wilson: