FileSys: split the constructor into an Open method, in order to notify the opener something went wrong.

Kernel: Return an invalid handle to OpenFile when it failed to open.
This commit is contained in:
Emmanuel Gil Peyrot 2014-09-27 19:21:48 +00:00
parent 23c2fbfc7a
commit 0be5c03176
7 changed files with 57 additions and 14 deletions

View File

@ -46,6 +46,8 @@ bool Archive_SDMC::Initialize() {
std::unique_ptr<File> Archive_SDMC::OpenFile(const std::string& path, const Mode mode) const { std::unique_ptr<File> Archive_SDMC::OpenFile(const std::string& path, const Mode mode) const {
DEBUG_LOG(FILESYS, "called path=%s mode=%d", path.c_str(), mode); DEBUG_LOG(FILESYS, "called path=%s mode=%d", path.c_str(), mode);
File_SDMC* file = new File_SDMC(this, path, mode); File_SDMC* file = new File_SDMC(this, path, mode);
if (!file->Open())
return nullptr;
return std::unique_ptr<File>(file); return std::unique_ptr<File>(file);
} }

View File

@ -18,6 +18,12 @@ public:
File() { } File() { }
virtual ~File() { } virtual ~File() { }
/**
* Open the file
* @return true if the file opened correctly
*/
virtual bool Open() = 0;
/** /**
* Read data from the file * Read data from the file
* @param offset Offset in bytes to start reading data from * @param offset Offset in bytes to start reading data from

View File

@ -17,6 +17,14 @@ File_RomFS::File_RomFS() {
File_RomFS::~File_RomFS() { File_RomFS::~File_RomFS() {
} }
/**
* Open the file
* @return true if the file opened correctly
*/
bool File_RomFS::Open() {
return false;
}
/** /**
* Read data from the file * Read data from the file
* @param offset Offset in bytes to start reading data from * @param offset Offset in bytes to start reading data from

View File

@ -19,6 +19,12 @@ public:
File_RomFS(); File_RomFS();
~File_RomFS() override; ~File_RomFS() override;
/**
* Open the file
* @return true if the file opened correctly
*/
bool Open() override;
/** /**
* Read data from the file * Read data from the file
* @param offset Offset in bytes to start reading data from * @param offset Offset in bytes to start reading data from

View File

@ -19,26 +19,36 @@ File_SDMC::File_SDMC(const Archive_SDMC* archive, const std::string& path, const
// TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass // TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass
// the root directory we set while opening the archive. // the root directory we set while opening the archive.
// For example, opening /../../etc/passwd can give the emulated program your users list. // For example, opening /../../etc/passwd can give the emulated program your users list.
std::string real_path = archive->GetMountPoint() + path; this->path = archive->GetMountPoint() + path;
this->mode.hex = mode.hex;
if (!mode.create_flag && !FileUtil::Exists(real_path)) {
file = nullptr;
return;
}
std::string mode_string;
if (mode.read_flag)
mode_string += "r";
if (mode.write_flag)
mode_string += "w";
file = new FileUtil::IOFile(real_path, mode_string.c_str());
} }
File_SDMC::~File_SDMC() { File_SDMC::~File_SDMC() {
Close(); Close();
} }
/**
* Open the file
* @return true if the file opened correctly
*/
bool File_SDMC::Open() {
if (!mode.create_flag && !FileUtil::Exists(path)) {
ERROR_LOG(FILESYS, "Non-existing file %s cant be open without mode create.", path.c_str());
return false;
}
std::string mode_string;
if (mode.read_flag && mode.write_flag)
mode_string = "w+";
else if (mode.read_flag)
mode_string = "r";
else if (mode.write_flag)
mode_string = "w";
file = new FileUtil::IOFile(path, mode_string.c_str());
return true;
}
/** /**
* Read data from the file * Read data from the file
* @param offset Offset in bytes to start reading data from * @param offset Offset in bytes to start reading data from

View File

@ -22,6 +22,12 @@ public:
File_SDMC(const Archive_SDMC* archive, const std::string& path, const Mode mode); File_SDMC(const Archive_SDMC* archive, const std::string& path, const Mode mode);
~File_SDMC() override; ~File_SDMC() override;
/**
* Open the file
* @return true if the file opened correctly
*/
bool Open() override;
/** /**
* Read data from the file * Read data from the file
* @param offset Offset in bytes to start reading data from * @param offset Offset in bytes to start reading data from
@ -61,6 +67,8 @@ public:
bool Close() const override; bool Close() const override;
private: private:
std::string path;
Mode mode;
FileUtil::IOFile* file; FileUtil::IOFile* file;
}; };

View File

@ -374,6 +374,9 @@ Handle OpenFileFromArchive(Handle archive_handle, const std::string& path, const
file->path = path; file->path = path;
file->backend = archive->backend->OpenFile(path, mode); file->backend = archive->backend->OpenFile(path, mode);
if (!file->backend)
return 0;
return handle; return handle;
} }