[PATCH] Cygwin: console: Fix restoring console mode failure.

[Takashi Yano via Cygwin-patches]

- Restoring console mode fails in the following scenario.
   1) Start cygwin shell in command prompt.
   2) Run 'exec chcp.com'.
  This patch fixes the issue.
---
 winsup/cygwin/fhandler.h |  1 +
 winsup/cygwin/spawn.cc   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index ad90cf33d..9b85d1ee9 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -2251,6 +2251,7 @@ private:
                               const handle_set_t *p);
 
   static void cons_master_thread (handle_set_t *p, tty *ttyp);
+  pid_t get_owner (void) { return shared_console_info->con.owner; }
 
   friend tty_min * tty_list::get_cttyp ();
 };
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 323630fcb..490675859 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -608,6 +608,7 @@ child_info_spawn::worker (const char *prog_arg, const char 
*const *argv,
       fhandler_pty_slave *ptys_primary = NULL;
       fhandler_console *cons_native = NULL;
       termios *cons_ti = NULL;
+      pid_t cons_owner = 0;
       for (int i = 0; i < 3; i ++)
        {
          const int chk_order[] = {1, 0, 2};
@@ -628,6 +629,7 @@ child_info_spawn::worker (const char *prog_arg, const char 
*const *argv,
                    {
                      cons_native = cons;
                      cons_ti = &((tty *)cons->tc ())->ti;
+                     cons_owner = cons->get_owner ();
                    }
                  if (fd == 0)
                    fhandler_console::set_input_mode (tty::native,
@@ -1000,9 +1002,11 @@ child_info_spawn::worker (const char *prog_arg, const 
char *const *argv,
            }
          if (cons_native)
            {
-             fhandler_console::set_output_mode (tty::cygwin, cons_ti,
+             tty::cons_mode mode =
+               cons_owner == myself->pid ? tty::restore : tty::cygwin;
+             fhandler_console::set_output_mode (mode, cons_ti,
                                                 &cons_handle_set);
-             fhandler_console::set_input_mode (tty::cygwin, cons_ti,
+             fhandler_console::set_input_mode (mode, cons_ti,
                                                &cons_handle_set);
              fhandler_console::close_handle_set (&cons_handle_set);
            }
@@ -1035,9 +1039,11 @@ child_info_spawn::worker (const char *prog_arg, const 
char *const *argv,
            }
          if (cons_native)
            {
-             fhandler_console::set_output_mode (tty::cygwin, cons_ti,
+             tty::cons_mode mode =
+               cons_owner == myself->pid ? tty::restore : tty::cygwin;
+             fhandler_console::set_output_mode (mode, cons_ti,
                                                 &cons_handle_set);
-             fhandler_console::set_input_mode (tty::cygwin, cons_ti,
+             fhandler_console::set_input_mode (mode, cons_ti,
                                                &cons_handle_set);
              fhandler_console::close_handle_set (&cons_handle_set);
            }
-- 
2.30.1