libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: console: Fix a bug that 64th console cannot be handled. 

Fixes: 930e553da8 ("Cygwin: console: Unify EnumWindows() callback functions.");
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
This commit is contained in:
Takashi Yano 2024-02-16 03:35:07 +09:00
parent 4dd3dc876c
commit f3ba4db2e2
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/devices.cc
View File

@ -83,7 +83,7 @@ exists_console (const device& dev)
default:
if (dev.get_minor () < MAX_CONS_DEV)
{
unsigned long bitmask = fhandler_console::console_unit (-1);
unsigned long bitmask = fhandler_console::console_unit (CONS_LIST_USED);
return !!(bitmask & (1UL << dev.get_minor ()));
}
return false;

2
winsup/cygwin/devices.in
View File

@ -79,7 +79,7 @@ exists_console (const device& dev)
default:
if (dev.get_minor () < MAX_CONS_DEV)
{
unsigned long bitmask = fhandler_console::console_unit (-1);
unsigned long bitmask = fhandler_console::console_unit (CONS_LIST_USED);
return !!(bitmask & (1UL << dev.get_minor ()));
}
return false;

8
winsup/cygwin/fhandler/console.cc
View File

@ -253,12 +253,10 @@ fhandler_console::enum_windows (HWND hw, LPARAM lp)
}
fhandler_console::console_unit::console_unit (int n0):
n (n0), bitmask (0)
n (n0), bitmask (0), shared_console_info (NULL)
{
EnumWindows (fhandler_console::enum_windows, (LPARAM) this);
if (n < 0)
n = (_minor_t) ffsl (~bitmask) - 1;
if (n < 0)
if (n0 == CONS_SCAN_UNUSED && (n = ffsl (~bitmask) - 1) < 0)
api_fatal (sizeof (bitmask) == 8 ?
"console device allocation failure - "
"too many consoles in use, max consoles is 64" :
@ -674,7 +672,7 @@ fhandler_console::set_unit ()
ProtectHandleINH (cygheap->console_h);
if (created)
{
unit = console_unit (-1);
unit = console_unit (CONS_SCAN_UNUSED);
cs->tty_min_state.setntty (DEV_CONS_MAJOR, unit);
}
else

5
winsup/cygwin/local_includes/fhandler.h
View File

@ -2192,6 +2192,8 @@ class dev_console
};
#define MAX_CONS_DEV (sizeof (unsigned long) * 8)
#define CONS_SCAN_UNUSED (-1)
#define CONS_LIST_USED (-2)
/* This is a input and output console handle */
class fhandler_console: public fhandler_termios
@ -2388,9 +2390,8 @@ private:
unsigned long bitmask;
console_state *shared_console_info;
public:
operator _minor_t () const {return n;}
operator console_state * () const {return shared_console_info;}
operator unsigned long () const {return bitmask;}
operator unsigned long () const {return n == CONS_LIST_USED ? bitmask : n;}
console_unit (int);
friend BOOL CALLBACK fhandler_console::enum_windows (HWND, LPARAM);
};