archive_dev: Ensure path separator for local path (#524)

oreo639 · web-flow · commit 39a53c4fe554 · 2023-05-07T12:08:13.000+01:00
Fixes issue where fopen("test.txt","r") opens 3dstest.txt instead of test.txt. Also correct misuse of strncat() as count applies to src not dest. See: devkitPro/3ds-hbmenu@8136d94 devkitPro/newlib@806a4d3
diff --git a/libctru/source/archive_dev.c b/libctru/source/archive_dev.c
@@ -205,9 +205,11 @@ archive_fixpath(struct _reent    *r,
     strncpy(__ctru_dev_path_buf, path, PATH_MAX);
   else
   {
+    size_t cwdlen = strlen(dev->cwd);
     strncpy(__ctru_dev_path_buf, dev->cwd, PATH_MAX);
     __ctru_dev_path_buf[PATH_MAX] = '\0';
-    strncat(__ctru_dev_path_buf, path, PATH_MAX);
+    strncat(__ctru_dev_path_buf, "/", PATH_MAX - cwdlen);
+    strncat(__ctru_dev_path_buf, path, PATH_MAX - cwdlen - 1);
   }
 
   if(__ctru_dev_path_buf[PATH_MAX] != 0)

Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,11 @@ archive_fixpath(struct _reent *r,`
`205`	`205`	`strncpy(__ctru_dev_path_buf, path, PATH_MAX);`
`206`	`206`	`else`
`207`	`207`	`{`
	`208`	`+ size_t cwdlen = strlen(dev->cwd);`
`208`	`209`	`strncpy(__ctru_dev_path_buf, dev->cwd, PATH_MAX);`
`209`	`210`	`__ctru_dev_path_buf[PATH_MAX] = '\0';`
`210`		`- strncat(__ctru_dev_path_buf, path, PATH_MAX);`
	`211`	`+ strncat(__ctru_dev_path_buf, "/", PATH_MAX - cwdlen);`
	`212`	`+ strncat(__ctru_dev_path_buf, path, PATH_MAX - cwdlen - 1);`
`211`	`213`	`}`
`212`	`214`
`213`	`215`	`if(__ctru_dev_path_buf[PATH_MAX] != 0)`