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

* emacs.c (main): Print and error and exit when no data is read

Browse source 
from the pipe.

* startup.el (command-line): Do not mention the server name in
case the user has not mentioned it, print a more explicit message.

* emacsclient.c (start_daemon_and_retry_set_socket): Improve error
checking.
This commit is contained in:
Dan Nicolaescu 2008-12-18 08:48:26 +00:00
parent 059f0a612a
commit fd95644b93
6 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib-src/emacsclient.c
View file

@ -1433,23 +1433,31 @@ start_daemon_and_retry_set_socket (void)
#ifndef WINDOWSNT
pid_t dpid;
int status;
pid_t p;
dpid = fork ();
if (dpid > 0)
{
p = waitpid (dpid, &status, WUNTRACED | WCONTINUED);
pid_t w;
w = waitpid (dpid, &status, WUNTRACED | WCONTINUED);
/* Try connecting again, the daemon should have started by
now. */
message (TRUE, "daemon should have started, trying to connect again\n", dpid);
if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS(status))
{
message (TRUE, "Error: Could not start the Emacs daemon\n");
exit (EXIT_FAILURE);
}
/* Try connecting, the daemon should have started by now. */
message (TRUE, "Emacs daemon should have started, trying to connect again\n");
if ((emacs_socket = set_socket (1)) == INVALID_SOCKET)
message (TRUE, "Cannot connect even after starting the daemon\n");
{
message (TRUE, "Error: Cannot connect even after starting the Emacs daemon\n");
exit (EXIT_FAILURE);
}
}
else if (dpid < 0)
{
fprintf (stderr, "Cannot fork!\n");
fprintf (stderr, "Error: Cannot fork!\n");
exit (1);
}
else