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

diff --git a/lib/strndup.c b/lib/strndup.c
index 1694d7305..dd446a88f 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,37 +1,37 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* A replacement function, for systems that lack strndup.
 
-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.
+   Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2011 Free Software
+   Foundation, Inc.
 
-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.
+
+   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.  */
 
 #include <config.h>
-#include <ansidecl.h>
-#include "xstring.h"
-#include "xmalloc.h"
 
+#include <string.h>
+
+#include <stdlib.h>
 
-/* Duplicate S, returning an identical malloc'd string.  */
 char *
-DEFUN(strndup, (s, n), const char *s AND size_t n)
+strndup (char const *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);
 }