From 24bd6a6d26bab89126db7183bb693779a1742c6d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 May 2017 01:01:55 +0300
Subject: Add subdir support into virtfs::exists.

---
 src/fs/virtfs/fszip.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/fs/virtfs/fszip.cpp')

diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index eda5dd078..562e0bc80 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -118,10 +118,18 @@ namespace FsZip
     }
 
     bool exists(FsEntry *restrict const entry,
-                const std::string &filename,
-                const std::string &dirName)
+                std::string filename,
+                std::string dirName)
     {
         ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
+        std::string subDir = zipEntry->subDir;
+        if (subDir != dirSeparator)
+        {
+            filename = pathJoin(subDir, filename);
+            dirName = pathJoin(subDir, dirName);
+        }
+        if (subDir == dirSeparator)
+            subDir.clear();
         FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
                   it2,
                   zipEntry->mHeaders)
-- 
cgit v1.2.3-60-g2f50