diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-01-24 07:40:58 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-01-24 07:40:58 +0000 |
| commit | 673458cfd60022db792628b671933064ae862424 (patch) | |
| tree | bf853c66f77e65c8860e9417a59b0fe1f3e51b03 /lib/strndup.c | |
| parent | 48f0b48d48240f7aa94e3f30cf3f007357468e30 (diff) | |
| download | gnulib-673458cfd60022db792628b671933064ae862424.tar.gz | |
Work around porting bugs reported by Dieter in
<http://lists.gnu.org/archive/html/bug-bison/2006-01/msg00049.html>.
* lib/getopt.c (_NOPROTO): Remove; no longer needed.
Include <stdlib.h> and <unistd.h> in all environments; it's safe now.
Include "getopt.h" first, to check interface.
(getenv): Declare only if defined HAVE_DECL_GETENV &&
!HAVE_DECL_GETENV.
* lib/strndup.c [!_LIBC]: Include "strndup.h" to get prototype.
(__strndup): Revert to K&R-style function dfns, the glibc style.
* lib/strnlen.c: Don't claim it's taken from glibc; it's not.
(strnlen, __strnlen): Remove #defines and #undefs; not needed.
Include strnlen.h first, to get prototype properly.
(strnlen): Renamed from __strnlen.
Remove weak alias.
* m4/getopt.m4 (gl_PREREQ_GETOPT): Check for getenv decl.
Diffstat (limited to 'lib/strndup.c')
| -rw-r--r-- | lib/strndup.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/strndup.c b/lib/strndup.c index 9ac2756a2b..932a83e4c7 100644 --- 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. @@ -20,12 +21,19 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif +#if !_LIBC +# include "strndup.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 @@ -35,9 +43,11 @@ #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) @@ -46,6 +56,9 @@ __strndup (const char *s, size_t n) 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 |