X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=2626373f263a2fe5c113a344993b14c6a924e8ce;hb=04597d099c32b9b380b6c82eed97fb88ef467d2e;hp=a23060e3819ba9d0604c421e443e595d446f347c;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git

diff --git a/lib/strndup.c b/lib/strndup.c
index a23060e38..2626373f2 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,49 +1,66 @@
-/* Copyright (C) 1996 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.
+   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.
 
-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
-later version.
+   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
+   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.
+   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.  */
+   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., 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 <stdlib.h>
+#include <string.h>
+
+#if !_LIBC
+# include "strnlen.h"
+# ifndef __strnlen
+#  define __strnlen strnlen
+# endif
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
+#undef __strndup
+#if _LIBC
+# undef strndup
+#endif
 
-#ifdef STDC_HEADERS
-# include <string.h>
-# include <stdlib.h>
-#else
-char *malloc ();
+#ifndef weak_alias
+# define __strndup strndup
 #endif
 
-/* Duplicate S, returning an identical malloc'd string.  */
 char *
-strndup (s, n)
+__strndup (s, n)
      const char *s;
      size_t n;
 {
-  char *new = malloc (n + 1);
+  size_t len = __strnlen (s, n);
+  char *new = malloc (len + 1);
 
   if (new == NULL)
     return NULL;
 
-  memcpy (new, s, n);
-  new[n] = '\0';
-
-  return new;
+  new[len] = '\0';
+  return memcpy (new, s, len);
 }
+#ifdef libc_hidden_def
+libc_hidden_def (__strndup)
+#endif
+#ifdef weak_alias
+weak_alias (__strndup, strndup)
+#endif