From 01537133a02670775337ddf930e933fde4818e8e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 10 Sep 2005 11:30:06 +0000 Subject: (init_buffer): Use get_current_dir_name. --- src/buffer.c | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 30626f11a24..b0227031ac7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -32,10 +32,6 @@ Boston, MA 02110-1301, USA. */ extern int errno; #endif -#ifndef MAXPATHLEN -/* in 4.1 [probably SunOS? -stef] , param.h fails to define this. */ -#define MAXPATHLEN 1024 -#endif /* not MAXPATHLEN */ #ifdef HAVE_UNISTD_H #include @@ -54,6 +50,8 @@ extern int errno; #include "keymap.h" #include "frame.h" +extern char * get_current_dir_name (); + struct buffer *current_buffer; /* the current buffer */ /* First buffer in chain of all buffers (in reverse order of creation). @@ -5115,7 +5113,6 @@ init_buffer_once () void init_buffer () { - char buf[MAXPATHLEN + 1]; char *pwd; struct stat dotstat, pwdstat; Lisp_Object temp; @@ -5138,37 +5135,23 @@ init_buffer () if (NILP (buffer_defaults.enable_multibyte_characters)) Fset_buffer_multibyte (Qnil); - /* If PWD is accurate, use it instead of calling getwd. PWD is - sometimes a nicer name, and using it may avoid a fatal error if a - parent directory is searchable but not readable. */ - if ((pwd = getenv ("PWD")) != 0 - && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1]))) - && stat (pwd, &pwdstat) == 0 - && stat (".", &dotstat) == 0 - && dotstat.st_ino == pwdstat.st_ino - && dotstat.st_dev == pwdstat.st_dev - && strlen (pwd) < MAXPATHLEN) - strcpy (buf, pwd); -#ifdef HAVE_GETCWD - else if (getcwd (buf, MAXPATHLEN+1) == 0) - fatal ("`getcwd' failed: %s\n", strerror (errno)); -#else - else if (getwd (buf) == 0) - fatal ("`getwd' failed: %s\n", buf); -#endif + pwd = get_current_dir_name (); + + if(!pwd) + fatal ("`get_cwd' failed: %s\n", strerror (errno)); #ifndef VMS /* Maybe this should really use some standard subroutine whose definition is filename syntax dependent. */ - rc = strlen (buf); - if (!(IS_DIRECTORY_SEP (buf[rc - 1]))) + rc = strlen (pwd); + if (!(IS_DIRECTORY_SEP (pwd[rc - 1]))) { - buf[rc] = DIRECTORY_SEP; - buf[rc + 1] = '\0'; + pwd[rc] = DIRECTORY_SEP; + pwd[rc + 1] = '\0'; } #endif /* not VMS */ - current_buffer->directory = make_unibyte_string (buf, strlen (buf)); + current_buffer->directory = make_unibyte_string (pwd, strlen (pwd)); if (! NILP (buffer_defaults.enable_multibyte_characters)) /* At this momemnt, we still don't know how to decode the direcotry name. So, we keep the bytes in multibyte form so @@ -5190,6 +5173,8 @@ init_buffer () temp = get_minibuffer (0); XBUFFER (temp)->directory = current_buffer->directory; + + free (pwd); } /* initialize the buffer routines */ -- cgit v1.2.1 From a17b5ed1a9ef01d008c69ed0fb4712afd802badb Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 10 Sep 2005 14:05:17 +0000 Subject: (init_buffer): Fix error message for failed call to get_current_dir_name. (get_current_dir_name): Remove prototype. --- src/buffer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index b0227031ac7..448ef87413a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -50,8 +50,6 @@ extern int errno; #include "keymap.h" #include "frame.h" -extern char * get_current_dir_name (); - struct buffer *current_buffer; /* the current buffer */ /* First buffer in chain of all buffers (in reverse order of creation). @@ -5136,9 +5134,9 @@ init_buffer () Fset_buffer_multibyte (Qnil); pwd = get_current_dir_name (); - + if(!pwd) - fatal ("`get_cwd' failed: %s\n", strerror (errno)); + fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); #ifndef VMS /* Maybe this should really use some standard subroutine -- cgit v1.2.1 From 156bdb41309e1a8311190c3c92d8da4548d1e604 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Sat, 10 Sep 2005 19:55:28 +0000 Subject: (init_buffer): Grow buffer to add directory separator and terminal zero. --- src/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 448ef87413a..e2805a3d1c2 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5135,7 +5135,7 @@ init_buffer () pwd = get_current_dir_name (); - if(!pwd) + if (!pwd) fatal ("`get_current_dir_name' failed: %s\n", strerror (errno)); #ifndef VMS @@ -5144,6 +5144,8 @@ init_buffer () rc = strlen (pwd); if (!(IS_DIRECTORY_SEP (pwd[rc - 1]))) { + /* Grow buffer to add directory separator and '\0'. */ + pwd = (char *) xrealloc (pwd, rc + 2); pwd[rc] = DIRECTORY_SEP; pwd[rc + 1] = '\0'; } @@ -5152,7 +5154,7 @@ init_buffer () current_buffer->directory = make_unibyte_string (pwd, strlen (pwd)); if (! NILP (buffer_defaults.enable_multibyte_characters)) /* At this momemnt, we still don't know how to decode the - direcotry name. So, we keep the bytes in multibyte form so + directory name. So, we keep the bytes in multibyte form so that ENCODE_FILE correctly gets the original bytes. */ current_buffer->directory = string_to_multibyte (current_buffer->directory); -- cgit v1.2.1 From f9962371041b25c0772a35b0fcbfd313bcffdb87 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Sat, 10 Sep 2005 20:05:02 +0000 Subject: (init_buffer): Fix typos. --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index e2805a3d1c2..fb1ff1c22e9 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5153,7 +5153,7 @@ init_buffer () current_buffer->directory = make_unibyte_string (pwd, strlen (pwd)); if (! NILP (buffer_defaults.enable_multibyte_characters)) - /* At this momemnt, we still don't know how to decode the + /* At this moment, we still don't know how to decode the directory name. So, we keep the bytes in multibyte form so that ENCODE_FILE correctly gets the original bytes. */ current_buffer->directory -- cgit v1.2.1