From: Dave Murphy <davem@devkitpro.org>
Date: Thu, 4 Dec 2014 00:29:35 +0000 (+0000)
Subject: implement chdir & relative path support
X-Git-Tag: v0.2.0~8
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=1bc0073bd3b04e02194dd7f39b1ca8440f68f0e5;p=corbenik%2Fctrulib.git

implement chdir & relative path support
---

diff --git a/libctru/source/sdmc_dev.c b/libctru/source/sdmc_dev.c
index 3d9e269..ae99c16 100644
--- a/libctru/source/sdmc_dev.c
+++ b/libctru/source/sdmc_dev.c
@@ -1,7 +1,10 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
+#include <limits.h>
 #include <sys/iosupport.h>
+#include <sys/param.h>
+
 #include <string.h>
 #include <3ds.h>
 
@@ -96,14 +99,60 @@ static FS_archive sdmcArchive =
 
 /*! @endcond */
 
+static char __cwd[PATH_MAX+1] = "/";
+static char __fixedpath[PATH_MAX+1];
+
+static const char *sdmc_fixpath(const char *path)
+{
+  // Move the path pointer to the start of the actual path
+  if (strchr (path, ':') != NULL)
+  {
+    path = strchr (path, ':') + 1;
+  }
+
+  if (strchr (path, ':') != NULL) return NULL;
+
+
+  if (path[0]=='/') return path;
+
+  strncpy(__fixedpath,__cwd,PATH_MAX);
+  strncat(__fixedpath,path,PATH_MAX);
+  __fixedpath[PATH_MAX] = 0;
+
+  return __fixedpath;
+
+}
+
+int __system_argc;
+char** __system_argv;
+
 /*! Initialize SDMC device */
 Result sdmcInit(void)
 {
   Result rc;
 
+
   rc = FSUSER_OpenArchive(NULL, &sdmcArchive);
+
+
   if(rc == 0)
-    AddDevice(&sdmc_devoptab);
+  {
+
+    int dev = AddDevice(&sdmc_devoptab);
+
+    if (__system_argc != 0 && __system_argv[0] != NULL)
+    {
+      if (FindDevice(__system_argv[0]) == dev)
+      {
+        strncpy(__fixedpath,__system_argv[0],PATH_MAX);
+        char *last_slash = strrchr(__fixedpath,'/');
+        if (last_slash != NULL) {
+          last_slash[0] = 0;
+          chdir(__fixedpath);
+        }
+      }
+    }
+  }
 
   return rc;
 }
@@ -142,10 +191,15 @@ sdmc_open(struct _reent *r,
   Result      rc;
   u32         sdmc_flags = 0;
   u32         attributes = FS_ATTRIBUTE_NONE;
-  char        *pathptr = NULL;
+  const char  *pathptr = NULL;
 
-  pathptr = strchr(path, '/');
-  if(pathptr==NULL)pathptr = (char*)path;
+  pathptr = sdmc_fixpath(path);
+
+  if(pathptr==NULL)
+  {
+    r->_errno=EINVAL;
+    return -1;
+  }
 
   /* get pointer to our data */
   sdmc_file_t *file = (sdmc_file_t*)fileStruct;
@@ -484,8 +538,32 @@ static int
 sdmc_chdir(struct _reent *r,
            const char    *name)
 {
-  r->_errno = ENOSYS;
-  return -1;
+  Handle fd;
+  Result rc;
+  const char     *pathptr = NULL;
+
+  pathptr = sdmc_fixpath(name);
+
+  if(pathptr==NULL)
+  {
+    r->_errno=EINVAL;
+    return -1;
+  }
+
+  rc = FSUSER_OpenDirectory(NULL, &fd, sdmcArchive, FS_makePath(PATH_CHAR, pathptr));
+  if(rc == 0)
+  {
+    FSDIR_Close(fd);
+    strncpy(__cwd,pathptr,PATH_MAX);
+  }
+  else
+  {
+    r->_errno=EINVAL;
+    return -1;
+  }
+
+  return 0;
+
 }
 
 /*! Rename a file
@@ -521,10 +599,15 @@ sdmc_mkdir(struct _reent *r,
            int           mode)
 {
   Result rc;
-  char        *pathptr = NULL;
+  const char *pathptr = NULL;
 
-  pathptr = strchr(path, '/');
-  if(pathptr==NULL)pathptr = (char*)path;
+  pathptr = sdmc_fixpath(path);
+
+  if(pathptr==NULL)
+  {
+    r->_errno=EINVAL;
+    return -1;
+  }
 
   /* TODO: Use mode to set directory attributes. */
 
@@ -552,10 +635,15 @@ sdmc_diropen(struct _reent *r,
 {
   Handle         fd;
   Result         rc;
-  char        *pathptr = NULL;
+  const char     *pathptr = NULL;
+
+  pathptr = sdmc_fixpath(path);
 
-  pathptr = strchr(path, '/');
-  if(pathptr==NULL)pathptr = (char*)path;
+  if(pathptr==NULL)
+  {
+    r->_errno=EINVAL;
+    return NULL;
+  }
 
   /* get pointer to our data */
   sdmc_dir_t *dir = (sdmc_dir_t*)(dirState->dirStruct);
@@ -685,7 +773,7 @@ sdmc_statvfs(struct _reent  *r,
 {
   Result rc;
   u32    clusterSize, numClusters, freeClusters;
-  u32    writable = 0;
+  u8    writable = 0;
 
   rc = FSUSER_GetSdmcArchiveResource(NULL,
                                      NULL,
@@ -787,7 +875,7 @@ sdmc_fsync(struct _reent *r,
  *  @returns 0 for success
  *  @returns -1 for error
  */
-static int 
+static int
 sdmc_chmod(struct _reent *r,
           const char    *path,
           mode_t        mode)