mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #635 from a3f/master

Browse Source 
core: Support slashes as well in GetFileName & GetDirectoryPath
This commit is contained in:
Ray 2018-08-25 10:51:31 +02:00 committed by GitHub
commit fe2f8d77a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core.c
View File

@ -1346,10 +1346,19 @@ const char *GetExtension(const char *fileName)
return (dot + 1); return (dot + 1);
} }
/* "string pointer reverse break": return right-most occurrence of charset in s */
static const char *strprbrk(const char *s, const char *charset)
{
const char *latest_match = NULL;
for(; s = strpbrk(s, charset), s != NULL; latest_match=s++)
;
return latest_match;
}
// Get pointer to filename for a path string // Get pointer to filename for a path string
const char *GetFileName(const char *filePath) const char *GetFileName(const char *filePath)
{ {
const char *fileName = strrchr(filePath, '\\'); const char *fileName = strprbrk(filePath, "\\/");
if (!fileName || fileName == filePath) return filePath; if (!fileName || fileName == filePath) return filePath;
@ -1360,11 +1369,14 @@ const char *GetFileName(const char *filePath)
// Get directory for a given fileName (with path) // Get directory for a given fileName (with path)
const char *GetDirectoryPath(const char *fileName) const char *GetDirectoryPath(const char *fileName)
{ {
char *lastSlash = NULL; const char *lastSlash = NULL;
static char filePath[256]; // MAX_DIRECTORY_PATH_SIZE = 256 static char filePath[256]; // MAX_DIRECTORY_PATH_SIZE = 256
memset(filePath, 0, 256); memset(filePath, 0, 256);
lastSlash = strrchr(fileName, '\\'); lastSlash = strprbrk(fileName, "\\/");
if (!lastSlash)
return NULL;
strncpy(filePath, fileName, strlen(fileName) - (strlen(lastSlash) - 1)); strncpy(filePath, fileName, strlen(fileName) - (strlen(lastSlash) - 1));
filePath[strlen(fileName) - strlen(lastSlash)] = '\0'; filePath[strlen(fileName) - strlen(lastSlash)] = '\0';