X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstpncpy.c;h=7a645746097fcbe0dd1663d59f85100917b687fb;hb=6c9f1e88ada406b65f6b10098b8c9e60c973e614;hp=3f7473f946c80ca22541df32a836f86ea74dfda0;hpb=55da53d0db0c7a9fd82b2abc809560b3089df6a5;p=gnulib.git
diff --git a/lib/stpncpy.c b/lib/stpncpy.c
index 3f7473f94..7a6457460 100644
--- a/lib/stpncpy.c
+++ b/lib/stpncpy.c
@@ -1,11 +1,11 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007 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@gnu.org.
- This program is free software; you can redistribute it and/or modify it
+ 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) any
+ Free Software Foundation; either version 3 of the License, or any
later version.
This program is distributed in the hope that it will be useful,
@@ -14,27 +14,14 @@
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, see . */
/* This is almost copied from strncpy.c, written by Torbjorn Granlund. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
-#include "stpncpy.h"
-
-#if !HAVE_STPNCPY
-
-#ifndef _LIBC
-/* We cannot generally use the name 'stpncpy' since AIX 4 defines an unusable
- variant of the function but we cannot use it. */
-# undef stpncpy
-# define stpncpy gnu_stpncpy
-#endif
+#include
#ifndef weak_alias
# define __stpncpy stpncpy
@@ -102,5 +89,3 @@ __stpncpy (char *dest, const char *src, size_t n)
#ifdef weak_alias
weak_alias (__stpncpy, stpncpy)
#endif
-
-#endif