diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2021-11-16 20:36:27 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2021-11-16 21:58:56 +0300 |
| commit | 9980177def176225457a0f371c7c070dc627b3dc (patch) | |
| tree | 3fdf5c0f99ed5b9865b36a6ccb506b8a9c973d6d | |
| parent | bff995a7809a310bd5d510b7875a2eb465c8cc2a (diff) | |
Revert "Cygwin: set the FILE_ATTRIBUTE_ARCHIVE DOS attribute on file creation"
This reverts commit 2b28977149b1e8858b597890906f21cdecde84ce.
This patch fixes the symptoms, but not the actual problem. Revert
and try again.
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 3 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/release/3.3.3 | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index eccddd780..a914110fe 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_ARCHIVE, 0, FILE_OVERWRITE_IF, + NULL, FILE_ATTRIBUTE_NORMAL, 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 4e708595a..2a07e6cf9 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -649,8 +649,7 @@ fhandler_base::open (int flags, mode_t mode) if (flags & (O_CREAT | O_TMPFILE)) { - file_attributes |= (flags & O_TMPFILE) - ? FILE_ATTRIBUTE_NORMAL : FILE_ATTRIBUTE_ARCHIVE; + file_attributes |= FILE_ATTRIBUTE_NORMAL; if (pc.fs_is_nfs ()) { diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 2cf9de9ef..baf04ce89 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_ARCHIVE, + &io, NULL, FILE_ATTRIBUTE_NORMAL, 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_ARCHIVE, + &io, NULL, FILE_ATTRIBUTE_NORMAL, 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 c1e8cefbd..e37844ad9 100644 --- a/winsup/cygwin/release/3.3.3 +++ b/winsup/cygwin/release/3.3.3 @@ -13,10 +13,6 @@ 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 - - Handle Unicode surrogate pairs in console. Cygwin console does not handle surrogate pairs correctly at the moment. Fix issue that running bash in Windows Terminal and inserting an emoji does not |