X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=136e51c736d4c8656cd2ab3f11767028a876e554;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=1694d7305f58681bcade8e4c529eeb60a0f42866;hpb=d364a7148686bd3a5fece14236946173da128e85;p=gnulib.git

diff --git a/lib/strndup.c b/lib/strndup.c
index 1694d7305..136e51c73 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,37 +1,62 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   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.
 
-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
-Library General Public License for more details.
+   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.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.
 
-#include <config.h>
-#include <ansidecl.h>
-#include "xstring.h"
-#include "xmalloc.h"
+   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.  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#if defined _LIBC || defined STDC_HEADERS
+# include <stdlib.h>
+# include <string.h>
+#else
+char *malloc ();
+#endif
+
+#ifndef HAVE_DECL_STRNLEN
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRNLEN
+size_t strnlen ();
+#endif
+
+#undef __strndup
+#undef strndup
+
+#ifndef weak_alias
+# define __strndup strndup
+#endif
 
-/* Duplicate S, returning an identical malloc'd string.  */
 char *
-DEFUN(strndup, (s, n), const char *s AND size_t n)
+__strndup (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 (char *) memcpy (new, s, len);
 }
+#ifdef weak_alias
+weak_alias (__strndup, strndup)
+#endif