From 2b28977149b1e8858b597890906f21cdecde84ce Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 15 Nov 2021 20:31:51 +0100 Subject: [PATCH] Cygwin: set the FILE_ATTRIBUTE_ARCHIVE DOS attribute on file creation Do this for normal files and symlinks, not for temporary files, device files or unix sockets. Signed-off-by: Corinna Vinschen --- winsup/cygwin/exceptions.cc | 2 +- winsup/cygwin/fhandler.cc | 3 ++- winsup/cygwin/path.cc | 4 ++-- winsup/cygwin/release/3.3.3 | 4 ++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index a914110fe..eccddd780 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -157,7 +157,7 @@ cygwin_exception::open_stackdumpfile () NTSTATUS status; /* Try to open it to dump the stack in it. */ status = NtCreateFile (&h, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, - NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, + NULL, FILE_ATTRIBUTE_ARCHIVE, 0, FILE_OVERWRITE_IF, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0); if (NT_SUCCESS (status)) diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 2a07e6cf9..4e708595a 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -649,7 +649,8 @@ fhandler_base::open (int flags, mode_t mode) if (flags & (O_CREAT | O_TMPFILE)) { - file_attributes |= FILE_ATTRIBUTE_NORMAL; + file_attributes |= (flags & O_TMPFILE) + ? FILE_ATTRIBUTE_NORMAL : FILE_ATTRIBUTE_ARCHIVE; if (pc.fs_is_nfs ()) { diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index baf04ce89..2cf9de9ef 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1945,7 +1945,7 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath) status = NtCreateFile (&fh, DELETE | FILE_GENERIC_WRITE | READ_CONTROL | WRITE_DAC, win32_newpath.get_object_attr (attr, sec_none_nih), - &io, NULL, FILE_ATTRIBUTE_NORMAL, + &io, NULL, FILE_ATTRIBUTE_ARCHIVE, FILE_SHARE_VALID_FLAGS, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE @@ -2264,7 +2264,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice) status = NtCreateFile (&fh, access, win32_newpath.get_object_attr (attr, sec_none_nih), - &io, NULL, FILE_ATTRIBUTE_NORMAL, + &io, NULL, FILE_ATTRIBUTE_ARCHIVE, FILE_SHARE_VALID_FLAGS, isdevice ? FILE_OVERWRITE_IF : FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT diff --git a/winsup/cygwin/release/3.3.3 b/winsup/cygwin/release/3.3.3 index 2ad28d465..1eb25e2fc 100644 --- a/winsup/cygwin/release/3.3.3 +++ b/winsup/cygwin/release/3.3.3 @@ -12,3 +12,7 @@ Bug Fixes - Fix showing DLL version info from native Windows tools. Addresses: https://cygwin.com/pipermail/cygwin/2021-November/249867.html + +- Fix long-standing problem that new files don't get created with the + FILE_ATTRIBUTE_ARCHIVE DOS attribute set. + Addresses: https://cygwin.com/pipermail/cygwin/2021-November/249909.html -- 2.43.5