* path.h (enum path_types): Drop definition of PATH_64BITEXEC.

(path_conv::iscygexec32): Drop unused inline function.
	(path_conv::iscygexec64): Ditto.
	(path_conv::set_cygexec): Remove unnecessary setting of PATH_64BITEXEC.
	* spawn.cc (child_info_spawn::worker): Disable setting of
	STARTUPINFOW::lpReserved2 and STARTUPINFOW::cbReserved2 for non-Cygwin
	child processes.  Explain why.
This commit is contained in:
Corinna Vinschen
2013-08-23 09:29:25 +00:00
parent 20b311fd8e
commit 10822894db
3 changed files with 23 additions and 15 deletions

View File

@@ -87,8 +87,7 @@ enum path_types
PATH_TEXT = 0x02000000,
PATH_REP = 0x04000000,
PATH_HAS_SYMLINKS = 0x10000000,
PATH_SOCKET = 0x40000000,
PATH_64BITEXEC = 0x80000000
PATH_SOCKET = 0x40000000
};
class symlink_info;
@@ -190,12 +189,6 @@ class path_conv
int is_lnk_special () const {return is_fs_device () || isfifo () || is_lnk_symlink ();}
int issocket () const {return dev.is_device (FH_UNIX);}
int iscygexec () const {return path_flags & PATH_CYGWIN_EXEC;}
int iscygexec32 () const
{return (path_flags & (PATH_CYGWIN_EXEC | PATH_64BITEXEC))
== PATH_CYGWIN_EXEC;}
int iscygexec64 () const
{return (path_flags & (PATH_CYGWIN_EXEC | PATH_64BITEXEC))
== (PATH_CYGWIN_EXEC | PATH_64BITEXEC);}
int isopen () const {return path_flags & PATH_OPEN;}
int isctty_capable () const {return path_flags & PATH_CTTY;}
void set_cygexec (bool isset)
@@ -208,11 +201,7 @@ class path_conv
void set_cygexec (void *target)
{
if (target)
{
path_flags |= PATH_CYGWIN_EXEC;
if (target == (void *) 64)
path_flags |= PATH_64BITEXEC;
}
path_flags |= PATH_CYGWIN_EXEC;
else
path_flags &= ~PATH_CYGWIN_EXEC;
}