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

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.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 16d70d42973e945a167eb93a1a0c472f37bee647..b72487d22d80217d71a25a728dca64fffa841566 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * emacsclient.c (start_daemon_and_retry_set_socket): Improve error
+       checking.
+
 2008-12-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * emacsclient.c: Include syswait.h instead of sys/types.h.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 2f18fee5047989ca0b89ac39f66c1d6a9748fa38..22b5273f842d9282ece223ca77c01d463665dc1d 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9adef563e0de3dd75e9bf1f451bbb37868e30263..0c06b012fd61027993605cca51826dc34c77632a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-12-18  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * startup.el (command-line): Do not mention the server name in
+       case the user has not mentioned it, print a more explicit message.
+
        * vc-dir.el (vc-dir-at-event): Rename from vc-at-event.  Change
        all callers.
 

diff --git a/lisp/startup.el b/lisp/startup.el
index 2fa1a6c15cdf89402d030cf9172be02e3b678dbb..6dc958cae3d6473112219817960d4ad097378979 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1223,7 +1223,11 @@ the `--debug-init' option to view a complete error backtrace."
       (server-start)
       (if server-process
          (daemon-initialized)
-       (message "Unable to start daemon: Emacs server named %S already running" server-name)
+       (if (stringp dn)
+           (message
+            "Unable to start daemon: Emacs server named %S already running"
+            server-name)
+         (message "Unable to start the daemon.\nAnother instance of Emacs is running the server, either as daemon or interactively.\nYou can use emacsclient to connect to that Emacs process."))
        (kill-emacs 1))))
 
   ;; Run emacs-session-restore (session management) if started by

diff --git a/src/ChangeLog b/src/ChangeLog
index 8177bea8a4513d039628e0cb9f423cc2962a8059..ccda62889f70b643fca2bb86368616a74ef0fc75 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-18  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * emacs.c (main): Print and error and exit when no data is read
+       from the pipe.
+
 2008-12-17  Jason Rumney  <jasonr@gnu.org>
 
        * w32font.c (w32font_has_char): Always return -1.

diff --git a/src/emacs.c b/src/emacs.c
index bd733da303f2432c4eab11c14aac7f50d501a978..4ebf136063a2a9d8cf7f3be641b2e4218ef7dd0e 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1129,6 +1129,11 @@ main (int argc, char **argv)
              fprintf (stderr, "Error reading status from child\n");
              exit (1);
            }
+         else if (retval == 0)
+           {
+             fprintf (stderr, "Error: server did not start correctly\n");
+             exit (1);
+           }
 
          close (daemon_pipe[0]);
          exit (0);