* server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 7883cf3b08525e202d1c4435ba477c079a5ac001..3f8ae2132e9c908d6b6aa3b6e77059559ed51fd0 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-29  Ulrich Mueller  <ulm@gentoo.org>
+
+       * emacsclient.c (set_local_socket): Use TMPDIR (default /tmp)
+       instead of hardcoded /tmp.
+
 2008-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * emacsclient.c (longopts, print_help_and_exit): Add -nw.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index d4a7ad3d095e9ec89625d9ba7b55ff37713e5ab8..4c167c2ad7f755d22d332026da2d804a18c9a669 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1128,6 +1128,7 @@ set_local_socket ()
     int default_sock = !socket_name;
     int saved_errno = 0;
     char *server_name = "server";
+    char *tmpdir;
 
     if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\'))
       { /* socket_name is a file name component.  */
@@ -1138,9 +1139,12 @@ set_local_socket ()
 
     if (default_sock)
       {
-       socket_name = alloca (100 + strlen (server_name));
-       sprintf (socket_name, "/tmp/emacs%d/%s",
-                (int) geteuid (), server_name);
+       tmpdir = egetenv ("TMPDIR");
+       if (!tmpdir)
+         tmpdir = "/tmp";
+       socket_name = alloca (32 + strlen (tmpdir) + strlen (server_name));
+       sprintf (socket_name, "%s/emacs%d/%s",
+                tmpdir, (int) geteuid (), server_name);
       }
 
     if (strlen (socket_name) < sizeof (server.sun_path))
@@ -1174,9 +1178,10 @@ set_local_socket ()
            if (pw && (pw->pw_uid != geteuid ()))
              {
                /* We're running under su, apparently. */
-               socket_name = alloca (100 + strlen (server_name));
-               sprintf (socket_name, "/tmp/emacs%d/%s",
-                        (int) pw->pw_uid, server_name);
+               socket_name = alloca (32 + strlen (tmpdir)
+                                     + strlen (server_name));
+               sprintf (socket_name, "%s/emacs%d/%s",
+                        tmpdir, (int) pw->pw_uid, server_name);
 
                if (strlen (socket_name) < sizeof (server.sun_path))
                  strcpy (server.sun_path, socket_name);

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37cf39e294d82bb9ade6c0a9c66469ba1b0b5c45..986c9a0470446cc5627a73b07c8e223850176238 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-29  Ulrich Mueller  <ulm@gentoo.org>
+
+       * server.el (server-socket-dir): Use TMPDIR (default /tmp) instead
+       of hardcoded /tmp.
+
 2008-10-29  Glenn Morris  <rgm@gnu.org>
 
        * net/xesam.el (dbus-get-unique-name, dbus-debug): Declare.

diff --git a/lisp/server.el b/lisp/server.el
index b69965f94a69a459a79db2d3a3cd8e52b4ea43ef..57d23183d2c628b8dfa00c3840439db178a40f11 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -202,7 +202,8 @@ are done with it in the server.")
 
 (defvar server-name "server")
 
-(defvar server-socket-dir (format "/tmp/emacs%d" (user-uid))
+(defvar server-socket-dir
+  (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))
   "The directory in which to place the server socket.")
 
 (defun server-clients-with (property value)