eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use another compat_splitpath implementation

This commit is contained in:
Vasilii Rogin 2023-10-09 19:51:03 +03:00
parent 0e447c55a8
commit ec990ff806
1 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/platform_compat.cc
View File

@ -57,66 +57,54 @@ void compat_splitpath(const char* path, char* drive, char* dir, char* fname, cha
#ifdef _WIN32 #ifdef _WIN32
_splitpath(path, drive, dir, fname, ext); _splitpath(path, drive, dir, fname, ext);
#else #else
const char* driveStart = path; // Initialize outputs to empty strings
if (path[0] == '/' && path[1] == '/') { if (drive) drive[0] = '\0';
if (dir) dir[0] = '\0';
if (fname) fname[0] = '\0';
if (ext) ext[0] = '\0';
const char* lastSlash = strrchr(path, '/');
const char* lastBackSlash = strrchr(path, '\\');
if (lastBackSlash && (!lastSlash || lastBackSlash > lastSlash)) {
lastSlash = lastBackSlash;
}
const char* lastDot = strrchr((lastSlash ? lastSlash : path), '.');
// Handle drive letter for Windows-style paths on non-Windows platforms
if (path[1] == ':') {
if (drive) {
drive[0] = path[0];
drive[1] = ':';
drive[2] = '\0';
}
path += 2; path += 2;
while (*path != '\0' && *path != '/' && *path != '.') {
path++;
}
} }
if (drive != NULL) { // Directory component
size_t driveSize = path - driveStart; if (lastSlash) {
if (driveSize > COMPAT_MAX_DRIVE - 1) { size_t length = lastSlash - path + 1; // Include slash
driveSize = COMPAT_MAX_DRIVE - 1; if (dir) {
strncpy(dir, path, length);
dir[length] = '\0';
} }
strncpy(drive, path, driveSize); path = lastSlash + 1; // Move past the slash or backslash
drive[driveSize] = '\0';
} }
const char* dirStart = path; // Filename and extension
const char* fnameStart = path; if (lastDot && (lastDot > lastSlash)) {
const char* extStart = NULL; size_t length = lastDot - path;
if (fname) {
const char* end = path; strncpy(fname, path, length);
while (*end != '\0') { fname[length] = '\0';
if (*end == '/') {
fnameStart = end + 1;
} else if (*end == '.') {
extStart = end;
} }
end++; if (ext) {
} strcpy(ext, lastDot);
if (extStart == NULL) {
extStart = end;
}
if (dir != NULL) {
size_t dirSize = fnameStart - dirStart;
if (dirSize > COMPAT_MAX_DIR - 1) {
dirSize = COMPAT_MAX_DIR - 1;
} }
strncpy(dir, path, dirSize); } else {
dir[dirSize] = '\0'; if (fname) {
} strcpy(fname, path);
if (fname != NULL) {
size_t fileNameSize = extStart - fnameStart;
if (fileNameSize > COMPAT_MAX_FNAME - 1) {
fileNameSize = COMPAT_MAX_FNAME - 1;
} }
strncpy(fname, fnameStart, fileNameSize);
fname[fileNameSize] = '\0';
}
if (ext != NULL) {
size_t extSize = end - extStart;
if (extSize > COMPAT_MAX_EXT - 1) {
extSize = COMPAT_MAX_EXT - 1;
}
strncpy(ext, extStart, extSize);
ext[extSize] = '\0';
} }
#endif #endif
} }