patch 8.2.2450: MS-Windows: ADS was not preserved if 'backupcopy' is "yes"

Problem:    MS-Windows: ADS was not preserved if 'backupcopy' is "yes".
Solution:   Copy ADS before truncating the file. (Ken Takata, closes #7762)

diff --git a/src/bufwrite.c b/src/bufwrite.c
index d7c74de35c315cbaeddaa88e42ef2db0478771fa..c7c832cff7006a7eba00d09ae9a4e74eea7a78f6 100644 (file)
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -1496,6 +1496,9 @@ buf_write(
 #endif
 #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 d34839c48adae85bc85a37268babc34bc6b804fb..2ae792c87f1d14d07bde315c76e3d065d689295b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2450,
 /**/
     2449,
 /**/