diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-09-27 22:07:38 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-09-27 22:07:38 +0000 |
commit | 3ecdcd59050a2eba016ec32c89a5dd5ed536c52f (patch) | |
tree | f85d09c439deb79c169e9cf782aeaf2782dd3f8a /lib-src/emacsclient.c | |
parent | 15d40fa45425863d9fb47a73d32e6ecf0b8b6263 (diff) | |
download | emacs-3ecdcd59050a2eba016ec32c89a5dd5ed536c52f.tar.gz |
(main): Always use /tmp and non-qualified hostname.
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r-- | lib-src/emacsclient.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index ac530174094..d06334eb8f3 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -313,6 +313,7 @@ main (argc, argv) server.sun_family = AF_UNIX; { + char *dot; system_name_length = 32; while (1) @@ -328,9 +329,13 @@ main (argc, argv) free (system_name); system_name_length *= 2; } + + /* We always use the non-dotted host name, for simplicity. */ + dot = index (system_name, '.'); + if (dot) + *dot = '\0'; } -#ifndef SERVER_HOME_DIR { int sock_status = 0; @@ -387,16 +392,6 @@ main (argc, argv) break; } } -#else - if ((homedir = getenv ("HOME")) == NULL) - { - fprintf (stderr, "%s: No home directory\n", argv[0]); - fail (argc, argv); - } - strcpy (server.sun_path, homedir); - strcat (server.sun_path, "/.emacs-server-"); - strcat (server.sun_path, system_name); -#endif if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0) |