From 5844f83998040d4a79dc442151a21dc17de60feb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 May 2017 18:10:29 +0300
Subject: Add subdir support in VirtFs::getFiles.

---
 src/fs/virtfs/fszip.cpp | 7 +++++--
 1 file changed, 5 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 91d323cc1..b2e123f49 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -156,7 +156,7 @@ namespace FsZip
                    StringVect &names)
     {
         ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
-        std::string subDir = zipEntry->subDir;
+        const std::string subDir = zipEntry->subDir;
         if (subDir != dirSeparator)
             dirName = pathJoin(subDir, dirName);
         if (dirName == dirSeparator)
@@ -215,10 +215,13 @@ namespace FsZip
     }
 
     void getFiles(FsEntry *restrict const entry,
-                  const std::string &dirName,
+                  std::string dirName,
                   StringVect &names)
     {
         ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
+        const std::string subDir = zipEntry->subDir;
+        if (subDir != dirSeparator)
+            dirName = pathJoin(subDir, dirName);
         if (dirName == dirSeparator)
         {
             FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
-- 
cgit v1.2.3-60-g2f50