Emulation/Mephisto
1
0
Fork 0
mirror of https://github.com/reswitched/Mephisto.git synced 2024-06-23 14:43:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Close host file handle when IFile is closed. Implement destructor in stub-gen

Browse source
This commit is contained in:
roblabla 2018-02-28 16:33:54 +01:00
parent c781e26dd5
commit ba15d6d636
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generateIpcStubs.py
View file

@ -358,6 +358,8 @@ def main():
print >>fp, '\t\t%s(Ctu *_ctu%s);' % (name, ', ' + ', '.join('%s _%s' % (k, v) for k, v in partial[1]) if partial and partial[1] else '')
else:
print >>fp, '\t\t%s(Ctu *_ctu%s) : IpcService(_ctu)%s {}' % (name, ', ' + ', '.join('%s _%s' % (k, v) for k, v in partial[1]) if partial and partial[1] else '', ', ' + ', '.join('%s(_%s)' % (v, v) for k, v in partial[1]) if partial and partial[1] else '')
if re.search('(^|[^a-zA-Z0-9:])%s::~%s[^a-zA-Z0-9:]' % (qname, name), allcode):
print >>fp, '\t\t~%s();' % name
print >>fp, '\t\tuint32_t dispatch(IncomingIpcMessage &req, OutgoingIpcMessage &resp) {'
print >>fp, '\t\t\tswitch(req.cmdId) {'
for fname, func in sorted(funcs.items(), key=lambda x: x[1]['cmdId']):

37
ipcimpl/fsp.cpp
View file

@ -171,6 +171,28 @@ uint32_t nn::fssrv::sf::IFileSystem::CreateFile(IN uint64_t mode, IN uint32_t si
return 0;
}
uint32_t nn::fssrv::sf::IFileSystem::CreateDirectory(IN int8_t * path, guint path_size) {
LOG_DEBUG(Fsp, "Create directory %s", (fnPath+string((char*)path)).c_str());
if (mkdir((fnPath+string((char*)path)).c_str(), 0755) == -1)
return 0x7d402;
return 0;
}
uint32_t nn::fssrv::sf::IFileSystem::GetEntryType(IN int8_t * path, guint path_size, OUT uint32_t& _1) {
LOG_DEBUG(IpcStubs, "GetEntryType for file %s", (fnPath + string((char*)path)).c_str());
struct stat path_stat;
stat((fnPath+string((char*)path)).c_str(), &path_stat);
if (S_ISREG(path_stat.st_mode))
_1 = 1;
else if (S_ISDIR(path_stat.st_mode))
_1 = 0;
else
return 0x271002;
return 0;
}
// Funcs
uint32_t nn::fssrv::sf::IFileSystemProxy::OpenDataFileSystemByCurrentProcess(OUT shared_ptr<nn::fssrv::sf::IFileSystem>& _0) {
LOG_DEBUG(Fsp, "Stub implementation for nn::fssrv::sf::IFileSystemProxy::OpenDataFileSystemByCurrentProcess");
@ -317,7 +339,7 @@ uint32_t nn::fssrv::sf::IDirectory::Read(OUT uint64_t& entries_read, OUT uint8_t
}
/* ---------------------------------------- End of IFileSystem ---------------------------------------- */
/* ---------------------------------------- End of IDirectory ---------------------------------------- */
/* ---------------------------------------- Start of IFile ---------------------------------------- */
// Interface
@ -333,6 +355,10 @@ nn::fssrv::sf::IFile::IFile(Ctu *_ctu, string _fn, uint32_t _mode) : IpcServic
}
}
nn::fssrv::sf::IFile::~IFile() {
fclose((FILE*)fp);
}
uint32_t nn::fssrv::sf::IFile::GetSize(OUT uint64_t& fileSize) {
if(isOpen && fp != nullptr) {
bufferOffset = ftell((FILE *)fp);
@ -347,13 +373,16 @@ uint32_t nn::fssrv::sf::IFile::GetSize(OUT uint64_t& fileSize) {
}
uint32_t nn::fssrv::sf::IFile::Read(IN uint64_t _0, IN uint64_t offset, IN uint32_t size, OUT uint64_t& out_size, OUT int8_t * out_buf, guint out_buf_size) {
LOG_DEBUG(Fsp, "IFile::Read from %s from %lu", fn.c_str(), offset);
if(isOpen && fp != nullptr) {
uint32_t s = ((uint32_t)out_buf_size < size ? (uint32_t)out_buf_size : size);
bufferOffset = offset;
fseek((FILE *)fp, offset, SEEK_SET);
fread(out_buf, 1, s, (FILE *)fp);
size_t s_read = fread(out_buf, 1, s, (FILE *)fp);
bufferOffset = ftell((FILE *)fp);
out_size = (uint32_t)s;
out_size = (uint32_t)s_read;
} else {
LOG_DEBUG(Fsp, "File is closed !");
}
return 0x0;
}
@ -413,7 +442,7 @@ uint32_t nn::fssrv::sf::IFileSystem::OpenFile(IN uint32_t mode, IN int8_t * path
}
uint32_t nn::fssrv::sf::IFileSystem::OpenDirectory(IN uint32_t filter, IN int8_t * path, guint path_size, OUT shared_ptr<nn::fssrv::sf::IDirectory>& dir) {
LOG_DEBUG(Fsp, "OpenFile %s", path);
LOG_DEBUG(Fsp, "OpenDirectory %s", path);
auto tempi = buildInterface(nn::fssrv::sf::IDirectory, fnPath + "/" + string((char*)path), filter);
if(tempi->isOpen) {
dir = tempi;