Mercurial > hg > octave-kai > gnulib-hg
view lib/strndup.c @ 6587:453776fca04b
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.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 24 Jan 2006 07:40:58 +0000 |
parents | 96c32553b4c6 |
children | f63adaadabfa |
line wrap: on
line source
/* 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. 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. 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 #if !_LIBC # include "strndup.h" #endif #include <stdlib.h> #include <string.h> #if !_LIBC # include "strnlen.h" # ifndef __strnlen # define __strnlen strnlen # endif #endif #undef __strndup #undef strndup #ifndef weak_alias # define __strndup strndup #endif char * __strndup (s, n) const char *s; size_t n; { size_t len = __strnlen (s, n); char *new = malloc (len + 1); if (new == NULL) return NULL; 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