diff options
author | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-10-21 02:11:10 +0200 |
---|---|---|
committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-10-21 02:11:10 +0200 |
commit | af53267b74c4e831787761ae12472a98ada110b0 (patch) | |
tree | 71ced4b0c449b8e75e4a86c10b8d1c89ca5a2878 /src/skel/crossplatform.cpp | |
parent | Tweak comparison in CFallingGlassPane::Render (diff) | |
download | re3-af53267b74c4e831787761ae12472a98ada110b0.tar re3-af53267b74c4e831787761ae12472a98ada110b0.tar.gz re3-af53267b74c4e831787761ae12472a98ada110b0.tar.bz2 re3-af53267b74c4e831787761ae12472a98ada110b0.tar.lz re3-af53267b74c4e831787761ae12472a98ada110b0.tar.xz re3-af53267b74c4e831787761ae12472a98ada110b0.tar.zst re3-af53267b74c4e831787761ae12472a98ada110b0.zip |
Diffstat (limited to 'src/skel/crossplatform.cpp')
-rw-r--r-- | src/skel/crossplatform.cpp | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/src/skel/crossplatform.cpp b/src/skel/crossplatform.cpp index ac4bbe85..626403f8 100644 --- a/src/skel/crossplatform.cpp +++ b/src/skel/crossplatform.cpp @@ -26,34 +26,39 @@ void GetLocalTime_CP(SYSTEMTIME *out) { // Compatible with Linux/POSIX and MinGW on Windows #ifndef _WIN32 HANDLE FindFirstFile(const char* pathname, WIN32_FIND_DATA* firstfile) { - char newpathname[32]; + char pathCopy[32]; - strncpy(newpathname, pathname, 32); - char* path = strtok(newpathname, "*"); + strncpy(pathCopy, pathname, 32); + char* folder = strtok(pathCopy, "*"); // Case-sensitivity and backslashes... - char *real = casepath(path); - if (real) { - real[strlen(real)] = '*'; - char *extension = strtok(NULL, "*"); - if (extension) - strcat(real, extension); + char *realFolder = casepath(folder); + char *extension = nil; + if (realFolder) { + realFolder[strlen(realFolder)] = '*'; + extension = strtok(NULL, "*"); + if (extension) { + strcat(realFolder, extension); + } - strncpy(newpathname, real, 32); - free(real); - path = strtok(newpathname, "*"); + strncpy(pathCopy, realFolder, 32); + free(realFolder); + folder = strtok(pathCopy, "*"); + } else { + // Wildcard (*) + if (strlen(folder) + 1 != strlen(pathname)) + extension = strtok(NULL, "*"); } - strncpy(firstfile->folder, path, sizeof(firstfile->folder)); + strncpy(firstfile->folder, folder, sizeof(firstfile->folder)); - // Both w/ extension and w/o extension is ok - if (strlen(path) + 1 != strlen(pathname)) - strncpy(firstfile->extension, strtok(NULL, "*"), sizeof(firstfile->extension)); + if (extension) + strncpy(firstfile->extension, extension, sizeof(firstfile->extension)); else - strncpy(firstfile->extension, "", sizeof(firstfile->extension)); + firstfile->extension[0] = '\0'; HANDLE d; - if ((d = (HANDLE)opendir(path)) == NULL || !FindNextFile(d, firstfile)) + if ((d = (HANDLE)opendir(folder)) == NULL || !FindNextFile(d, firstfile)) return NULL; return d; |