mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use Service for all fs sessions. This fixes an issue with savedata commit.

Browse Source
This commit is contained in:
yellows8 2018-04-06 12:39:21 -04:00
parent 4786624781
commit 29211c1800
2 changed files with 39 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nx/include/switch/services/fs.h
View File

@ -21,23 +21,23 @@
#define FS_SAVEDATA_USERID_COMMONSAVE 0 #define FS_SAVEDATA_USERID_COMMONSAVE 0
typedef struct { typedef struct {
Handle h; Service s;
} FsFileSystem; } FsFileSystem;
typedef struct { typedef struct {
Handle h; Service s;
} FsFile; } FsFile;
typedef struct { typedef struct {
Handle h; Service s;
} FsDir; } FsDir;
typedef struct { typedef struct {
Handle h; Service s;
} FsStorage; } FsStorage;
typedef struct { typedef struct {
Handle h; Service s;
} FsSaveDataIterator; } FsSaveDataIterator;
/// Directory entry. /// Directory entry.

83
nx/source/services/fs.c
View File

@ -92,7 +92,7 @@ Result fsMountSdcard(FsFileSystem* out) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -131,7 +131,7 @@ Result fsMountSaveData(FsFileSystem* out, u8 inval, FsSave *save) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -170,7 +170,7 @@ Result fsMountSystemSaveData(FsFileSystem* out, u8 inval, FsSave *save) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -220,7 +220,7 @@ Result fsOpenSaveDataIterator(FsSaveDataIterator* out, s32 SaveDataSpaceId) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -255,7 +255,7 @@ Result fsOpenDataStorageByCurrentProcess(FsStorage* out) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -306,7 +306,7 @@ Result fsFsCreateFile(FsFileSystem* fs, const char* path, size_t size, int flags
raw->size = size; raw->size = size;
raw->flags = flags; raw->flags = flags;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -338,7 +338,7 @@ Result fsFsDeleteFile(FsFileSystem* fs, const char* path) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 1; raw->cmd_id = 1;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -370,7 +370,7 @@ Result fsFsCreateDirectory(FsFileSystem* fs, const char* path) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 2; raw->cmd_id = 2;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -402,7 +402,7 @@ Result fsFsDeleteDirectory(FsFileSystem* fs, const char* path) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 3; raw->cmd_id = 3;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -434,7 +434,7 @@ Result fsFsDeleteDirectoryRecursively(FsFileSystem* fs, const char* path) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 4; raw->cmd_id = 4;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -467,7 +467,7 @@ Result fsFsRenameFile(FsFileSystem* fs, const char* path0, const char* path1) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 5; raw->cmd_id = 5;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -500,7 +500,7 @@ Result fsFsRenameDirectory(FsFileSystem* fs, const char* path0, const char* path
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 6; raw->cmd_id = 6;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -532,7 +532,7 @@ Result fsFsGetEntryType(FsFileSystem* fs, const char* path, FsEntryType* out) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 7; raw->cmd_id = 7;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -571,7 +571,7 @@ Result fsFsOpenFile(FsFileSystem* fs, const char* path, int flags, FsFile* out)
raw->cmd_id = 8; raw->cmd_id = 8;
raw->flags = flags; raw->flags = flags;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -585,7 +585,7 @@ Result fsFsOpenFile(FsFileSystem* fs, const char* path, int flags, FsFile* out)
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -609,7 +609,7 @@ Result fsFsOpenDirectory(FsFileSystem* fs, const char* path, int flags, FsDir* o
raw->cmd_id = 9; raw->cmd_id = 9;
raw->flags = flags; raw->flags = flags;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -623,7 +623,7 @@ Result fsFsOpenDirectory(FsFileSystem* fs, const char* path, int flags, FsDir* o
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
out->h = r.Handles[0]; serviceCreate(&out->s, r.Handles[0]);
} }
} }
@ -644,7 +644,7 @@ Result fsFsCommit(FsFileSystem* fs) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 10; raw->cmd_id = 10;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -676,7 +676,7 @@ Result fsFsGetFreeSpace(FsFileSystem* fs, const char* path, u64* out) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 11; raw->cmd_id = 11;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -713,7 +713,7 @@ Result fsFsGetTotalSpace(FsFileSystem* fs, const char* path, u64* out) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 12; raw->cmd_id = 12;
Result rc = ipcDispatch(fs->h); Result rc = serviceIpcDispatch(&fs->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -736,10 +736,7 @@ Result fsFsGetTotalSpace(FsFileSystem* fs, const char* path, u64* out) {
} }
void fsFsClose(FsFileSystem* fs) { void fsFsClose(FsFileSystem* fs) {
if(fs->h != INVALID_HANDLE) { serviceClose(&fs->s);
svcCloseHandle(fs->h);
fs->h = INVALID_HANDLE;
}
} }
// IFile implementation // IFile implementation
@ -764,7 +761,7 @@ Result fsFileRead(FsFile* f, u64 off, void* buf, size_t len, size_t* out) {
raw->offset = off; raw->offset = off;
raw->read_size = len; raw->read_size = len;
Result rc = ipcDispatch(f->h); Result rc = serviceIpcDispatch(&f->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -807,7 +804,7 @@ Result fsFileWrite(FsFile* f, u64 off, const void* buf, size_t len) {
raw->offset = off; raw->offset = off;
raw->write_size = len; raw->write_size = len;
Result rc = ipcDispatch(f->h); Result rc = serviceIpcDispatch(&f->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -838,7 +835,7 @@ Result fsFileFlush(FsFile* f) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 2; raw->cmd_id = 2;
Result rc = ipcDispatch(f->h); Result rc = serviceIpcDispatch(&f->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -871,7 +868,7 @@ Result fsFileSetSize(FsFile* f, u64 sz) {
raw->cmd_id = 3; raw->cmd_id = 3;
raw->size = sz; raw->size = sz;
Result rc = ipcDispatch(f->h); Result rc = serviceIpcDispatch(&f->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -902,7 +899,7 @@ Result fsFileGetSize(FsFile* f, u64* out) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 4; raw->cmd_id = 4;
Result rc = ipcDispatch(f->h); Result rc = serviceIpcDispatch(&f->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -922,18 +919,12 @@ Result fsFileGetSize(FsFile* f, u64* out) {
} }
void fsFileClose(FsFile* f) { void fsFileClose(FsFile* f) {
if(f->h != INVALID_HANDLE) { serviceClose(&f->s);
svcCloseHandle(f->h);
f->h = INVALID_HANDLE;
}
} }
// IDirectory implementation // IDirectory implementation
void fsDirClose(FsDir* d) { void fsDirClose(FsDir* d) {
if(d->h != INVALID_HANDLE) { serviceClose(&d->s);
svcCloseHandle(d->h);
d->h = INVALID_HANDLE;
}
} }
Result fsDirRead(FsDir* d, u64 inval, size_t* total_entries, size_t max_entries, FsDirectoryEntry *buf) { Result fsDirRead(FsDir* d, u64 inval, size_t* total_entries, size_t max_entries, FsDirectoryEntry *buf) {
@ -953,7 +944,7 @@ Result fsDirRead(FsDir* d, u64 inval, size_t* total_entries, size_t max_entries,
raw->cmd_id = 0; raw->cmd_id = 0;
raw->inval = inval; raw->inval = inval;
Result rc = ipcDispatch(d->h); Result rc = serviceIpcDispatch(&d->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -989,7 +980,7 @@ Result fsDirGetEntryCount(FsDir* d, u64* count) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 1; raw->cmd_id = 1;
Result rc = ipcDispatch(d->h); Result rc = serviceIpcDispatch(&d->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -1028,7 +1019,7 @@ Result fsStorageRead(FsStorage* s, u64 off, void* buf, size_t len) {
raw->offset = off; raw->offset = off;
raw->read_size = len; raw->read_size = len;
Result rc = ipcDispatch(s->h); Result rc = serviceIpcDispatch(&s->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -1046,10 +1037,7 @@ Result fsStorageRead(FsStorage* s, u64 off, void* buf, size_t len) {
} }
void fsStorageClose(FsStorage* s) { void fsStorageClose(FsStorage* s) {
if(s->h != INVALID_HANDLE) { serviceClose(&s->s);
svcCloseHandle(s->h);
s->h = INVALID_HANDLE;
}
} }
// ISaveDataInfoReader // ISaveDataInfoReader
@ -1068,7 +1056,7 @@ Result fsSaveDataIteratorRead(FsSaveDataIterator *s, FsSaveDataInfo* buf, size_t
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 0; raw->cmd_id = 0;
Result rc = ipcDispatch(s->h); Result rc = serviceIpcDispatch(&s->s);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -1091,9 +1079,6 @@ Result fsSaveDataIteratorRead(FsSaveDataIterator *s, FsSaveDataInfo* buf, size_t
} }
void fsSaveDataIteratorClose(FsSaveDataIterator* s) { void fsSaveDataIteratorClose(FsSaveDataIterator* s) {
if(s->h != INVALID_HANDLE) { serviceClose(&s->s);
svcCloseHandle(s->h);
s->h = INVALID_HANDLE;
}
} }