mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
Code Issues Projects Releases Wiki Activity

Close bug#3992.

Browse source 
* lib-src/emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
DARWIN_USER_TEMP_DIR.
This commit is contained in:
Glenn Morris 2010-09-30 20:41:12 -07:00
parent 55586d2a88
commit b336bfcdf3
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib-src/ChangeLog
View file

@ -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> 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.2 released. * Version 23.2 released.

13
lib-src/emacsclient.c
View file

@ -1249,7 +1249,18 @@ set_local_socket ()
{ {
tmpdir = egetenv ("TMPDIR"); tmpdir = egetenv ("TMPDIR");
if (!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) socket_name = alloca (strlen (tmpdir) + strlen (server_name)
+ EXTRA_SPACE); + EXTRA_SPACE);
sprintf (socket_name, "%s/emacs%d/%s", sprintf (socket_name, "%s/emacs%d/%s",