JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dcrt0.cc (initial_env): Don't attempt stracing if dynamically loaded.

Browse Source 
(dll_crt0_0): Move console initialization earlier.
* init.cc (dll_entry): Move console initialization here.
* exceptions.cc (init_console_handler): Fully remove any old console handler.
* spawn.cc (spawn_guts): Don't fill out windows argv if we've deduced that this
is a cygwin-using program.
(av::fixup): Always check executables to see if they are using cygwin1.dll.
Don't consider .com files to be scripts.
* hookapi.cc (rvadelta): New function.
(PEHeaderFromHModule): Simplify slightly.
(hook_or_detect_cygwin): Use passed in name argument for "HMODULE" rather than
incorrectly reading current program.  Calculate delta needed to read image data
and file names if this isn't a real "HMODULE".
This commit is contained in:
Christopher Faylor
2005-09-07 03:10:17 +00:00
parent e92fdf0163
commit 41ff9d8c7d
6 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/spawn.cc
View File

@@ -279,7 +279,7 @@ class av
bool win16_exe;
bool iscygwin;
av (): argv (NULL) {}
av (int ac_in, const char * const *av_in) : calloced (0), error (false), argc (ac_in), win16_exe (false), iscygwin (true)
av (int ac_in, const char * const *av_in) : calloced (0), error (false), argc (ac_in), win16_exe (false), iscygwin (false)
{
argv = (char **) cmalloc (HEAP_1_ARGV, (argc + 5) * sizeof (char *));
memcpy (argv, av_in, (argc + 1) * sizeof (char *));
@@ -459,6 +459,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
one_line.add (argv[2]);
strcpy (real_path, argv[0]);
null_app_name = true;
newargv.iscygwin = false;
goto skip_arg_parsing;
}
@@ -476,7 +477,7 @@ spawn_guts (const char * prog_arg, const char *const *argv,
if (res)
goto out;
if (real_path.iscygexec ())
if (real_path.iscygexec () || newargv.iscygwin)
newargv.dup_all ();
else
{
@@ -1020,9 +1021,7 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path,
{
/* If the file name ends in either .exe, .com, .bat, or .cmd we assume
that it is NOT a script file */
while (*ext == '\0' || chtype == PROC_SPAWN
|| (wincap.detect_win16_exe () && (strcasematch (ext, ".exe")
|| strcasematch (ext, ".com"))))
while (1)
{
HANDLE h = CreateFile (real_path, GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -1092,6 +1091,11 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path,
UnmapViewOfFile (buf);
if (!pgm)
{
if (strcasematch (ext, ".com"))
{
iscygwin = false;
break;
}
pgm = (char *) "/bin/sh";
arg1 = NULL;
}