commit e049c609ee4bc3def382cdfc701e0309292d1357
author Thomas Klausner <tk@giga.or.at> Sat Sep 19 10:42:58 2020 +0200
committer Thomas Klausner <tk@giga.or.at> Sat Sep 19 10:42:58 2020 +0200
tree c926c5172fa44f4740f0409de80d771ea7f74d9e
parent 4d7582db02a7f40e62f311d33db968460dc3ab1f

Improve regular file detection on Windows.

Based on a suggestion by Khaled Mardam-Bey.

lib/zip_source_file_win32_named.c

diff --git a/lib/zip_source_file_win32_named.c b/lib/zip_source_file_win32_named.c
index a2a44c8..1fe5591 100644
--- a/lib/zip_source_file_win32_named.c
+++ b/lib/zip_source_file_win32_named.c
@@ -208,7 +208,14 @@
     }
 
     st->exists = true;
-    st->regular_file = true; /* TODO: Is this always right? How to determine without a HANDLE? */
+    st->regular_file = false;
+
+    if (file_attributes.dwFileAttributes != INVALID_FILE_ATTRIBUTES) {
+        if ((file_attributes.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_DEVICE | FILE_ATTRIBUTE_REPARSE_POINT)) == 0) {
+            st->regular_file = true;
+        }
+    }
+
     if (!_zip_filetime_to_time_t(file_attributes.ftLastWriteTime, &st->mtime)) {
         zip_error_set(&ctx->error, ZIP_ER_READ, ERANGE);
         return false;