Throughout, change fdtab references to cygheap->fdtab.
* child_info.h (cygheap_exec_info): Eliminate special fdtab stuff. * spawn.cc (spawn_guts): Ditto. * cygheap.cc (cygheap_init): Initialize fdtab, if appropriate. * cygheap.h (CYGHEAPSIZE): Include size of init_cygheap. (_cmalloc_entry): Include fdtab here. * dtable.h (dtable): Declare/define new methods. * dtable.cc (dtable::vfork_child_fixup): New method. (dtable::fixup_after_exec): Remove unneeded extra arguments. * dcrt0.cc (dll_crt0_1): Ditto. * environ.cc (getwinenv): Use case sensitive comparison. (winenv): Make a copy of environment cache to avoid realloc problems when duplicate environment variables exist in the environment. (From Egor Duda) * net.cc (cygwin_socket): Revert Apr 14 change. * include/sys/file.h: Protect against previous X_OK definition. * passwd.cc: Eliminate passwd_sem throughout. * security.cc: Ditto. * cygwin.din: Export New functions. * passwd.cc (read_etc_passwd): Make race safe. (getpwuid_r): New function. (getpwnam_r): New function.
This commit is contained in:
@ -22,6 +22,7 @@ details. */
|
||||
#include "fhandler.h"
|
||||
#include "path.h"
|
||||
#include "cygerrno.h"
|
||||
#include "dtable.h"
|
||||
#include "cygheap.h"
|
||||
#include "registry.h"
|
||||
#include "environ.h"
|
||||
@ -105,7 +106,7 @@ getwinenv (const char *env, const char *in_posix)
|
||||
return NULL;
|
||||
|
||||
for (int i = 0; conv_envvars[i].name != NULL; i++)
|
||||
if (strncasematch (env, conv_envvars[i].name, conv_envvars[i].namelen))
|
||||
if (strncmp (env, conv_envvars[i].name, conv_envvars[i].namelen) == 0)
|
||||
{
|
||||
win_env *we = conv_envvars + i;
|
||||
const char *val;
|
||||
@ -735,10 +736,14 @@ winenv (const char * const *envp, int keep_posix)
|
||||
len = strcspn (*srcp, "=") + 1;
|
||||
win_env *conv;
|
||||
|
||||
if (!keep_posix && (conv = getwinenv (*srcp, *srcp + len)))
|
||||
*dstp = conv->native;
|
||||
else
|
||||
if (keep_posix || !(conv = getwinenv (*srcp, *srcp + len)))
|
||||
*dstp = *srcp;
|
||||
else
|
||||
{
|
||||
char *p = (char *) alloca (strlen (conv->native) + 1);
|
||||
strcpy (p, conv->native);
|
||||
*dstp = p;
|
||||
}
|
||||
tl += strlen (*dstp) + 1;
|
||||
if ((*dstp)[0] == '!' && isdrive ((*dstp) + 1) && (*dstp)[3] == '=')
|
||||
{
|
||||
|
Reference in New Issue
Block a user