X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstpcpy.c;h=4089d3946a4a24e6273435f44b9f949fda0f8d59;hb=2e7980e7a83a290bfaf0638bd95a9cbfeec0f67d;hp=0ad8863cd06b8b17607384dad6c2f055df6bbe79;hpb=db2d10a7ddf742cd76aee1aa9d82893443ebd8a8;p=gnulib.git

diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index 0ad8863cd..4089d3946 100644
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc.
+/* stpcpy.c -- copy a string and return pointer to end of new string
+   Copyright (C) 1992, 1995, 1997-1998, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -14,18 +15,17 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <string.h>
 
 #undef __stpcpy
-#undef stpcpy
+#ifdef _LIBC
+# undef stpcpy
+#endif
 
 #ifndef weak_alias
 # define __stpcpy stpcpy
@@ -33,9 +33,7 @@
 
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
 char *
-__stpcpy (dest, src)
-     char *dest;
-     const char *src;
+__stpcpy (char *dest, const char *src)
 {
   register char *d = dest;
   register const char *s = src;