public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH 8/8] Cygwin: console: Set console mode even if stdin/stdout is redirected.
Date: Sun, 13 Feb 2022 23:39:10 +0900	[thread overview]
Message-ID: <20220213143910.1947-9-takashi.yano@nifty.ne.jp> (raw)
In-Reply-To: <20220213143910.1947-1-takashi.yano@nifty.ne.jp>

- When non-cygwin app is started in console, console mode is set to
  tty::native. However, if stdin is redirected, current code does not
  set the input mode of the console. In this case, if the app opens
  "CONIN$", the console mode will not be appropriate for non-cygwin
  app. This patch fixes the issue.

Addresses:
https://github.com/GitCredentialManager/git-credential-manager/issues/576
---
 winsup/cygwin/spawn.cc | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 81dba5a94..a7e25cc20 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -627,23 +627,18 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
 	    }
 	  else if (fh && fh->get_major () == DEV_CONS_MAJOR)
 	    {
-	      fhandler_console *cons = (fhandler_console *) fh;
-	      if (!iscygwin ())
+	      if (!iscygwin () && cons_native == NULL)
 		{
-		  if (cons_native == NULL)
-		    {
-		      cons_native = cons;
-		      cons_ti = &((tty *)cons->tc ())->ti;
-		      cons_owner = cons->get_owner ();
-		    }
+		  fhandler_console *cons = (fhandler_console *) fh;
+		  cons_native = cons;
+		  cons_ti = &((tty *)cons->tc ())->ti;
+		  cons_owner = cons->get_owner ();
 		  tty::cons_mode conmode =
 		    (ctty_pgid && ctty_pgid == myself->pgid) ?
 		    tty::native : tty::restore;
-		  if (fd == 0)
-		    fhandler_console::set_input_mode (conmode,
+		  fhandler_console::set_input_mode (conmode,
 					   cons_ti, cons->get_handle_set ());
-		  else if (fd == 1 || fd == 2)
-		    fhandler_console::set_output_mode (conmode,
+		  fhandler_console::set_output_mode (conmode,
 					   cons_ti, cons->get_handle_set ());
 		}
 	    }
-- 
2.35.1


      parent reply	other threads:[~2022-02-13 14:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-13 14:39 [PATCH 0/8] Several modifications for pty and console code Takashi Yano
2022-02-13 14:39 ` [PATCH 1/8] Cygwin: pty, console: Fix Ctrl-C handling for non-cygwin apps Takashi Yano
2022-02-13 14:39 ` [PATCH 2/8] Cygwin: pty: Pass Ctrl-Z (EOF) to non-cygwin apps with disable_pcon Takashi Yano
2022-02-13 14:39 ` [PATCH 3/8] Cygwin: pty: Prevent deadlock on echo output Takashi Yano
2022-02-13 14:39 ` [PATCH 4/8] Cygwin: pty: Revise the code to wait for completion of forwarding Takashi Yano
2022-02-13 14:39 ` [PATCH 5/8] Cygwin: pty: Discard input in from_master_nat pipe on signal as well Takashi Yano
2022-02-13 14:39 ` [PATCH 6/8] Cygwin: pty: Fix a bug in tty_min::segpgid() Takashi Yano
2022-02-13 14:39 ` [PATCH 7/8] Cygwin: console: Fix console mode for non-cygwin inferior of GDB Takashi Yano
2022-02-13 14:39 ` Takashi Yano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220213143910.1947-9-takashi.yano@nifty.ne.jp \
    --to=takashi.yano@nifty.ne.jp \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).