diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-16 18:22:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-16 18:22:09 +0300 |
| commit | 873eff85f179593d486793be24b3cfaf73226e1f (patch) | |
| tree | 23cfa3747f31a853f13c251b247312ddbcd70b53 /src/fs/virtfs/fszip.cpp | |
| parent | 5844f83998040d4a79dc442151a21dc17de60feb (diff) | |
| download | mv-873eff85f179593d486793be24b3cfaf73226e1f.tar.gz mv-873eff85f179593d486793be24b3cfaf73226e1f.tar.bz2 mv-873eff85f179593d486793be24b3cfaf73226e1f.tar.xz mv-873eff85f179593d486793be24b3cfaf73226e1f.zip | |
Add subdir support in VirtFs::getDirs.
Diffstat (limited to 'src/fs/virtfs/fszip.cpp')
| -rw-r--r-- | src/fs/virtfs/fszip.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp index b2e123f49..cc720f626 100644 --- a/src/fs/virtfs/fszip.cpp +++ b/src/fs/virtfs/fszip.cpp @@ -408,10 +408,13 @@ namespace FsZip } void getDirs(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, |