mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-04 20:27:45 +00:00
Code Issues Releases Activity

(main): Eliminate arbitrary limit on length of system_name.

Browse Source 
(xmalloc): Define unconditionally.
This commit is contained in:
Richard M. Stallman 1999-01-16 21:45:10 +00:00
parent 40beb971f4
commit a2b3f2b55c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib-src/emacsclient.c
View File

@ -146,7 +146,6 @@ quote_file_name (name)
return copy;
}
#ifdef C_ALLOCA
/* Like malloc but get fatal error if memory is exhausted. */
char *
@ -161,7 +160,6 @@ xmalloc (size)
}
return result;
}
#endif /* C_ALLOCA */
#if !defined (HAVE_SOCKETS) && !defined (HAVE_SYSVIPC)
@ -194,7 +192,8 @@ main (argc, argv)
int argc;
char **argv;
{
char system_name[32];
char *system_name;
int system_name_length;
int s, i;
FILE *out, *in;
struct sockaddr_un server;
@ -223,10 +222,22 @@ main (argc, argv)
#ifndef SERVER_HOME_DIR
{
struct stat statbfr;
system_name_length = 32;
while (1)
{
system_name = (char *) xmalloc (system_name_length + 1);
/* system_name must be null-terminated string. */
system_name[system_name_length] = '\0';
if (gethostname (system_name, system_name_length) == 0)
break;
free (system_name);
system_name_length *= 2;
}
gethostname (system_name, sizeof (system_name));
/* system_name must be null-terminated string */
system_name[sizeof (system_name) - 1] = '\0';
sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
if (stat (server.sun_path, &statbfr) == -1)