1414codeforge
/
ubgpsuite
mirror of https://codeberg.org/1414codeforge/ubgpsuite.git
1
0
Fork 0
Code Packages Projects Releases Activity

[lonetix/fs] Make path extension functions more reliable

This commit is contained in:
Lorenzo Cogotti 2021-10-15 11:45:53 +02:00
parent 7be90e6e87
commit c195ecd8d7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lonetix/sys/fs_common.c
View File

@ -17,9 +17,8 @@ char *Sys_GetAbsoluteFileExtension(const char *path)
char *p = (char *) path; char *p = (char *) path;
char *sep = p, *extp = p; char *sep = p, *extp = p;
// FIXME make it more reliable
while (*p != '\0') { while (*p != '\0') {
if (*p == '.' && extp == sep) if (*p == '.' && extp == sep && p > sep + 1)
extp = p; extp = p;
if (IsSep(*p)) if (IsSep(*p))
extp = sep = p; extp = sep = p;
@ -27,7 +26,7 @@ char *Sys_GetAbsoluteFileExtension(const char *path)
p++; p++;
} }
if (extp == sep) if (extp == sep || *(extp+1) == '\0')
extp = p; // no extensions in path extp = p; // no extensions in path
return extp; return extp;
@ -38,9 +37,8 @@ char *Sys_GetFileExtension(const char *path)
char *p = (char *) path; char *p = (char *) path;
char *sep = p, *extp = p; char *sep = p, *extp = p;
// FIXME make it more reliable
while (*p != '\0') { while (*p != '\0') {
if (*p == '.') if (*p == '.' && p > sep + 1)
extp = p; extp = p;
if (IsSep(*p)) if (IsSep(*p))
sep = extp = p; sep = extp = p;
@ -48,7 +46,7 @@ char *Sys_GetFileExtension(const char *path)
p++; p++;
} }
if (extp == sep) if (extp == sep || *(extp+1) == '\0')
extp = p; // no extensions in path extp = p; // no extensions in path
return extp; return extp;