procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix emacsclient terminal corruption when in background.

Browse source 
* emacsclient.c (handle_sigcont): Check for tcgetpgrp failure.
Cancel the continue only if tty.  Send SIGTTIN to the process
group, not SIGSTOP to self, as this is what the glibc manual
recommends.
(main): If tty, and if started in the background, send SIGTTIN
to the process group.

Fixes: debbugs:16892
This commit is contained in:
Paul Eggert 2014-03-09 15:38:15 -07:00
parent eb67db4111
commit d050de754c
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib-src/ChangeLog
View file

@ -1,3 +1,13 @@
2014-03-09 Paul Eggert <eggert@cs.ucla.edu>
Fix emacsclient terminal corruption when in background (Bug#16892).
* emacsclient.c (handle_sigcont): Check for tcgetpgrp failure.
Cancel the continue only if tty. Send SIGTTIN to the process
group, not SIGSTOP to self, as this is what the glibc manual
recommends.
(main): If tty, and if started in the background, send SIGTTIN
to the process group.
2014-02-25 Andreas Amann <a.amann@ucc.ie> (tiny change)
Fix emacsclient's handling of SIGCONT (Bug#16883).

16
lib-src/emacsclient.c
View file

@ -1105,16 +1105,18 @@ static void
handle_sigcont (int signalnum)
{
int old_errno = errno;
pid_t pgrp = getpgrp ();
pid_t tcpgrp = tcgetpgrp (1);
if (tcgetpgrp (1) == getpgrp ())
if (tcpgrp == pgrp)
{
/* We are in the foreground. */
send_to_emacs (emacs_socket, "-resume \n");
}
else if (tty)
else if (0 <= tcpgrp && tty)
{
/* We are in the background; cancel the continue. */
raise (SIGSTOP);
kill (-pgrp, SIGTTIN);
}
signal (signalnum, handle_sigcont);
@ -1554,6 +1556,14 @@ main (int argc, char **argv)
exit (EXIT_FAILURE);
}
if (tty)
{
pid_t pgrp = getpgrp ();
pid_t tcpgrp = tcgetpgrp (1);
if (0 <= tcpgrp && tcpgrp != pgrp)
kill (-pgrp, SIGTTIN);
}
/* If alternate_editor is the empty string, start the emacs daemon
in case of failure to connect. */
start_daemon_if_needed = (alternate_editor