mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-30 23:35:00 +08:00
d7cf8390c7
include/ 2005-05-24 Gabriel Dos Reis <gdr@integrable-solutions.net> * libiberty.h (ACONCAT): Properly cast value of alloca(). * ansidecl.h (ATTRIBUTE_UNUSED_LABEL): Don't define if __cplusplus. libiberty/ 2005-05-24 Gabriel Dos Reis <gdr@integrable-solutions.net> * configure.ac: Check declarations for calloc(), getenv(), malloc(), realloc() and sbrk(). * config.in: Regenerate. * configure: Likewise. * alloca.c (C_alloca): Change "new" to "new_storage". Use XNEWVEC instead of xmalloc. * choose-temp.c (choose_temp_base): Use XNEWVEC instea od xmalloc. * concat.c (liiberty_concat_ptr): Surround definition with an extern "C" block, if __cplusplus. (concat): Use XNEWVEC instead of xmalloc. (reconcat): Likewise. * cp-demangle.c (struct d_print_template): Rename member "template" to "template_decl". Adjust use throughout the file. (d_print_resize): Properly cast return value of realloc(). (cplus_demangle_print): Same for malloc(). (d_demangle): Likewise. * cp-demint.c (cplus_demangle_fill_builtin_type): Rename parameter "typename" to "type_name". * cplus-dem.c (grow_vect): Use XRESIZEVEC instead of xrealloc(). (work_stuff_copy_to_from): Use XNEWVEC insteand of xmalloc(). (demangle_template_value_parm): Likewise. (demangle_template): Likewise. (recursively_demangle): Likewise. (do_hpacc_template_literal): Likewise. (do_arg): Likewise. (remember_type): Likewise. (remember_Ktype): Likewise. (register_Btype): Likewise. (string_need): Use XRESIZEVEC instead of xrealloc(). * dyn-string.c (dyn_string_init): Use XNEWVEC. (dyn_string_new): Use XNEW. (dyn_string_resize): Use XRESIZEVEC. * fnmatch.c (fnmatch): Rename local variable "not" to "negate". * getopt.c (getenv): Declare only if !__cplusplus and !getenv. Otherwise include <stdlib.h>. (exchange): Cast return value of malloc(). * hashtab.c (htab_size): Define as both macro and non-inline function. (htab_elements): Likewise. * getpwd.c (getpwd): Use XNEWVEC. (htab_create_alloc_ex): Use C90 prototype-style. * lrealpath.c (lrealpath): Appropriately cast return value of malloc(). * make-relative-prefix.c (save_string): Likewise. * make-temp-file.c (try_dir): Rename from "try". Adjust use in the file. (choose_tmpdir): Use XNEWVEC. * mkstemps.c (mkstemps): Rename parameter "template" to "pattern". * pex-common.c (pex_init_common): Use XNEW. (pex_add_remove): Use XRESIZEVEC. (pex_run): Likewise. (pex_get_status_and_time): Likewise. * pex-djgpp.c (pex_djgpp_exec_child): Likewise. * pex-msdos.c (pex_init): Use XNEW. (pex_msdos_exec_child): Likewise. (pex_msdos_exec_child): Use XRESIZEVEC. * pex-unix.c (pex_wait): Use XNEW. * pex-win32.c (fix_argv): Use XNEWVEC. * pexecute.c (pwait): Likewise. * setenv.c (setenv): Properly cast return value of malloc(). * sigsetmask.c (sigsetmask): Rename local variables "old" and "new" to "old_sig" and "new_sig". * sort.c (main): Use XNEWVEC. * spaces.c (spaces): Cast return value of malloc(). * strndup.c (strndup): Likewise. * ternary.c (ternary_insert): Use XNEW. * xmalloc.c (malloc, realloc, calloc, sbrk): Surround declaration with an extern "C" block if __cplusplus. * xstrdup.c (xstrdup): Cast return value of memcpy(). * xstrerror.c (strerror): Enclose declaration in an extern "C" block if __cplusplus. * xstrndup.c (xstrndup): Use XNEW. Cast return value of memcpy(). From-SVN: r100115
184 lines
4.5 KiB
C
184 lines
4.5 KiB
C
/* Copyright (C) 1992, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
|
|
This file based on setenv.c in the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
|
|
/*
|
|
|
|
@deftypefn Supplemental int setenv (const char *@var{name}, const char *@var{value}, int @var{overwrite})
|
|
@deftypefnx Supplemental void unsetenv (const char *@var{name})
|
|
|
|
@code{setenv} adds @var{name} to the environment with value
|
|
@var{value}. If the name was already present in the environment,
|
|
the new value will be stored only if @var{overwrite} is nonzero.
|
|
The companion @code{unsetenv} function removes @var{name} from the
|
|
environment. This implementation is not safe for multithreaded code.
|
|
|
|
@end deftypefn
|
|
|
|
*/
|
|
|
|
#if HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#define setenv libiberty_setenv
|
|
#define unsetenv libiberty_unsetenv
|
|
|
|
#include "ansidecl.h"
|
|
#include <sys/types.h> /* For `size_t' */
|
|
#include <stdio.h> /* For `NULL' */
|
|
|
|
#include <errno.h>
|
|
#if !defined(errno) && !defined(HAVE_ERRNO_DECL)
|
|
extern int errno;
|
|
#endif
|
|
#define __set_errno(ev) ((errno) = (ev))
|
|
|
|
#if HAVE_STDLIB_H
|
|
# include <stdlib.h>
|
|
#endif
|
|
#if HAVE_STRING_H
|
|
# include <string.h>
|
|
#endif
|
|
#if HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#define __environ environ
|
|
#ifndef HAVE_ENVIRON_DECL
|
|
extern char **environ;
|
|
#endif
|
|
|
|
#undef setenv
|
|
#undef unsetenv
|
|
|
|
/* LOCK and UNLOCK are defined as no-ops. This makes the libiberty
|
|
* implementation MT-Unsafe. */
|
|
#define LOCK
|
|
#define UNLOCK
|
|
|
|
/* Below this point, it's verbatim code from the glibc-2.0 implementation */
|
|
|
|
/* If this variable is not a null pointer we allocated the current
|
|
environment. */
|
|
static char **last_environ;
|
|
|
|
|
|
int
|
|
setenv (const char *name, const char *value, int replace)
|
|
{
|
|
register char **ep = 0;
|
|
register size_t size;
|
|
const size_t namelen = strlen (name);
|
|
const size_t vallen = strlen (value) + 1;
|
|
|
|
LOCK;
|
|
|
|
size = 0;
|
|
if (__environ != NULL)
|
|
{
|
|
for (ep = __environ; *ep != NULL; ++ep)
|
|
if (!strncmp (*ep, name, namelen) && (*ep)[namelen] == '=')
|
|
break;
|
|
else
|
|
++size;
|
|
}
|
|
|
|
if (__environ == NULL || *ep == NULL)
|
|
{
|
|
char **new_environ;
|
|
if (__environ == last_environ && __environ != NULL)
|
|
/* We allocated this space; we can extend it. */
|
|
new_environ = (char **) realloc (last_environ,
|
|
(size + 2) * sizeof (char *));
|
|
else
|
|
new_environ = (char **) malloc ((size + 2) * sizeof (char *));
|
|
|
|
if (new_environ == NULL)
|
|
{
|
|
UNLOCK;
|
|
return -1;
|
|
}
|
|
|
|
new_environ[size] = (char *) malloc (namelen + 1 + vallen);
|
|
if (new_environ[size] == NULL)
|
|
{
|
|
free ((char *) new_environ);
|
|
__set_errno (ENOMEM);
|
|
UNLOCK;
|
|
return -1;
|
|
}
|
|
|
|
if (__environ != last_environ)
|
|
memcpy ((char *) new_environ, (char *) __environ,
|
|
size * sizeof (char *));
|
|
|
|
memcpy (new_environ[size], name, namelen);
|
|
new_environ[size][namelen] = '=';
|
|
memcpy (&new_environ[size][namelen + 1], value, vallen);
|
|
|
|
new_environ[size + 1] = NULL;
|
|
|
|
last_environ = __environ = new_environ;
|
|
}
|
|
else if (replace)
|
|
{
|
|
size_t len = strlen (*ep);
|
|
if (len + 1 < namelen + 1 + vallen)
|
|
{
|
|
/* The existing string is too short; malloc a new one. */
|
|
char *new_string = (char *) malloc (namelen + 1 + vallen);
|
|
if (new_string == NULL)
|
|
{
|
|
UNLOCK;
|
|
return -1;
|
|
}
|
|
*ep = new_string;
|
|
}
|
|
memcpy (*ep, name, namelen);
|
|
(*ep)[namelen] = '=';
|
|
memcpy (&(*ep)[namelen + 1], value, vallen);
|
|
}
|
|
|
|
UNLOCK;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
unsetenv (const char *name)
|
|
{
|
|
const size_t len = strlen (name);
|
|
char **ep;
|
|
|
|
LOCK;
|
|
|
|
for (ep = __environ; *ep; ++ep)
|
|
if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
|
|
{
|
|
/* Found it. Remove this pointer by moving later ones back. */
|
|
char **dp = ep;
|
|
do
|
|
dp[0] = dp[1];
|
|
while (*dp++);
|
|
/* Continue the loop in case NAME appears again. */
|
|
}
|
|
|
|
UNLOCK;
|
|
}
|