Changed comment version (6.0).

[bpt/emacs.git] / lib-src / emacsserver.c

diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c
index fa3c340..fd532ce 100644 (file)
--- a/lib-src/emacsserver.c
+++ b/lib-src/emacsserver.c
@@ -1,5 +1,5 @@
 /* Communication subprocess for GNU Emacs acting as server.
-   Copyright (C) 1986, 1987, 1992, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1992, 1994, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -26,12 +26,8 @@ Boston, MA 02111-1307, USA.  */
    up to the Emacs which then executes them.  */
 
 #define NO_SHORTNAMES
-#include <signal.h>
 #include <../src/config.h>
-#undef read
-#undef write
-#undef open
-#undef close
+#include <signal.h>
 #undef signal
 
 #if !defined (HAVE_SOCKETS) && !defined (HAVE_SYSVIPC)
@@ -65,7 +61,9 @@ void fatal_error ();
 #include <unistd.h>
 #endif
 
+#ifndef errno
 extern int errno;
+#endif
 
 /* Copied from src/process.c */
 #ifdef FD_SET
@@ -250,9 +248,8 @@ main (argc, argv)
       exit (1);
     }
   server.sun_family = AF_UNIX;
-#ifndef SERVER_HOME_DIR
-  system_name_length = 32;
 
+  system_name_length = 32;
   while (1)
     {
       system_name = (char *) xmalloc (system_name_length + 1);
@@ -267,6 +264,7 @@ main (argc, argv)
       system_name_length *= 2;
     }
 
+#ifndef SERVER_HOME_DIR
   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
 
   if (unlink (server.sun_path) == -1 && errno != ENOENT)
@@ -280,7 +278,6 @@ main (argc, argv)
 
   strcpy (server.sun_path, homedir);
   strcat (server.sun_path, "/.emacs-server-");
-  gethostname (system_name, sizeof (system_name));
   strcat (server.sun_path, system_name);
   /* Delete anyone else's old server.  */
   unlink (server.sun_path);