X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=2626373f263a2fe5c113a344993b14c6a924e8ce;hb=595fe7f463f7fb72ad6acc58d885585590f8f285;hp=6f59717cfab46b0c6dd3d6f326cc87fc75e57888;hpb=0171fae6af885d8e76fb03a7f64f6f68fc6c5dd1;p=gnulib.git

diff --git a/lib/strndup.c b/lib/strndup.c
index 6f59717cf..2626373f2 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2005, 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.
@@ -15,41 +16,51 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
+#endif
+#if !_LIBC
+# include "strndup.h"
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
 
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
+#if !_LIBC
+# include "strnlen.h"
+# ifndef __strnlen
+#  define __strnlen strnlen
+# endif
 #endif
 
 #undef __strndup
-#undef strndup
+#if _LIBC
+# undef strndup
+#endif
 
 #ifndef weak_alias
 # define __strndup strndup
 #endif
 
 char *
-__strndup (const char *s, size_t n)
+__strndup (s, n)
+     const char *s;
+     size_t n;
 {
-  size_t len = strnlen (s, n);
+  size_t len = __strnlen (s, n);
   char *new = malloc (len + 1);
 
   if (new == NULL)
     return NULL;
 
   new[len] = '\0';
-  return (char *) memcpy (new, s, len);
+  return memcpy (new, s, len);
 }
+#ifdef libc_hidden_def
+libc_hidden_def (__strndup)
+#endif
 #ifdef weak_alias
 weak_alias (__strndup, strndup)
 #endif