projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve clash between stdint.m4 and uintmax_t.m4.
[gnulib.git]
/
lib
/
strndup.c
diff --git
a/lib/strndup.c
b/lib/strndup.c
index
b2d7c0e
..
2626373
100644
(file)
--- a/
lib/strndup.c
+++ b/
lib/strndup.c
@@
-1,4
+1,5
@@
-/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2005, 2006 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.
@@
-18,26
+19,37
@@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
+#endif
+#if !_LIBC
+# include "strndup.h"
#endif
#include <stdlib.h>
#include <string.h>
#endif
#include <stdlib.h>
#include <string.h>
-/* Get strnlen. */
-#include "strnlen.h"
+#if !_LIBC
+# include "strnlen.h"
+# ifndef __strnlen
+# define __strnlen strnlen
+# endif
+#endif
#undef __strndup
#undef __strndup
-#undef strndup
+#if _LIBC
+# undef strndup
+#endif
#ifndef weak_alias
# define __strndup strndup
#endif
char *
#ifndef weak_alias
# define __strndup strndup
#endif
char *
-__strndup (const char *s, size_t n)
+__strndup (s, n)
+ const char *s;
+ size_t n;
{
{
- size_t len = strnlen (s, n);
+ size_t len =
__
strnlen (s, n);
char *new = malloc (len + 1);
if (new == NULL)
char *new = malloc (len + 1);
if (new == NULL)
@@
-46,6
+58,9
@@
__strndup (const char *s, size_t n)
new[len] = '\0';
return memcpy (new, s, len);
}
new[len] = '\0';
return memcpy (new, s, len);
}
+#ifdef libc_hidden_def
+libc_hidden_def (__strndup)
+#endif
#ifdef weak_alias
weak_alias (__strndup, strndup)
#endif
#ifdef weak_alias
weak_alias (__strndup, strndup)
#endif