diff src/emacs.c @ 100485:fd10c7ef5447

* 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.

--- a/src/emacs.c	Thu Dec 18 08:30:41 2008 +0000
+++ b/src/emacs.c	Thu Dec 18 08:48:26 2008 +0000
@@ -1129,6 +1129,11 @@
 	      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);