From d7e611f9f4cd64969d63a45b3b19ea6bb9a12590 Mon Sep 17 00:00:00 2001
From: yellows8 <yellows8@users.noreply.github.com>
Date: Fri, 24 Nov 2017 22:30:44 -0500
Subject: [PATCH] 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().

---
 nx/source/devices/fs_dev.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

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