From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 10 Sep 2005 11:31:50 +0000 (+0000)
Subject: (smc_save_yourself_CB): Use get_current_dir_name.
X-Git-Tag: emacs-pretest-22.0.90~7187
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c187839de5677f0a6d7695647829a221f04c89f9;p=emacs.git

(smc_save_yourself_CB): Use get_current_dir_name.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index deb2b4ce3eb..fb1de530546 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2005-09-10  Giuseppe Scrivano  <gscrivano@gmail.com>
+
+	Remove the MAXPATHLEN limitations:
+
+	* sysdep.c (get_current_dir_name) [!HAVE_CURRENT_DIR_NAME]: New
+	function.
+
+	* buffer.c (init_buffer): Use it.
+
+	* xsmfns.c (smc_save_yourself_CB): Ditto.
+
 2005-09-09  Kim F. Storm  <storm@cua.dk>
 
 	* doc.c (Fsubstitute_command_keys): Lookup key binding for
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 4285dd76718..4b99d7be61a 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -52,10 +52,7 @@ Boston, MA 02110-1301, USA.  */
 #include "termopts.h"
 #include "xterm.h"
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif /* not MAXPATHLEN */
-
+extern char * get_current_dir_name ();
 
 /* The user login name.  */
 
@@ -205,7 +202,7 @@ smc_save_yourself_CB (smcConn,
   int val_idx = 0;
   int props_idx = 0;
 
-  char cwd[MAXPATHLEN+1];
+  char *cwd = NULL;
   char *smid_opt;
 
   /* How to start a new instance of Emacs.  */
@@ -259,12 +256,9 @@ smc_save_yourself_CB (smcConn,
   props[props_idx]->vals[0].value = SDATA (Vuser_login_name);
   ++props_idx;
 
-  /* The current directory property, not mandatory.  */
-#ifdef HAVE_GETCWD
-  if (getcwd (cwd, MAXPATHLEN+1) != 0)
-#else
-  if (getwd (cwd) != 0)
-#endif
+  cwd = get_current_dir_name ();
+
+  if (cwd)
     {
       props[props_idx] = &prop_ptr[props_idx];
       props[props_idx]->name = SmCurrentDirectory;
@@ -281,6 +275,9 @@ smc_save_yourself_CB (smcConn,
 
   xfree (smid_opt);
 
+  if (cwd)
+    free (cwd);
+
   /* See if we maybe shall interact with the user.  */
   if (interactStyle != SmInteractStyleAny
       || ! shutdown