Re #2623: fixed f_getcwd() on Windows

2015-08-18 17:31:49 +02:00
parent 9f19deb1e2
commit e685528fd3
1 changed files with 14 additions and 4 deletions
@@ -976,11 +976,21 @@ int f_printf (FIL *fil, const TCHAR * format, ...)

 FRESULT f_getcwd (TCHAR *path, UINT sz_path)
 {
+  char cwd[1024];
+  if (!getcwd(cwd, 1024)) {
+    TRACE("f_getcwd() = getcwd() error %d (%s)", errno, strerror(errno));
+    strcpy(path, ".");
+    return FR_NO_PATH;
+  }
+
+  if (strlen(cwd) < strlen(simuSdDirectory)) {
+    TRACE("f_getcwd() = logic error strlen(cwd) < strlen(simuSdDirectory):  cwd: \"%s\",  simuSdDirectory: \"%s\"", cwd, simuSdDirectory);
+    strcpy(path, ".");
+    return FR_NO_PATH;
+  }
+
  // remove simuSdDirectory from the cwd
-  char * cwd = get_current_dir_name();
-  std::string c(cwd + strlen(simuSdDirectory));
-  free(cwd);
-  strcpy(path, c.c_str());
+  strcpy(path, cwd + strlen(simuSdDirectory));
  TRACE("f_getcwd() = %s", path);
  return FR_OK;
 }