lisp/server.el: Use just one way to pass the Emacs PID to emacsclient.

* lib-src/emacsclient.c (get_server_config): Don't read Emacs pid from
  the authentication file.

* lisp/server.el (server-start): Don't write pid to the authentication file.
  (server-create-tty-frame): Don't send pid.
  (server-process-filter): Send pid at the start of every connection.

2 files changed, 8 insertions, 10 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2c386257c10..33036c92ffd 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (get_server_config): Don't read Emacs pid from
+        the authentication file.
+
 2010-09-29  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (../src/config.h): Remove target, it is stale.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 1f96c481129..4d8a835e56d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -910,14 +910,13 @@ initialize_sockets (void)
 
 /*
  * Read the information needed to set up a TCP comm channel with
- * the Emacs server: host, port, pid and authentication string.
+ * the Emacs server: host, port, and authentication string.
  */
 int
 get_server_config (struct sockaddr_in *server, char *authentication)
 {
   char dotted[32];
   char *port;
-  char *pid;
   FILE *config = NULL;
 
   if (file_name_absolute_p (server_file))
@@ -948,12 +947,8 @@ get_server_config (struct sockaddr_in *server, char *authentication)
     return FALSE;
 
   if (fgets (dotted, sizeof dotted, config)
-      && (port = strchr (dotted, ':'))
-      && (pid = strchr (port, ' ')))
-    {
-      *port++ = '\0';
-      *pid++  = '\0';
-    }
+      && (port = strchr (dotted, ':')))
+    *port++ = '\0';
   else
     {
       message (TRUE, "%s: invalid configuration info\n", progname);
@@ -972,8 +967,6 @@ get_server_config (struct sockaddr_in *server, char *authentication)
 
   fclose (config);
 
-  emacs_pid = atoi (pid);
-
   return TRUE;
 }