diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/spawn.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9f0686cfe..7c3eb28e8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -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> * dcrt0.cc (child_info_fork::alloc_stack): Don't subtract 4096 from diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 89d4ddcb9..a566b4e9d 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -327,7 +327,6 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, tmp_pathbuf tp; PWCHAR runpath = tp.w_get (); int c_flags; - bool wascygexec; bool null_app_name = false; STARTUPINFOW si = {}; @@ -371,7 +370,6 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, goto out; } - wascygexec = real_path.iscygexec (); res = newargv.fixup (prog_arg, real_path, ext, p_type_exec); if (res) @@ -406,7 +404,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, } else { - if (wascygexec) + if (real_path.iscygexec ()) newargv.dup_all (); else if (!one_line.fromargv (newargv, real_path.get_win32 (), real_path.iscygexec ())) |