aboutsummaryrefslogtreecommitdiff
path: root/winsup/cygwin
diff options
context:
space:
mode:
authorTakashi Yano <takashi.yano@nifty.ne.jp>2024-07-07 00:16:29 +0900
committerTakashi Yano <takashi.yano@nifty.ne.jp>2024-07-07 00:16:29 +0900
commit462059da26b68fd0ec0c51b1fdf11fbba0b6fa2a (patch)
tree40847ede38a6e90d591844b5214ebb4de182f67b /winsup/cygwin
parentbaf2764dca435d77fdd25e19146c831214a2da73 (diff)
downloadnewlib-462059da26b68fd0ec0c51b1fdf11fbba0b6fa2a.zip
newlib-462059da26b68fd0ec0c51b1fdf11fbba0b6fa2a.tar.gz
newlib-462059da26b68fd0ec0c51b1fdf11fbba0b6fa2a.tar.bz2
Cygwin: console: Bug fix for the last console code change
The commit baf2764dca43 has a serious bug that shared_info_state is common for all console devices despite it should be individual for each console device. This patch fixes that. Fixes: baf2764dca43 ("Cygwin: console: Fixes an issue that tmux can not run on the console.") Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Diffstat (limited to 'winsup/cygwin')
-rw-r--r--winsup/cygwin/fhandler/console.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler/console.cc b/winsup/cygwin/fhandler/console.cc
index a870b74..6028559 100644
--- a/winsup/cygwin/fhandler/console.cc
+++ b/winsup/cygwin/fhandler/console.cc
@@ -49,7 +49,7 @@ details. */
#define con_is_legacy (shared_console_info[unit] && con.is_legacy)
static HANDLE NO_COPY shared_info_mutex;
-static int NO_COPY shared_info_state;
+static int NO_COPY shared_info_state[MAX_CONS_DEV];
#define CONS_THREAD_SYNC "cygcons.thread_sync"
static bool NO_COPY master_thread_started = false;
@@ -672,7 +672,6 @@ fhandler_console::set_unit ()
shared_info_mutex = CreateMutex (&sec_none_nih, FALSE, NULL);
WaitForSingleObject (shared_info_mutex, INFINITE);
- shared_info_state++;
if (shared_console_info[unit])
; /* Do nothing */
@@ -682,7 +681,10 @@ fhandler_console::set_unit ()
else
{
if (!generic_console && (dev_t) myself->ctty != get_device ())
- shared_console_info[unit] = console_unit (unit);
+ {
+ shared_console_info[unit] = console_unit (unit);
+ shared_info_state[unit]++;
+ }
if (generic_console || !shared_console_info[unit])
{
me = GetConsoleWindow ();
@@ -693,6 +695,7 @@ fhandler_console::set_unit ()
created = true;
fhandler_console::console_state *cs =
open_shared_console (me, cygheap->console_h, created);
+ shared_info_state[unit]++;
ProtectHandleINH (cygheap->console_h);
if (created)
{
@@ -1975,7 +1978,7 @@ fhandler_console::close ()
output_mutex = NULL;
WaitForSingleObject (shared_info_mutex, INFINITE);
- if (--shared_info_state == 0 && shared_console_info[unit])
+ if (--shared_info_state[unit] == 0 && shared_console_info[unit])
{
UnmapViewOfFile ((void *) shared_console_info[unit]);
shared_console_info[unit] = NULL;