thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

filesearch.c: Always use system-specific path seperator

Browse source 
The directory functions this was built on are capable of converting Unix paths to Windows internally, but the paths generated by the search can sometimes be processed by the game afterwards, which relies on system-specific character comparison.

Notably fixes WADNAME failing via the console on Windows.
This commit is contained in:
toaster 2023-04-24 20:53:58 +01:00
parent 35728a00e3
commit 0f16c61d04
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/filesrch.c
View file

@ -40,7 +40,6 @@
#include <tchar.h> #include <tchar.h>
#define SUFFIX "*" #define SUFFIX "*"
#define SLASH "\\"
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#ifndef INVALID_FILE_ATTRIBUTES #ifndef INVALID_FILE_ATTRIBUTES
@ -138,7 +137,7 @@ opendir (const CHAR *szPath)
/* Allocate enough space to store DIR structure and the complete /* Allocate enough space to store DIR structure and the complete
* directory path given. */ * directory path given. */
nd = (DIR *) malloc (sizeof (DIR) + (strlen(szFullPath) + strlen (SLASH) + nd = (DIR *) malloc (sizeof (DIR) + (strlen(szFullPath) + strlen (SLASH) +
strlen(SUFFIX) + 1) * sizeof (CHAR)); strlen(PATHSEP) + 1) * sizeof (CHAR));
if (!nd) if (!nd)
{ {
@ -152,10 +151,9 @@ opendir (const CHAR *szPath)
/* Add on a slash if the path does not end with one. */ /* Add on a slash if the path does not end with one. */
if (nd->dd_name[0] != '\0' && if (nd->dd_name[0] != '\0' &&
nd->dd_name[strlen (nd->dd_name) - 1] != '/' && nd->dd_name[strlen (nd->dd_name) - 1] != PATHSEP[0])
nd->dd_name[strlen (nd->dd_name) - 1] != '\\')
{ {
strcat (nd->dd_name, SLASH); strcat (nd->dd_name, PATHSEP);
} }
/* Add on the search pattern */ /* Add on the search pattern */
@ -464,9 +462,9 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
return FS_NOTFOUND; return FS_NOTFOUND;
} }
if (searchpath[searchpathindex[depthleft]-2] != '/') if (searchpath[searchpathindex[depthleft]-2] != PATHSEP[0])
{ {
searchpath[searchpathindex[depthleft]-1] = '/'; searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
searchpath[searchpathindex[depthleft]] = 0; searchpath[searchpathindex[depthleft]] = 0;
} }
else else
@ -508,8 +506,8 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
depthleft++; depthleft++;
} }
searchpath[searchpathindex[depthleft]-1]='/'; searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
searchpath[searchpathindex[depthleft]]=0; searchpath[searchpathindex[depthleft]] = 0;
} }
else if (!strcasecmp(searchname, dent->d_name)) else if (!strcasecmp(searchname, dent->d_name))
{ {