diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-16 01:01:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-16 01:46:05 +0300 |
| commit | 24bd6a6d26bab89126db7183bb693779a1742c6d (patch) | |
| tree | 1a7ae594883562a01abdb2c8070a6585af2780e4 /src/fs/virtfs/fs.cpp | |
| parent | 65ef43ab06f3dfb7b87caa3ba8236ea741d59f35 (diff) | |
| download | plus-24bd6a6d26bab89126db7183bb693779a1742c6d.tar.gz plus-24bd6a6d26bab89126db7183bb693779a1742c6d.tar.bz2 plus-24bd6a6d26bab89126db7183bb693779a1742c6d.tar.xz plus-24bd6a6d26bab89126db7183bb693779a1742c6d.zip | |
Add subdir support into virtfs::exists.
Diffstat (limited to 'src/fs/virtfs/fs.cpp')
| -rw-r--r-- | src/fs/virtfs/fs.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/fs/virtfs/fs.cpp b/src/fs/virtfs/fs.cpp index 61251bb35..d8f815562 100644 --- a/src/fs/virtfs/fs.cpp +++ b/src/fs/virtfs/fs.cpp @@ -340,7 +340,7 @@ namespace VirtFs } bool mountDirInternal(const std::string &restrict newDir, - const std::string &restrict subDir, + std::string subDir, const Append append) { if (newDir.find(".zip") != std::string::npos) @@ -351,6 +351,8 @@ namespace VirtFs std::string rootDir = newDir; if (findLast(rootDir, std::string(dirSeparator)) == false) rootDir += dirSeparator; + if (findLast(subDir, std::string(dirSeparator)) == false) + subDir += dirSeparator; const FsEntry *const entry = searchByRootInternal(rootDir, subDir); if (entry != nullptr) { @@ -449,10 +451,12 @@ namespace VirtFs #endif // UNITTESTS bool unmountDirInternal(std::string oldDir, - const std::string &restrict subDir) + std::string subDir) { if (findLast(oldDir, std::string(dirSeparator)) == false) oldDir += dirSeparator; + if (findLast(subDir, std::string(dirSeparator)) == false) + subDir += dirSeparator; FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries) { FsEntry *const entry = *it; @@ -597,6 +601,8 @@ namespace VirtFs return false; } prepareFsPath(subDir); + if (findLast(subDir, std::string(dirSeparator)) == false) + subDir += dirSeparator; if (searchByRootInternal(newDir, subDir) != nullptr) { reportAlways("FsZip::mount already exists: %s", @@ -656,6 +662,8 @@ namespace VirtFs return false; } prepareFsPath(subDir); + if (findLast(subDir, std::string(dirSeparator)) == false) + subDir += dirSeparator; FOR_EACH (std::vector<FsEntry*>::iterator, it, mEntries) { FsEntry *const entry = *it; |