/* if any of these mutexes is owned, we will fail to start any cygwin app
until trapped app exits */
- ReleaseMutex (title_mutex);
+ ReleaseMutex (tty_mutex);
/* prevent recursive exception handling */
char* rawenv = GetEnvironmentStrings () ;
do_exit (rc);
}
-HANDLE NO_COPY title_mutex = NULL;
+HANDLE NO_COPY tty_mutex = NULL;
void
events_init (void)
{
char *name;
char mutex_name[CYG_MAX_PATH];
- /* title_mutex protects modification of console title. It's necessary
+ /* tty_mutex is on while searching for a tty slot. It's necessary
while finding console window handle */
- if (!(title_mutex = CreateMutex (&sec_all_nih, FALSE,
+ if (!(tty_mutex = CreateMutex (&sec_all_nih, FALSE,
name = shared_name (mutex_name,
- "title_mutex", 0))))
+ "tty_mutex", 0))))
api_fatal ("can't create title mutex '%s', %E", name);
- ProtectHandle (title_mutex);
+ ProtectHandle (tty_mutex);
new_muto (mask_sync);
windows_system_directory[0] = '\0';
(void) GetSystemDirectory (windows_system_directory, sizeof (windows_system_directory) - 2);
}
if (NOTSTATE (myself, PID_USETTY))
return -1;
- return cygwin_shared->tty.allocate_tty (1);
+ return cygwin_shared->tty.allocate_tty (true);
}
void
If flag == 0, just find a free tty.
*/
int
-tty_list::allocate_tty (int with_console)
+tty_list::allocate_tty (bool with_console)
{
HWND console;
+ int freetty = -1;
/* FIXME: This whole function needs a protective mutex. */
+ if (WaitForSingleObject (tty_mutex, INFINITE) == WAIT_FAILED)
+ termios_printf ("WFSO for tty_mutex %p failed, %E", tty_mutex);
+
if (!with_console)
console = NULL;
else if (!(console = GetConsoleWindow ()))
{
- char *oldtitle = new char [TITLESIZE];
+ char oldtitle[TITLESIZE];
- if (!oldtitle)
- {
- termios_printf ("Can't *allocate console title buffer");
- return -1;
- }
if (!GetConsoleTitle (oldtitle, TITLESIZE))
{
termios_printf ("Can't read console title");
- return -1;
+ goto out;
}
- if (WaitForSingleObject (title_mutex, INFINITE) == WAIT_FAILED)
- termios_printf ("WFSO for title_mutext %p failed, %E", title_mutex);
-
char buf[40];
__small_sprintf (buf, "cygwin.find.console.%d", myself->pid);
}
SetConsoleTitle (oldtitle);
Sleep (40);
- ReleaseMutex (title_mutex);
if (console == NULL)
{
termios_printf ("Can't find console window");
- return -1;
+ goto out;
}
}
- /* Is a tty allocated for console? */
- int freetty = -1;
+ HANDLE hmaster = NULL;
+ /* Is a tty allocated for console? */
for (int i = 0; i < NTTYS; i++)
{
if (!ttys[i].exists ())
break; /* No. We've got one. */
}
+ /* FIXME: Is this right? We can potentially query a "nonexistent"
+ tty slot after falling through from the above? */
if (with_console && ttys[i].gethwnd () == console)
{
termios_printf ("console %x already associated with tty%d",
console, i);
/* Is the master alive? */
- HANDLE hMaster;
- hMaster = OpenProcess (PROCESS_DUP_HANDLE, FALSE, ttys[i].master_pid);
- if (hMaster)
+ hmaster = OpenProcess (PROCESS_DUP_HANDLE, FALSE, ttys[i].master_pid);
+ if (hmaster)
{
- CloseHandle (hMaster);
- return i;
+ CloseHandle (hmaster);
+ freetty = i;
+ goto out;
}
/* Master is dead */
freetty = i;
/* There is no tty allocated to console, allocate the first free found */
if (freetty == -1)
- {
- system_printf ("No free ttys available");
- return -1;
- }
- tty *t = ttys + freetty;
+ goto out;
+
+ tty *t;
+ t = ttys + freetty;
t->init ();
t->setsid (-1);
t->setpgid (myself->pgid);
t->sethwnd (console);
- if (with_console)
+out:
+ if (freetty < 0)
+ system_printf ("No tty allocated");
+ else if (!with_console)
+ termios_printf ("tty%d allocated", freetty);
+ else
{
- termios_printf ("console %x associated with tty%d", console, freetty);
- create_tty_master (freetty);
+ termios_printf ("console %p associated with tty%d", console, freetty);
+ if (!hmaster)
+ create_tty_master (freetty);
}
- else
- termios_printf ("tty%d allocated", freetty);
+ ReleaseMutex (tty_mutex);
return freetty;
}