[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/10/29 15:34:06

Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- emacsclient.c       29 Oct 2008 10:42:32 -0000      1.134
+++ emacsclient.c       29 Oct 2008 15:34:06 -0000      1.135
@@ -110,6 +110,10 @@
 #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 @@
        {
          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 @@
 
       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 @@
        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 @@
            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);