From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Fri, 8 Apr 2011 08:23:15 +0000 (-0400)
Subject: On Windows Correctly handle a directory file at archive_read_disk_entry_from_file().
X-Git-Tag: v3.0.0a~506
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db490a30e2c49152c2b2fffa8de83560dd453827;p=thirdparty%2Flibarchive.git

On Windows Correctly handle a directory file at archive_read_disk_entry_from_file().

SVN-Revision: 3180
---

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index 643c96a5a..716913d08 100644
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -1787,6 +1787,8 @@ archive_read_disk_entry_from_file(struct archive *_a,
 				  (findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
 				flag |= FILE_FLAG_OPEN_REPARSE_POINT;
 				desiredAccess = 0;
+			} else if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+				desiredAccess = 0;
 			} else
 				desiredAccess = GENERIC_READ;