procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* emacsclient.c (EXTRA_SPACE): New macro.

Browse source 
(get_server_config, set_local_socket): Use it.
This commit is contained in:
Juanma Barranquero 2008-10-29 15:34:06 +00:00
parent f8baa6395e
commit bc558f3edb
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib-src/ChangeLog
View file

@ -1,5 +1,8 @@
2008-10-29 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (EXTRA_SPACE): New macro.
(get_server_config, set_local_socket): Use it.
* makefile.w32-in ($(BLD)/sorted-doc.$(O)): Remove spurious backslash.
Reported by Guillaume Conjat <gconjat.ext@orange-ftgroup.com>.

21
lib-src/emacsclient.c
View file

@ -109,6 +109,10 @@ char *w32_getenv ();
#ifndef NO_RETURN
#define NO_RETURN
#endif
/* Additional space when allocating buffers for filenames, etc. */
#define EXTRA_SPACE 100
/* Name used to invoke this program. */
char *progname;
@ -316,8 +320,8 @@ w32_get_resource (predefined, key, type)
{
result = (char *) xmalloc (cbData);
if ((RegQueryValueEx (hrootkey, key, NULL, type, result, &cbData) != ERROR_SUCCESS) ||
(*result == 0))
if ((RegQueryValueEx (hrootkey, key, NULL, type, result, &cbData) != ERROR_SUCCESS)
|| (*result == 0))
{
free (result);
result = NULL;
@ -893,14 +897,16 @@ get_server_config (server, authentication)
if (home)
{
char *path = alloca (32 + strlen (home) + strlen (server_file));
char *path = alloca (strlen (home) + strlen (server_file)
+ EXTRA_SPACE);
sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
config = fopen (path, "rb");
}
#ifdef WINDOWSNT
if (!config && (home = egetenv ("APPDATA")))
{
char *path = alloca (32 + strlen (home) + strlen (server_file));
char *path = alloca (strlen (home) + strlen (server_file)
+ EXTRA_SPACE);
sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
config = fopen (path, "rb");
}
@ -1142,7 +1148,8 @@ set_local_socket ()
tmpdir = egetenv ("TMPDIR");
if (!tmpdir)
tmpdir = "/tmp";
socket_name = alloca (32 + strlen (tmpdir) + strlen (server_name));
socket_name = alloca (strlen (tmpdir) + strlen (server_name)
+ EXTRA_SPACE);
sprintf (socket_name, "%s/emacs%d/%s",
tmpdir, (int) geteuid (), server_name);
}
@ -1178,8 +1185,8 @@ set_local_socket ()
if (pw && (pw->pw_uid != geteuid ()))
{
/* We're running under su, apparently. */
socket_name = alloca (32 + strlen (tmpdir)
+ strlen (server_name));
socket_name = alloca (strlen (tmpdir) + strlen (server_name)
+ EXTRA_SPACE);
sprintf (socket_name, "%s/emacs%d/%s",
tmpdir, (int) pw->pw_uid, server_name);