projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify my *-tests modules.
[gnulib.git]
/
lib
/
strndup.c
diff --git
a/lib/strndup.c
b/lib/strndup.c
index
6f59717
..
9ac2756
100644
(file)
--- a/
lib/strndup.c
+++ b/
lib/strndup.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000
, 2003, 2005
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.
@@
-15,21
+15,17
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
#ifdef HAVE_CONFIG_H
#ifdef HAVE_CONFIG_H
-# include
"config.h"
+# include
<config.h>
#endif
#endif
-#include <std
io
.h>
-#include <s
ys/types
.h>
+#include <std
lib
.h>
+#include <s
tring
.h>
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-#endif
+/* Get strnlen. */
+#include "strnlen.h"
#undef __strndup
#undef strndup
#undef __strndup
#undef strndup
@@
-48,7
+44,7
@@
__strndup (const char *s, size_t n)
return NULL;
new[len] = '\0';
return NULL;
new[len] = '\0';
- return
(char *)
memcpy (new, s, len);
+ return memcpy (new, s, len);
}
#ifdef weak_alias
weak_alias (__strndup, strndup)
}
#ifdef weak_alias
weak_alias (__strndup, strndup)