Merge pull request #662 from Subv/delete_file

FileSys: Append the requested path to the filesystem base path in DeleteFile
This commit is contained in:
bunnei 2018-07-14 13:11:58 -07:00 committed by GitHub
commit fd1f5c5414
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -58,11 +58,13 @@ ResultVal<std::unique_ptr<StorageBackend>> Disk_FileSystem::OpenFile(const std::
} }
ResultCode Disk_FileSystem::DeleteFile(const std::string& path) const { ResultCode Disk_FileSystem::DeleteFile(const std::string& path) const {
if (!FileUtil::Exists(path)) { std::string full_path = base_directory + path;
if (!FileUtil::Exists(full_path)) {
return ERROR_PATH_NOT_FOUND; return ERROR_PATH_NOT_FOUND;
} }
FileUtil::Delete(path); FileUtil::Delete(full_path);
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }