Fixed conflicts

This commit is contained in:
Nekotekina 2014-02-26 15:27:06 +04:00
commit 8bd0ee875c
84 changed files with 864 additions and 1211 deletions

View file

@ -350,9 +350,18 @@ int cellFsUnlink(u32 path_addr)
const wxString& ps3_path = Memory.ReadString(path_addr);
sys_fs.Warning("cellFsUnlink(path=\"%s\")", ps3_path.wx_str());
//wxString localPath;
//Emu.GetVFS().GetDevice(ps3_path, localPath);
//wxRemoveFile(localPath);
if (ps3_path.empty())
return CELL_EFAULT;
if (Emu.GetVFS().ExistsDir(ps3_path))
return CELL_EISDIR;
if (!Emu.GetVFS().ExistsFile(ps3_path))
return CELL_ENOENT;
if (!Emu.GetVFS().RemoveFile(ps3_path))
return CELL_EACCES;
return CELL_OK;
}