diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-09-30 20:41:12 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-09-30 20:41:12 -0700 |
| commit | b336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516 (patch) | |
| tree | b85d2eaec61b0af7955fe9c9289ca447fbe1d66c /lib-src | |
| parent | 55586d2a88c1273958893da1e17979a3e7a89691 (diff) | |
| download | emacs-b336bfcdf39f1e4d35bff4a7bd01d3b4bca8f516.tar.gz | |
Close bug#3992.
* lib-src/emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
DARWIN_USER_TEMP_DIR.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6b3584eb90f..11da74f63b0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2010-10-01 Glenn Morris <rgm@gnu.org> + + * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back + DARWIN_USER_TEMP_DIR. (Bug#3992) + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 01241b518bb..05f01b3b097 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1249,7 +1249,18 @@ set_local_socket () { tmpdir = egetenv ("TMPDIR"); if (!tmpdir) - tmpdir = "/tmp"; + { +#ifdef DARWIN_OS + size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0); + if (n > 0) + { + tmpdir = alloca (n); + confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n); + } + else +#endif + tmpdir = "/tmp"; + } socket_name = alloca (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE); sprintf (socket_name, "%s/emacs%d/%s", |