* lib/_cygwin_crt0_common.cc (_cygwin_crt0_common): Don't reset environ if

already set.
This commit is contained in:
Christopher Faylor 2000-07-12 04:02:45 +00:00
parent 1ff7263eb9
commit a0f7b496ad
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Wed Jul 12 00:01:03 2000 Christopher Faylor <cgf@cygnus.com>
* lib/_cygwin_crt0_common.cc (_cygwin_crt0_common): Don't reset
environ if already set.
Mon Jul 10 19:07:03 2000 Christopher Faylor <cgf@cygnus.com> Mon Jul 10 19:07:03 2000 Christopher Faylor <cgf@cygnus.com>
* fhandler_console.cc (fhandler_console::read): Unicode interface * fhandler_console.cc (fhandler_console::read): Unicode interface

View File

@ -71,7 +71,7 @@ extern "C"
{/* initial_sp */ 0, /* magic_biscuit */ 0, {/* initial_sp */ 0, /* magic_biscuit */ 0,
/* dll_major */ CYGWIN_VERSION_DLL_MAJOR, /* dll_major */ CYGWIN_VERSION_DLL_MAJOR,
/* dll_major */ CYGWIN_VERSION_DLL_MINOR, /* dll_major */ CYGWIN_VERSION_DLL_MINOR,
/* impure_ptr_ptr */ NULL, /*envptr */ NULL, /* impure_ptr_ptr */ NULL, /* envptr */ NULL,
/* malloc */ export_malloc, /* free */ export_free, /* malloc */ export_malloc, /* free */ export_free,
/* realloc */ export_realloc, /* realloc */ export_realloc,
/* fmode_ptr */ NULL, /* main */ NULL, /* ctors */ NULL, /* fmode_ptr */ NULL, /* main */ NULL, /* ctors */ NULL,

View File

@ -56,7 +56,10 @@ _cygwin_crt0_common (MainFunc f, per_process *u)
u->ctors = &__CTOR_LIST__; u->ctors = &__CTOR_LIST__;
u->dtors = &__DTOR_LIST__; u->dtors = &__DTOR_LIST__;
if (!u->envptr)
u->envptr = &environ; u->envptr = &environ;
else
environ = *(u->envptr);
if (uwasnull) if (uwasnull)
_impure_ptr = u->impure_ptr; /* Use field initialized in newer DLLs. */ _impure_ptr = u->impure_ptr; /* Use field initialized in newer DLLs. */
else else