JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Generate SIGHUP for terminal process group on tty master close

Browse Source 
* fhandler_tty.cc (fhandler_pty_slave::write): Move causing of SIGHUP
	into fhandler_pty_master::close().
	(fhandler_pty_slave::read): Ditto.
	(fhandler_pty_master::close): Ditto.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Takashi Yano 2015-06-08 14:07:42 +02:00 committed by Corinna Vinschen
parent 4c3946c350
commit 511eb2f264
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2015-06-08 Takashi Yano <takashi.yano@nifty.ne.jp>
* fhandler_tty.cc (fhandler_pty_slave::write): Move causing of SIGHUP
into fhandler_pty_master::close().
(fhandler_pty_slave::read): Ditto.
(fhandler_pty_master::close): Ditto.
2015-06-08 Corinna Vinschen <corinna@vinschen.de> 2015-06-08 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 4. * include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 4.

24
winsup/cygwin/fhandler_tty.cc
View File

@ -622,7 +622,6 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
default: default:
__seterrno_from_win_error (err); __seterrno_from_win_error (err);
} }
raise (SIGHUP); /* FIXME: Should this be SIGTTOU? */
towrite = -1; towrite = -1;
} }
return towrite; return towrite;
@ -749,7 +748,12 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
goto out; goto out;
} }
if (!bytes_available (bytes_in_pipe)) if (!bytes_available (bytes_in_pipe))
raise (SIGHUP); {
ReleaseMutex (input_mutex);
set_errno (EIO);
totalread = -1;
goto out;
}
/* On first peek determine no. of bytes to flush. */ /* On first peek determine no. of bytes to flush. */
if (!ptr && len == UINT_MAX) if (!ptr && len == UINT_MAX)
@ -779,9 +783,10 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
if (!ReadFile (get_handle (), buf, readlen, &n, NULL)) if (!ReadFile (get_handle (), buf, readlen, &n, NULL))
{ {
termios_printf ("read failed, %E"); termios_printf ("read failed, %E");
raise (SIGHUP); ReleaseMutex (input_mutex);
bytes_in_pipe = 0; set_errno (EIO);
ptr = NULL; totalread = -1;
goto out;
} }
else else
{ {
@ -790,7 +795,12 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
change after successful read. So we have to peek into the pipe change after successful read. So we have to peek into the pipe
again to see if input is still available */ again to see if input is still available */
if (!bytes_available (bytes_in_pipe)) if (!bytes_available (bytes_in_pipe))
raise (SIGHUP); {
ReleaseMutex (input_mutex);
set_errno (EIO);
totalread = -1;
goto out;
}
if (n) if (n)
{ {
len -= n; len -= n;
@ -1269,6 +1279,8 @@ fhandler_pty_master::close ()
else if (obi.HandleCount == 1) else if (obi.HandleCount == 1)
{ {
termios_printf("Closing last master of pty%d", get_minor ()); termios_printf("Closing last master of pty%d", get_minor ());
if (get_ttyp ()->getsid () > 0)
kill (get_ttyp ()->getsid (), SIGHUP);
SetEvent (input_available_event); SetEvent (input_available_event);
} }