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

* spawn.cc (child_info_spawn::worker): Eliminate wascygexec.

Browse Source
This commit is contained in:
Christopher Faylor 2013-06-19 14:39:00 +00:00
parent 92d098c9ca
commit 9e8cf6ebbd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2013-06-18 Corinna Vinschen <corinna@vinschen.de>
* spawn.cc (child_info_spawn::worker): Eliminate wascygexec.
2013-06-18 Christopher Faylor <me.cygwin2013@cgf.cx> 2013-06-18 Christopher Faylor <me.cygwin2013@cgf.cx>
* dcrt0.cc (child_info_fork::alloc_stack): Don't subtract 4096 from * dcrt0.cc (child_info_fork::alloc_stack): Don't subtract 4096 from

4
winsup/cygwin/spawn.cc
View File

@ -327,7 +327,6 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
tmp_pathbuf tp; tmp_pathbuf tp;
PWCHAR runpath = tp.w_get (); PWCHAR runpath = tp.w_get ();
int c_flags; int c_flags;
bool wascygexec;
bool null_app_name = false; bool null_app_name = false;
STARTUPINFOW si = {}; STARTUPINFOW si = {};
@ -371,7 +370,6 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
goto out; goto out;
} }
wascygexec = real_path.iscygexec ();
res = newargv.fixup (prog_arg, real_path, ext, p_type_exec); res = newargv.fixup (prog_arg, real_path, ext, p_type_exec);
if (res) if (res)
@ -406,7 +404,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
} }
else else
{ {
if (wascygexec) if (real_path.iscygexec ())
newargv.dup_all (); newargv.dup_all ();
else if (!one_line.fromargv (newargv, real_path.get_win32 (), else if (!one_line.fromargv (newargv, real_path.get_win32 (),
real_path.iscygexec ())) real_path.iscygexec ()))