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

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8177bea8a45..ccda62889f7 100644
--- 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 bd733da303f..4ebf136063a 100644
--- 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);