diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-16 17:32:31 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-16 17:32:31 +0300 |
| commit | 5f66478632d388bfae78cbbb938a42eac3956db2 (patch) | |
| tree | 106a737e821a8d3c79bf0ae172c66c18305cf990 /src/fs/virtfs/fszip.cpp | |
| parent | 0a849f982988cbd7c7afdedccb210bada702238b (diff) | |
| download | mv-5f66478632d388bfae78cbbb938a42eac3956db2.tar.gz mv-5f66478632d388bfae78cbbb938a42eac3956db2.tar.bz2 mv-5f66478632d388bfae78cbbb938a42eac3956db2.tar.xz mv-5f66478632d388bfae78cbbb938a42eac3956db2.zip | |
Add subdir support in VirtFs::openRead.
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 e7fab595f..f2f16bcbb 100644 --- a/src/fs/virtfs/fszip.cpp +++ b/src/fs/virtfs/fszip.cpp @@ -526,9 +526,12 @@ namespace FsZip } File *openRead(FsEntry *restrict const entry, - const std::string &filename) + std::string filename) { ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry); + std::string subDir = zipEntry->subDir; + if (subDir != dirSeparator) + filename = pathJoin(subDir, filename); FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator, it2, zipEntry->mHeaders) |