# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 934603705 0
# Node ID 89be69860eeb4710840f9ca4772c2aca7996c287
# Parent  0c8c07d1d12fd6867852039db0f7d7a18e159fd0
(main): Move the dynamic allocation of
system_name outside of the SERVER_HOME_DIR conditional.

diff -r 0c8c07d1d12f -r 89be69860eeb lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Sat Aug 14 03:55:01 1999 +0000
+++ b/lib-src/emacsclient.c	Sat Aug 14 04:08:25 1999 +0000
@@ -219,9 +219,8 @@
       exit (1);
     }
   server.sun_family = AF_UNIX;
-#ifndef SERVER_HOME_DIR
+
   {
-    struct stat statbfr;
     system_name_length = 32;
 
     while (1)
@@ -237,6 +236,11 @@
 	free (system_name);
 	system_name_length *= 2;
       }
+  }
+
+#ifndef SERVER_HOME_DIR
+  {
+    struct stat statbfr;
 
     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
 
@@ -265,7 +269,6 @@
     }
   strcpy (server.sun_path, homedir);
   strcat (server.sun_path, "/.emacs-server-");
-  gethostname (system_name, sizeof (system_name));
   strcat (server.sun_path, system_name);
 #endif
 
diff -r 0c8c07d1d12f -r 89be69860eeb lib-src/emacsserver.c
--- a/lib-src/emacsserver.c	Sat Aug 14 03:55:01 1999 +0000
+++ b/lib-src/emacsserver.c	Sat Aug 14 04:08:25 1999 +0000
@@ -250,9 +250,8 @@
       exit (1);
     }
   server.sun_family = AF_UNIX;
-#ifndef SERVER_HOME_DIR
+
   system_name_length = 32;
-
   while (1)
     {
       system_name = (char *) xmalloc (system_name_length + 1);
@@ -267,6 +266,7 @@
       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 +280,6 @@
 
   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);