aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

updated for version 7.2a-003

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-27 18:42:32 +00:00
parent 632deedd0f
commit b23a7e8463
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/fileio.c
View File

@@ -2456,7 +2456,7 @@ failed:
/* /*
* Work around a weird problem: When a file has two links (only * Work around a weird problem: When a file has two links (only
* possible on NTFS) and we write through one link, then stat() it * possible on NTFS) and we write through one link, then stat() it
* throught the other link, the timestamp information may be wrong. * through the other link, the timestamp information may be wrong.
* It's correct again after reading the file, thus reset the timestamp * It's correct again after reading the file, thus reset the timestamp
* here. * here.
*/ */
@@ -3906,7 +3906,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
#ifdef VMS #ifdef VMS
vms_remove_version(fname); /* remove version */ vms_remove_version(fname); /* remove version */
#endif #endif
/* Default: write the the file directly. May write to a temp file for /* Default: write the file directly. May write to a temp file for
* multi-byte conversion. */ * multi-byte conversion. */
wfname = fname; wfname = fname;
@@ -5770,7 +5770,7 @@ shorten_filenames(fnames, count)
#endif #endif
/* /*
* add extention to file name - change path/fo.o.h to path/fo.o.h.ext or * add extension to file name - change path/fo.o.h to path/fo.o.h.ext or
* fo_o_h.ext for MSDOS or when shortname option set. * fo_o_h.ext for MSDOS or when shortname option set.
* *
* Assumed that fname is a valid name found in the filesystem we assure that * Assumed that fname is a valid name found in the filesystem we assure that
@@ -5952,7 +5952,7 @@ buf_modname(shortname, fname, ext, prepend_dot)
#endif #endif
/* /*
* Append the extention. * Append the extension.
* ext can start with '.' and cannot exceed 3 more characters. * ext can start with '.' and cannot exceed 3 more characters.
*/ */
STRCPY(s, ext); STRCPY(s, ext);
@@ -6164,7 +6164,12 @@ vim_rename(from, to)
#endif #endif
fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0); fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
if (fd_in == -1) if (fd_in == -1)
{
#ifdef HAVE_ACL
mch_free_acl(acl);
#endif
return -1; return -1;
}
/* Create the new file with same permissions as the original. */ /* Create the new file with same permissions as the original. */
fd_out = mch_open((char *)to, fd_out = mch_open((char *)to,
@@ -6172,14 +6177,20 @@ vim_rename(from, to)
if (fd_out == -1) if (fd_out == -1)
{ {
close(fd_in); close(fd_in);
#ifdef HAVE_ACL
mch_free_acl(acl);
#endif
return -1; return -1;
} }
buffer = (char *)alloc(BUFSIZE); buffer = (char *)alloc(BUFSIZE);
if (buffer == NULL) if (buffer == NULL)
{ {
close(fd_in);
close(fd_out); close(fd_out);
close(fd_in);
#ifdef HAVE_ACL
mch_free_acl(acl);
#endif
return -1; return -1;
} }
@@ -6204,6 +6215,7 @@ vim_rename(from, to)
#endif #endif
#ifdef HAVE_ACL #ifdef HAVE_ACL
mch_set_acl(to, acl); mch_set_acl(to, acl);
mch_free_acl(acl);
#endif #endif
if (errmsg != NULL) if (errmsg != NULL)
{ {

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3,
/**/ /**/
2, 2,
/**/ /**/