f1413819a4
These hacks were proposed in Cygwin as a more complete set of workarounds superseding Git for Windows' https://github.com/git-for-windows/msys2-runtime/commit/1d0701d This commit corresponds to https://github.com/msys2/msys2-runtime/pull/86 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 2256476a14cb45c594013d33934ed1ac83240f50 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Yano <takashi.yano@nifty.ne.jp>
|
|
Date: Sun, 13 Feb 2022 17:11:02 +0900
|
|
Subject: [PATCH 44/N] Cygwin: console: Set console mode even if stdin/stdout
|
|
is redirected.
|
|
|
|
- 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 d7ee5fe..434a4a0 100644
|
|
--- a/winsup/cygwin/spawn.cc
|
|
+++ b/winsup/cygwin/spawn.cc
|
|
@@ -657,23 +657,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
|
|
|