libiberty: documentation markup and order fixes.
libiberty/:
* splay-tree.c: Escape wrapping newlines in texinfo markup
with '@', to fix function declaration output rendering.
* gather-docs: Relax and improve macro name matching to actually
match all current names and to allow input line wrapping.
* bsearch.c, concat.c, crc32.c, fnmatch.txh, fopen_unlocked.c,
hashtab.c, insque.c, make-relative-prefix.c, memchr.c, memcmp.c,
memcpy.c, memmem.c, memmove.c, mempcpy.c, memset.c,
pexecute.txh, random.c, setenv.c, setproctitle.c,
simple-object.txh, snprintf.c, stpncpy.c, strncmp.c, strtod.c,
strtol.c, vasprintf.c, vprintf.c, vsnprintf.c, xmemdup.c:
Wrap long texinfo input lines.
* functions.texi: Regenerate.
From-SVN: r169783
2011-02-03 08:23:20 +01:00
|
|
|
/* Copyright (C) 1992, 1995, 1996, 1997, 2002, 2011 Free Software Foundation,
|
|
|
|
Inc.
|
1999-05-26 05:13:18 +02:00
|
|
|
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,
|
2005-05-10 17:33:18 +02:00
|
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
1999-05-26 05:13:18 +02:00
|
|
|
|
configure.in (MAKEINFO, PERL): Detect these.
* configure.in (MAKEINFO, PERL): Detect these.
(--enable-maintainer-mode): Add.
* configure: Regenerate.
* Makefile.in (MAKEINFO, PERL): Define.
(libiberty.info, libiberty.dvi, libiberty.html): New.
(CFILES): Add bsearch.c.
(CONFIGURED_OFILES): New, list of objects configure might add.
(maint-missing, maint-buildall): New, for maintainers only.
(clean, mostlyclean): Add info/dvi/html files.
* libiberty.texi, copying-lib.texi, obstacks.texi, functions.texi: New.
* gather-docs: New, for maintainers.
* maint-tool: New, for maintainers.
* alloca.c, atexit.c, basename.c, bcmp.c, bcopy.c, bsearch.c,
bzero.c, calloc.c, clock.c, configure.in, configure, getcwd.c,
getpagesize.c, getpwd.c, index.c, memchr.c, memcmp.c, memcpy.c,
memmove.c, memset.c, putenv.c, rename.c, rindex.c, setenv.c,
sigsetmask.c, strcasecmp.c, strchr.c, strdup.c, strerror.c,
strncasecmp.c, strncmp.c, strrchr.c, strstr.c, strtod.c, strtol.c,
tmpnam.c, vfork.c, vprintf.c, waitpid.c, xatexit.c, xexit.c,
xmalloc.c, xmemdup.c, xstrdup.c, xstrerror.c: Add or update
documentation.
Co-Authored-By: Phil Edwards <pedwards@disaster.jaj.com>
From-SVN: r45828
2001-09-26 20:16:17 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
|
libiberty: documentation markup and order fixes.
libiberty/:
* splay-tree.c: Escape wrapping newlines in texinfo markup
with '@', to fix function declaration output rendering.
* gather-docs: Relax and improve macro name matching to actually
match all current names and to allow input line wrapping.
* bsearch.c, concat.c, crc32.c, fnmatch.txh, fopen_unlocked.c,
hashtab.c, insque.c, make-relative-prefix.c, memchr.c, memcmp.c,
memcpy.c, memmem.c, memmove.c, mempcpy.c, memset.c,
pexecute.txh, random.c, setenv.c, setproctitle.c,
simple-object.txh, snprintf.c, stpncpy.c, strncmp.c, strtod.c,
strtol.c, vasprintf.c, vprintf.c, vsnprintf.c, xmemdup.c:
Wrap long texinfo input lines.
* functions.texi: Regenerate.
From-SVN: r169783
2011-02-03 08:23:20 +01:00
|
|
|
@deftypefn Supplemental int setenv (const char *@var{name}, @
|
|
|
|
const char *@var{value}, int @var{overwrite})
|
configure.in (MAKEINFO, PERL): Detect these.
* configure.in (MAKEINFO, PERL): Detect these.
(--enable-maintainer-mode): Add.
* configure: Regenerate.
* Makefile.in (MAKEINFO, PERL): Define.
(libiberty.info, libiberty.dvi, libiberty.html): New.
(CFILES): Add bsearch.c.
(CONFIGURED_OFILES): New, list of objects configure might add.
(maint-missing, maint-buildall): New, for maintainers only.
(clean, mostlyclean): Add info/dvi/html files.
* libiberty.texi, copying-lib.texi, obstacks.texi, functions.texi: New.
* gather-docs: New, for maintainers.
* maint-tool: New, for maintainers.
* alloca.c, atexit.c, basename.c, bcmp.c, bcopy.c, bsearch.c,
bzero.c, calloc.c, clock.c, configure.in, configure, getcwd.c,
getpagesize.c, getpwd.c, index.c, memchr.c, memcmp.c, memcpy.c,
memmove.c, memset.c, putenv.c, rename.c, rindex.c, setenv.c,
sigsetmask.c, strcasecmp.c, strchr.c, strdup.c, strerror.c,
strncasecmp.c, strncmp.c, strrchr.c, strstr.c, strtod.c, strtol.c,
tmpnam.c, vfork.c, vprintf.c, waitpid.c, xatexit.c, xexit.c,
xmalloc.c, xmemdup.c, xstrdup.c, xstrerror.c: Add or update
documentation.
Co-Authored-By: Phil Edwards <pedwards@disaster.jaj.com>
From-SVN: r45828
2001-09-26 20:16:17 +02:00
|
|
|
@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,
|
2001-10-10 01:33:57 +02:00
|
|
|
the new value will be stored only if @var{overwrite} is nonzero.
|
configure.in (MAKEINFO, PERL): Detect these.
* configure.in (MAKEINFO, PERL): Detect these.
(--enable-maintainer-mode): Add.
* configure: Regenerate.
* Makefile.in (MAKEINFO, PERL): Define.
(libiberty.info, libiberty.dvi, libiberty.html): New.
(CFILES): Add bsearch.c.
(CONFIGURED_OFILES): New, list of objects configure might add.
(maint-missing, maint-buildall): New, for maintainers only.
(clean, mostlyclean): Add info/dvi/html files.
* libiberty.texi, copying-lib.texi, obstacks.texi, functions.texi: New.
* gather-docs: New, for maintainers.
* maint-tool: New, for maintainers.
* alloca.c, atexit.c, basename.c, bcmp.c, bcopy.c, bsearch.c,
bzero.c, calloc.c, clock.c, configure.in, configure, getcwd.c,
getpagesize.c, getpwd.c, index.c, memchr.c, memcmp.c, memcpy.c,
memmove.c, memset.c, putenv.c, rename.c, rindex.c, setenv.c,
sigsetmask.c, strcasecmp.c, strchr.c, strdup.c, strerror.c,
strncasecmp.c, strncmp.c, strrchr.c, strstr.c, strtod.c, strtol.c,
tmpnam.c, vfork.c, vprintf.c, waitpid.c, xatexit.c, xexit.c,
xmalloc.c, xmemdup.c, xstrdup.c, xstrerror.c: Add or update
documentation.
Co-Authored-By: Phil Edwards <pedwards@disaster.jaj.com>
From-SVN: r45828
2001-09-26 20:16:17 +02:00
|
|
|
The companion @code{unsetenv} function removes @var{name} from the
|
|
|
|
environment. This implementation is not safe for multithreaded code.
|
|
|
|
|
|
|
|
@end deftypefn
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
1999-05-26 05:13:18 +02:00
|
|
|
#if HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
2002-01-22 21:03:29 +01:00
|
|
|
#define setenv libiberty_setenv
|
|
|
|
#define unsetenv libiberty_unsetenv
|
|
|
|
|
1999-05-28 09:34:48 +02:00
|
|
|
#include "ansidecl.h"
|
1999-10-18 10:36:29 +02:00
|
|
|
#include <sys/types.h> /* For `size_t' */
|
|
|
|
#include <stdio.h> /* For `NULL' */
|
1999-05-28 09:34:48 +02:00
|
|
|
|
1999-05-26 05:13:18 +02:00
|
|
|
#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
|
2015-04-22 21:34:06 +02:00
|
|
|
#ifndef environ
|
1999-05-26 05:13:18 +02:00
|
|
|
extern char **environ;
|
|
|
|
#endif
|
2015-04-22 21:34:06 +02:00
|
|
|
#endif
|
1999-05-26 05:13:18 +02:00
|
|
|
|
2002-01-22 21:03:29 +01:00
|
|
|
#undef setenv
|
|
|
|
#undef unsetenv
|
|
|
|
|
1999-05-26 05:13:18 +02:00
|
|
|
/* 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
|
partition.h: Remove use of PARAMS.
include/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
* partition.h: Remove use of PARAMS.
* obstack.h: Remove conditional prototypes __STDC__.
* objalloc.h: Remove use of PARAMS.
* splay-tree.h: Likewise.
libiberty/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to use ISO C prototype style 5/n.
* random.c (srandom, initstate, setstate, random): Use ISO C
prototypes.
* putenv.c (putenv): Likewise.
* physmem.c (physmem_available, physmem_total, main):
Likewise.
* pex-win32.c (fix_argv, pexecute, pwait): Likewise.
* pex-unix.c (pexecute, pwait): Likewise.
* pex-msdos.c (pexecute, pwait): Likewise.
* pex-djgpp.c (pexecute, pwait): Likewise.
* partition.c (partition_new, partition_delete,
partition_union)
(elem_compare, partition_print): Likewise.
* obstack.c (_obstack_begin, _obstack_begin_1,
_obstack_newchunk,
_obstack_allocated_p, _obstack_free, obstack_free,
_obstack_memory_used, print_and_abort, obstack_next_free,
obstack_object_size, obstack_base): Likewise. Remove codes
predicated on !defined(__STDC__).
* objalloc.c (objalloc_create, _objalloc_alloc, objalloc_free,
objalloc_free_block): Use ISO C prototypes.
* mkstemps.c (mkstemps): Likewise.
* memset.c (memset): Likewise.
* mempcpy.c (mempcpy): Likewise.
* rename.c (rename): Likewise.
* rindex.c (rindex): Likewise.
* setenv.c (setenv, unsetenv): Likewise.
* sigsetmask.c (sigsetmask): Likewise.
* snprintf.c (snprintf): Likewise.
* sort.c (sort_pointers, xmalloc): Likewise.
* spaces.c (spaces): Likewise.
* splay-tree.c (splay_tree_delete_helper,
splay_tree_splay_helper, splay_tree_splay,
splay_tree_foreach_helper, splay_tree_xmalloc_allocate,
splay_tree_new, splay_tree_xmalloc_allocate,
splay_tree_new_with_allocator, splay_tree_delete,
splay_tree_insert, splay_tree_remove, splay_tree_lookup,
splay_tree_max, splay_tree_min, splay_tree_predecessor,
splay_tree_successor, splay_tree_foreach,
splay_tree_compare_ints, splay_tree_compare_pointers):
Likewise.
* stpcpy.c (stpcpy): Likewise.
* stpncpy.c (stpncpy): Likewise.
* strcasecmp.c (strcasecmp): Likewise.
* strchr.c (strchr): Likewise.
* strdup.c (strdup): Likewise.
From-SVN: r97125
2005-03-28 06:22:33 +02:00
|
|
|
setenv (const char *name, const char *value, int replace)
|
1999-05-26 05:13:18 +02:00
|
|
|
{
|
2000-07-21 22:08:36 +02:00
|
|
|
register char **ep = 0;
|
1999-05-26 05:13:18 +02:00
|
|
|
register size_t size;
|
|
|
|
const size_t namelen = strlen (name);
|
|
|
|
const size_t vallen = strlen (value) + 1;
|
|
|
|
|
|
|
|
LOCK;
|
|
|
|
|
|
|
|
size = 0;
|
|
|
|
if (__environ != NULL)
|
2000-06-07 23:13:14 +02:00
|
|
|
{
|
|
|
|
for (ep = __environ; *ep != NULL; ++ep)
|
|
|
|
if (!strncmp (*ep, name, namelen) && (*ep)[namelen] == '=')
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
++size;
|
|
|
|
}
|
1999-05-26 05:13:18 +02:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2005-05-24 22:48:25 +02:00
|
|
|
new_environ[size] = (char *) malloc (namelen + 1 + vallen);
|
1999-05-26 05:13:18 +02:00
|
|
|
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. */
|
2005-05-24 22:48:25 +02:00
|
|
|
char *new_string = (char *) malloc (namelen + 1 + vallen);
|
|
|
|
if (new_string == NULL)
|
1999-05-26 05:13:18 +02:00
|
|
|
{
|
|
|
|
UNLOCK;
|
|
|
|
return -1;
|
|
|
|
}
|
2005-05-24 22:48:25 +02:00
|
|
|
*ep = new_string;
|
1999-05-26 05:13:18 +02:00
|
|
|
}
|
|
|
|
memcpy (*ep, name, namelen);
|
|
|
|
(*ep)[namelen] = '=';
|
|
|
|
memcpy (&(*ep)[namelen + 1], value, vallen);
|
|
|
|
}
|
|
|
|
|
|
|
|
UNLOCK;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
partition.h: Remove use of PARAMS.
include/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
* partition.h: Remove use of PARAMS.
* obstack.h: Remove conditional prototypes __STDC__.
* objalloc.h: Remove use of PARAMS.
* splay-tree.h: Likewise.
libiberty/
2005-03-27 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to use ISO C prototype style 5/n.
* random.c (srandom, initstate, setstate, random): Use ISO C
prototypes.
* putenv.c (putenv): Likewise.
* physmem.c (physmem_available, physmem_total, main):
Likewise.
* pex-win32.c (fix_argv, pexecute, pwait): Likewise.
* pex-unix.c (pexecute, pwait): Likewise.
* pex-msdos.c (pexecute, pwait): Likewise.
* pex-djgpp.c (pexecute, pwait): Likewise.
* partition.c (partition_new, partition_delete,
partition_union)
(elem_compare, partition_print): Likewise.
* obstack.c (_obstack_begin, _obstack_begin_1,
_obstack_newchunk,
_obstack_allocated_p, _obstack_free, obstack_free,
_obstack_memory_used, print_and_abort, obstack_next_free,
obstack_object_size, obstack_base): Likewise. Remove codes
predicated on !defined(__STDC__).
* objalloc.c (objalloc_create, _objalloc_alloc, objalloc_free,
objalloc_free_block): Use ISO C prototypes.
* mkstemps.c (mkstemps): Likewise.
* memset.c (memset): Likewise.
* mempcpy.c (mempcpy): Likewise.
* rename.c (rename): Likewise.
* rindex.c (rindex): Likewise.
* setenv.c (setenv, unsetenv): Likewise.
* sigsetmask.c (sigsetmask): Likewise.
* snprintf.c (snprintf): Likewise.
* sort.c (sort_pointers, xmalloc): Likewise.
* spaces.c (spaces): Likewise.
* splay-tree.c (splay_tree_delete_helper,
splay_tree_splay_helper, splay_tree_splay,
splay_tree_foreach_helper, splay_tree_xmalloc_allocate,
splay_tree_new, splay_tree_xmalloc_allocate,
splay_tree_new_with_allocator, splay_tree_delete,
splay_tree_insert, splay_tree_remove, splay_tree_lookup,
splay_tree_max, splay_tree_min, splay_tree_predecessor,
splay_tree_successor, splay_tree_foreach,
splay_tree_compare_ints, splay_tree_compare_pointers):
Likewise.
* stpcpy.c (stpcpy): Likewise.
* stpncpy.c (stpncpy): Likewise.
* strcasecmp.c (strcasecmp): Likewise.
* strchr.c (strchr): Likewise.
* strdup.c (strdup): Likewise.
From-SVN: r97125
2005-03-28 06:22:33 +02:00
|
|
|
unsetenv (const char *name)
|
1999-05-26 05:13:18 +02:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|