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

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9f0686cfe3339aa66f7d888221b00dbc84a6d68e..7c3eb28e887515fc4dd921d8283f55a80ae098c2 100644 (file)
--- 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 89d4ddcb9fc592e1273a1cb1856f24b9f46b99e4..a566b4e9ddc9e3751a8cb79c0e29f3589bf517e6 100644 (file)
--- 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 ()))