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

(init_buffer): Grow buffer to add directory separator

Browse source 
and terminal zero.
This commit is contained in:
Romain Francoise 2005-09-10 19:55:28 +00:00
parent 2bb8b80c20
commit 156bdb4130
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2005-09-10 Romain Francoise <romain@orebokech.com>
* buffer.c (init_buffer): Grow buffer to add directory separator
and terminal zero.
2005-09-10 Eli Zaretskii <eliz@gnu.org>
* buffer.c (init_buffer): Fix error message for failed call to

6
src/buffer.c
View file

@ -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);