GNUPG-1-9-BRANCH gnupg/common (ChangeLog strsep.c)

[cvs user wk]

    Date: Friday, December 3, 2004 @ 19:38:24
  Author: wk
    Path: /cvs/gnupg/gnupg/common
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog strsep.c

Fixed copyright comments.


-----------+
 ChangeLog |    4 ++++
 strsep.c  |   31 +++++++++++++++++--------------
 2 files changed, 21 insertions(+), 14 deletions(-)


Index: gnupg/common/ChangeLog
diff -u gnupg/common/ChangeLog:1.30.2.30 gnupg/common/ChangeLog:1.30.2.31
--- gnupg/common/ChangeLog:1.30.2.30	Thu Dec  2 08:48:09 2004
+++ gnupg/common/ChangeLog	Fri Dec  3 19:38:23 2004
@@ -1,3 +1,7 @@
+2004-12-03  Werner Koch  <wk at g10code.com>
+
+	* strsep.c: Fixed copyright comments.
+
 2004-11-26  Werner Koch  <wk at g10code.com>
 
 	* simple-gettext.c: New taken from gnupg 1.3.x
Index: gnupg/common/strsep.c
diff -u gnupg/common/strsep.c:1.1.2.1 gnupg/common/strsep.c:1.1.2.2
--- gnupg/common/strsep.c:1.1.2.1	Thu Dec  2 08:48:09 2004
+++ gnupg/common/strsep.c	Fri Dec  3 19:38:23 2004
@@ -1,31 +1,34 @@
 /* strsep.c - Replacement for strsep().
- * Copyright (C) 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1993, 1996, 1997, 1998, 1999,
+ *               2004 Free Software Foundation, Inc.
  *
- * This file is part of GnuPG.
+ * This file is part of the GNU C Library.
  *
- * GnuPG 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.
+ * The GNU C 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.1 of the License, or (at your option) any later version.
  *
- * GnuPG is distributed in the hope that it will be useful,
+ * The GNU C 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 General Public License for more details.
+ * 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 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
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the GNU C Library; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.  
  */
 
+/* Code taken from glibc-2.3.2/sysdeps/generic/strsep.c and slightly
+   modified for use with GnuPG. */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <stdio.h>
 #include <string.h>
 
-/* Code taken from glibc-2.2.1/sysdeps/generic/strsep.c */
-#warning need to get the correct copyright years from glibc
 char *
 strsep (char **stringp, const char *delim)
 {