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

fs_dev adjustments: disabled broken __thread, handle default device in fsdevFindDevice(), and check for fsdevFindDevice() failure in fsdev_fixpath(). Added a comment in _fsdevUnmountDeviceStruct(). Removed the return at the start of fsdev_open().

Browse Source
This commit is contained in:
yellows8 2017-11-24 22:30:44 -05:00
parent 25f2839c75
commit d7e611f9f4
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nx/source/devices/fs_dev.c
View File

@ -110,8 +110,8 @@ static fsdev_fsdevice fsdev_fsdevices[32];
/*! @endcond */ /*! @endcond */
static char __cwd[PATH_MAX+1] = "/"; static char __cwd[PATH_MAX+1] = "/";
static __thread char __fixedpath[PATH_MAX+1]; static /*__thread*/ char __fixedpath[PATH_MAX+1];
//static __thread uint16_t __utf16path[PATH_MAX+1]; //static /*__thread*/ uint16_t __utf16path[PATH_MAX+1];
static fsdev_fsdevice *fsdevFindDevice(const char *name) static fsdev_fsdevice *fsdevFindDevice(const char *name)
{ {
@ -119,6 +119,15 @@ static fsdev_fsdevice *fsdevFindDevice(const char *name)
u32 total = sizeof(fsdev_fsdevices) / sizeof(fsdev_fsdevice); u32 total = sizeof(fsdev_fsdevices) / sizeof(fsdev_fsdevice);
fsdev_fsdevice *device = NULL; fsdev_fsdevice *device = NULL;
if(name && name[0] == '/') //Return the default device.
{
device = &fsdev_fsdevices[0];
if(!device->setup)
device = NULL;
return device;
}
for(i=0; i<total; i++) for(i=0; i<total; i++)
{ {
device = &fsdev_fsdevices[i]; device = &fsdev_fsdevices[i];
@ -148,7 +157,14 @@ fsdev_fixpath(struct _reent *r,
const uint8_t *p = (const uint8_t*)path; const uint8_t *p = (const uint8_t*)path;
if(device) if(device)
{
*device = fsdevFindDevice(path); *device = fsdevFindDevice(path);
if(*device == NULL)
{
r->_errno = ENODEV;
return NULL;
}
}
// Move the path pointer to the start of the actual path // Move the path pointer to the start of the actual path
do do
@ -295,7 +311,7 @@ static int _fsdevUnmountDeviceStruct(fsdev_fsdevice *device)
if(!device->setup) if(!device->setup)
return 0; return 0;
RemoveDevice(device->name); RemoveDevice(device->name);//TODO: Use name with ':' appended.
fsFsClose(&device->fs); fsFsClose(&device->fs);
memset(device, 0, sizeof(fsdev_fsdevice)); memset(device, 0, sizeof(fsdev_fsdevice));
@ -442,7 +458,7 @@ fsdev_open(struct _reent *r,
u32 attributes = 0; u32 attributes = 0;
char fs_path[FS_MAX_PATH]; char fs_path[FS_MAX_PATH];
fsdev_fsdevice *device = NULL; fsdev_fsdevice *device = NULL;
return -1;
if(fsdev_getfspath(r, path, &device, fs_path)==-1) if(fsdev_getfspath(r, path, &device, fs_path)==-1)
return -1; return -1;
@ -642,7 +658,7 @@ fsdev_write_safe(struct _reent *r,
/* Copy to internal buffer and write in chunks. /* Copy to internal buffer and write in chunks.
* You cannot write from read-only memory. * You cannot write from read-only memory.
*/ */
static __thread char tmp_buffer[8192]; static /*__thread*/ char tmp_buffer[8192];
while(len > 0) while(len > 0)
{ {
size_t toWrite = len; size_t toWrite = len;