wutdevoptab: Actually store the fullpath in __wut_fsa_file_t->fullPath

devkitPro · Apr 8, 2023 · d6760fb · d6760fb
1 parent 65053c3
commit d6760fb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/libraries/wutdevoptab/devoptab_fsa.cpp b/libraries/wutdevoptab/devoptab_fsa.cpp
@@ -77,6 +77,8 @@ FSError __init_wut_devoptab() {
 
       __wut_fsa_device_data.isSDCard = true;
       __wut_fsa_device_data.mounted = true;
+      __wut_fsa_device_data.cwd[0] = '/';
+      __wut_fsa_device_data.cwd[1] = '\0';
       chdir("fs:/vol/external01");
 
       FSADeviceInfo deviceInfo;

diff --git a/libraries/wutdevoptab/devoptab_fsa.h b/libraries/wutdevoptab/devoptab_fsa.h
@@ -23,6 +23,7 @@ typedef struct FSADeviceData {
     bool isSDCard;
     char name[32];
     char mountPath[0x80];
+    char cwd[FS_MAX_PATH + 1];
     FSAClientHandle clientHandle;
     uint64_t deviceSizeInSectors;
     uint32_t deviceSectorSize;

diff --git a/libraries/wutdevoptab/devoptab_fsa_chdir.cpp b/libraries/wutdevoptab/devoptab_fsa_chdir.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include "devoptab_fsa.h"
 
 int
@@ -25,6 +26,16 @@ __wut_fsa_chdir(struct _reent *r,
       r->_errno = __wut_fsa_translate_error(status);
       return -1;
    }
+
+   // Remove trailing '/'
+   if (fixedPath[0] != '\0') {
+      if (fixedPath[strlen(fixedPath) - 1] == '/') {
+         fixedPath[strlen(fixedPath) - 1] = 0;
+      }
+   }
+
+   snprintf(deviceData->cwd, sizeof(deviceData->cwd), "%s", fixedPath);
+
    free(fixedPath);
 
    return 0;

diff --git a/libraries/wutdevoptab/devoptab_fsa_open.cpp b/libraries/wutdevoptab/devoptab_fsa_open.cpp
@@ -65,7 +65,17 @@ __wut_fsa_open(struct _reent *r,
    }
 
    file = (__wut_fsa_file_t *) fileStruct;
-   strncpy(file->fullPath, fixedPath, sizeof(file->fullPath) - 1);
+   deviceData = (__wut_fsa_device_t *) r->deviceData;
+
+   if (fixedPath[0] != '\0' && fixedPath[0] != '\\' && fixedPath[0] != '/') {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+      snprintf(file->fullPath, sizeof(file->fullPath), "%s/%s", deviceData->cwd, fixedPath);
+#pragma GCC diagnostic pop
+   } else {
+      snprintf(file->fullPath, sizeof(file->fullPath), "%s", fixedPath);
+   }
+
    free(fixedPath);
 
    // Prepare flags
@@ -77,8 +87,6 @@ __wut_fsa_open(struct _reent *r,
    file->mutex.init(file->fullPath);
    std::lock_guard<MutexWrapper> lock(file->mutex);
 
-   deviceData = (__wut_fsa_device_t *) r->deviceData;
-
    if (createFileIfNotFound || failIfFileNotFound || (flags & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT)) {
       // Check if file exists
       FSAStat stat;
@@ -115,10 +123,10 @@ __wut_fsa_open(struct _reent *r,
 
    status = FSAOpenFileEx(deviceData->clientHandle, file->fullPath, fsMode, translatedMode, openFlags, preAllocSize, &fd);
    if (status < 0) {
-      if(status != FS_ERROR_NOT_FOUND) {
-        WUT_DEBUG_REPORT("FSAOpenFileEx(0x%08X, %s, %s, 0x%X, 0x%08X, 0x%08X, 0x%08X) failed: %s\n",
-                         deviceData->clientHandle, file->fullPath, fsMode, translatedMode, openFlags, preAllocSize, &fd,
-                         FSAGetStatusStr(status));
+      if (status != FS_ERROR_NOT_FOUND) {
+         WUT_DEBUG_REPORT("FSAOpenFileEx(0x%08X, %s, %s, 0x%X, 0x%08X, 0x%08X, 0x%08X) failed: %s\n",
+                          deviceData->clientHandle, file->fullPath, fsMode, translatedMode, openFlags, preAllocSize, &fd,
+                          FSAGetStatusStr(status));
       }
       r->_errno = __wut_fsa_translate_error(status);
       return -1;