summaryrefslogtreecommitdiff
path: root/libarchive/archive_write_disk_windows.c
diff options
context:
space:
mode:
authorMartin Matuska <martin@matuska.org>2019-05-09 23:46:22 +0200
committerMartin Matuska <martin@matuska.org>2019-05-10 00:00:17 +0200
commit1d99c3ec12ff5e59eb81d28f450226146344183b (patch)
treeff2be42d8122edfa246f1cae0302229a322b7c6b /libarchive/archive_write_disk_windows.c
parent744a248f55d5dcf369e4d39dba8dd9f05e2af3da (diff)
downloadlibarchive-1d99c3ec12ff5e59eb81d28f450226146344183b.tar.gz
RAR5 reader: set correct mode for readonly directories
Fix shadowed declaration in processing fflags
Diffstat (limited to 'libarchive/archive_write_disk_windows.c')
-rw-r--r--libarchive/archive_write_disk_windows.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c
index bc10a619..3d4d577f 100644
--- a/libarchive/archive_write_disk_windows.c
+++ b/libarchive/archive_write_disk_windows.c
@@ -1811,11 +1811,8 @@ _archive_write_disk_close(struct archive *_a)
p->mtime, p->mtime_nanos,
p->ctime, p->ctime_nanos);
}
- if (p->fixup & TODO_MODE_BASE) {
- /* fflags have higher priority than mode */
- if ((p->fflags_set & FILE_ATTRIBUTE_READONLY) == 0)
- la_chmod(p->name, p->mode);
- }
+ if (p->fixup & TODO_MODE_BASE)
+ la_chmod(p->name, p->mode);
if (p->fixup & TODO_ACLS)
set_acls(a, INVALID_HANDLE_VALUE, p->name, &p->acl);
if (p->fixup & TODO_FFLAGS)