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

Fix various suspend-related bugs in emacsclient. (Report & patch by Dan Nicolaescu.)

Browse source 
* lib-src/emacsclient.c (in, out): Remove.
  (s): New variable (moved out from main).
  (handle_sigcont, handle_sigtstp): Use SEND_STRING.
  (main): Fix typos.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-591
This commit is contained in:
Karoly Lorentey 2007-01-01 18:32:06 +00:00
parent 65e86587ab
commit 382707ecfb
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib-src/emacsclient.c
View file

@ -171,8 +171,8 @@ char *server_file = NULL;
/* PID of the Emacs server process. */
int emacs_pid = 0;
/* File handles for communicating with Emacs. */
FILE *out, *in;
/* Socket used to communicate with the Emacs server process. */
HSOCKET s;
void print_help_and_exit () NO_RETURN;
@ -906,9 +906,7 @@ handle_sigcont (int signalnum)
if (tcgetpgrp (1) == getpgrp ())
{
/* We are in the foreground. */
fprintf (out, "-resume \n");
fflush (out);
fsync (fileno (out));
SEND_STRING ("-resume \n");
}
else
{
@ -932,12 +930,8 @@ handle_sigtstp (int signalnum)
int old_errno = errno;
sigset_t set;
if (out)
{
fprintf (out, "-suspend \n");
fflush (out);
fsync (fileno (out));
}
if (s)
SEND_STRING ("-suspend \n");
/* Unblock this signal and call the default handler by temprarily
changing the handler and resignalling. */
@ -1240,7 +1234,6 @@ main (argc, argv)
int argc;
char **argv;
{
HSOCKET s;
int i, rl, needlf = 0;
char *cwd, *str;
char string[BUFSIZ+1];
@ -1410,7 +1403,7 @@ main (argc, argv)
SEND_STRING ("-eval ");
else
SEND_STRING ("-file ");
SEND_QUOTED (out);
SEND_QUOTED (str);
}
SEND_STRING (" ");
}
@ -1473,7 +1466,7 @@ main (argc, argv)
fprintf (stderr, "*ERROR*: %s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
else if (strprefix ("-suspend ", str))
else if (strprefix ("-suspend ", string))
{
/* -suspend: Suspend this terminal, i.e., stop the process. */
if (needlf)