projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant AC_SUBST invocation.
[gnulib.git]
/
lib
/
strndup.c
diff --git
a/lib/strndup.c
b/lib/strndup.c
index
b610e40
..
6b01f7d
100644
(file)
--- a/
lib/strndup.c
+++ b/
lib/strndup.c
@@
-1,47
+1,37
@@
-/*
Copyright (C) 1996, 1997 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, 1997, 1998, 2001, 2002, 2003, 2005, 2006, 2007, 2009,
+
2010 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,
-
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"
-#endif
+#include <config.h>
-#include <stdio.h>
-#include <sys/types.h>
+#include <string.h>
-#ifdef STDC_HEADERS
-# include <string.h>
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
+#include <stdlib.h>
-/* Duplicate S, returning an identical malloc'd string. */
char *
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;
if (new == NULL)
return NULL;
- new[n] = '\0';
- return
(char *) memcpy (new, s,
n);
+ new[
le
n] = '\0';
+ return
memcpy (new, s, le
n);
}
}