summaryrefslogtreecommitdiff
path: root/src/fs/virtfs/fszip.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-16 16:28:54 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-16 16:28:54 +0300
commit0a849f982988cbd7c7afdedccb210bada702238b (patch)
tree93fe4838817db6e57c7dbc364dd347d275c67937 /src/fs/virtfs/fszip.cpp
parentb60b3123345a619aab656c1c361c2c8c42e6455c (diff)
downloadplus-0a849f982988cbd7c7afdedccb210bada702238b.tar.gz
plus-0a849f982988cbd7c7afdedccb210bada702238b.tar.bz2
plus-0a849f982988cbd7c7afdedccb210bada702238b.tar.xz
plus-0a849f982988cbd7c7afdedccb210bada702238b.zip
Add subdir support in VirtFs::isDirectory.
Diffstat (limited to 'src/fs/virtfs/fszip.cpp')
-rw-r--r--src/fs/virtfs/fszip.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index 5118ec93c..e7fab595f 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -500,10 +500,13 @@ namespace FsZip
}
bool isDirectory(FsEntry *restrict const entry,
- const std::string &dirName,
+ std::string dirName,
bool &isDirFlag)
{
ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
+ std::string subDir = zipEntry->subDir;
+ if (subDir != dirSeparator)
+ dirName = pathJoin(subDir, dirName);
FOR_EACH (std::vector<std::string>::const_iterator,
it2,
zipEntry->mDirs)