From ee044c2a3cee55efb88f99c4e12f79e4a6d9cf3d Mon Sep 17 00:00:00 2001
From: Brett Simons <brett.simons@microsoft.com>
Date: Tue, 2 Jan 2024 21:20:13 -0500
Subject: [PATCH 1/2] Fix directory check in extract function

The directory check is not robust and fails if the path uses the Windows style path separator and not the unix style. A function "is_dir" already exists and accounts for this so this change switches to using that function instead.
---
 src/read.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/read.rs b/src/read.rs
index b702b4f2..33d48e00 100644
--- a/src/read.rs
+++ b/src/read.rs
@@ -456,7 +456,7 @@ impl<R: Read + io::Seek> ZipArchive<R> {
 
             let outpath = directory.as_ref().join(filepath);
 
-            if file.name().ends_with('/') {
+            if file.is_dir() {
                 fs::create_dir_all(&outpath)?;
             } else {
                 if let Some(p) = outpath.parent() {

From 3e84dee4399ee4fe04c3b9ed1ffa2ed6ea115465 Mon Sep 17 00:00:00 2001
From: Brett Simons <brett.simons@microsoft.com>
Date: Wed, 13 Mar 2024 09:51:38 -0400
Subject: [PATCH 2/2] Update stream.rs to use the is_dir function instead of
 explicitly checking ZipFile name

---
 src/read/stream.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/read/stream.rs b/src/read/stream.rs
index 5a01b23f..41a48b91 100644
--- a/src/read/stream.rs
+++ b/src/read/stream.rs
@@ -67,7 +67,7 @@ impl<R: Read> ZipStreamReader<R> {
 
                 let outpath = self.0.join(filepath);
 
-                if file.name().ends_with('/') {
+                if file.is_dir() {
                     fs::create_dir_all(&outpath)?;
                 } else {
                     if let Some(p) = outpath.parent() {