espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-01 08:54:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

* pex-unix.c (pex_unix_exec_child): Save/restore environ.

Browse Source
This commit is contained in:
Doug Evans
2009-12-08 07:15:36 +00:00
parent 3281215912
commit 16b8170d50
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libiberty/ChangeLog
View File

@ -1,3 +1,7 @@
2009-12-07 Doug Evans <dje@google.com>
* pex-unix.c (pex_unix_exec_child): Save/restore environ.
2009-11-26 Ben Elliston <bje@au.ibm.com> 2009-11-26 Ben Elliston <bje@au.ibm.com>
* configure.ac (AC_CHECK_FUNCS): Sort into alphabetic order. * configure.ac (AC_CHECK_FUNCS): Sort into alphabetic order.

19
libiberty/pex-unix.c
View File

@ -400,6 +400,12 @@ pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
volatile int sleep_interval; volatile int sleep_interval;
volatile int retries; volatile int retries;
/* We vfork and then set environ in the child before calling execvp.
This clobbers the parent's environ so we need to restore it.
It would be nice to use one of the exec* functions that takes an
environment as a parameter, but that may have portability issues. */
char **save_environ = environ;
sleep_interval = 1; sleep_interval = 1;
pid = -1; pid = -1;
for (retries = 0; retries < 4; ++retries) for (retries = 0; retries < 4; ++retries)
@ -453,7 +459,12 @@ pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
} }
if (env) if (env)
{
/* NOTE: In a standard vfork implementation this clobbers the
parent's copy of environ "too" (in reality there's only one copy).
This is ok as we restore it below. */
environ = (char**) env; environ = (char**) env;
}
if ((flags & PEX_SEARCH) != 0) if ((flags & PEX_SEARCH) != 0)
{ {
@ -471,6 +482,14 @@ pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
default: default:
/* Parent process. */ /* Parent process. */
/* Restore environ.
Note that the parent either doesn't run until the child execs/exits
(standard vfork behaviour), or if it does run then vfork is behaving
more like fork. In either case we needn't worry about clobbering
the child's copy of environ. */
environ = save_environ;
if (in != STDIN_FILE_NO) if (in != STDIN_FILE_NO)
{ {
if (close (in) < 0) if (close (in) < 0)