X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrndup.c;h=b44db2570dbfec245884784b3849b487f0ed298b;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=6bceed0815c506b1cb5891cfb3901ec36e337dce;hpb=611f228f0629c5af6e412ded54121501dc1856be;p=gnulib.git
diff --git a/lib/strndup.c b/lib/strndup.c
index 6bceed081..b44db2570 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -1,49 +1,36 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* A replacement function, for systems that lack strndup.
-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.
+ Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 Free Software
+ Foundation, Inc.
-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, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see . */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include
-#include
-#include
+#include
-#ifdef STDC_HEADERS
-# include
-# include
-#else
-char *malloc ();
-#endif
+#include
-/* Duplicate S, returning an identical malloc'd string. */
char *
-strndup (s, n)
- const char *s;
- 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);
}