diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-01 20:35:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-01 20:35:01 +0100 |
| commit | 7781ebe50f6d4daba02be3bd7e6ca08cd459674b (patch) | |
| tree | 2e6ed785ad9f60b56516964ae8e2afce56249ea3 | |
| parent | 3b690069730805a147d45d92eaca4dc838272d1d (diff) | |
| download | vim-git-7781ebe50f6d4daba02be3bd7e6ca08cd459674b.tar.gz | |
patch 8.2.2450: MS-Windows: ADS was not preserved if 'backupcopy' is "yes"v8.2.2450
Problem: MS-Windows: ADS was not preserved if 'backupcopy' is "yes".
Solution: Copy ADS before truncating the file. (Ken Takata, closes #7762)
| -rw-r--r-- | src/bufwrite.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/bufwrite.c b/src/bufwrite.c index d7c74de35..c7c832cff 100644 --- a/src/bufwrite.c +++ b/src/bufwrite.c @@ -1497,6 +1497,9 @@ buf_write( #if defined(HAVE_SELINUX) || defined(HAVE_SMACK) mch_copy_sec(fname, backup); #endif +#ifdef MSWIN + (void)mch_copy_file_attribute(fname, backup); +#endif break; } } @@ -1909,12 +1912,7 @@ restore_backup: #if defined(MSWIN) if (backup != NULL && overwriting && !append) - { - if (backup_copy) - (void)mch_copy_file_attribute(wfname, backup); - else - (void)mch_copy_file_attribute(backup, wfname); - } + (void)mch_copy_file_attribute(backup, wfname); if (!overwriting && !append) { diff --git a/src/version.c b/src/version.c index d34839c48..2ae792c87 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2450, +/**/ 2449, /**/ 2448, |