summaryrefslogtreecommitdiffstats
path: root/src/skel/crossplatform.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-10-12 19:30:49 +0200
committereray orçunus <erayorcunus@gmail.com>2020-10-12 19:30:49 +0200
commitbe6b97b5d8fe253b6cca1c26214bfdc7d55bf42c (patch)
tree700af3c2cc9f6d1a9f7852a00ffa8b19ab5f2e8e /src/skel/crossplatform.cpp
parentMerge pull request #753 from majesticCoding/miami (diff)
downloadre3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.tar
re3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.tar.gz
re3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.tar.bz2
re3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.tar.lz
re3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.tar.xz
re3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.tar.zst
re3-be6b97b5d8fe253b6cca1c26214bfdc7d55bf42c.zip
Diffstat (limited to '')
-rw-r--r--src/skel/crossplatform.cpp25
1 files changed, 20 insertions, 5 deletions
diff --git a/src/skel/crossplatform.cpp b/src/skel/crossplatform.cpp
index 452ad9fa..ac4bbe85 100644
--- a/src/skel/crossplatform.cpp
+++ b/src/skel/crossplatform.cpp
@@ -27,13 +27,28 @@ void GetLocalTime_CP(SYSTEMTIME *out) {
#ifndef _WIN32
HANDLE FindFirstFile(const char* pathname, WIN32_FIND_DATA* firstfile) {
char newpathname[32];
+
strncpy(newpathname, pathname, 32);
- char* path = strtok(newpathname, "\\*");
+ char* path = strtok(newpathname, "*");
+
+ // Case-sensitivity and backslashes...
+ char *real = casepath(path);
+ if (real) {
+ real[strlen(real)] = '*';
+ char *extension = strtok(NULL, "*");
+ if (extension)
+ strcat(real, extension);
+
+ strncpy(newpathname, real, 32);
+ free(real);
+ path = strtok(newpathname, "*");
+ }
+
strncpy(firstfile->folder, path, sizeof(firstfile->folder));
// Both w/ extension and w/o extension is ok
- if (strlen(path) + 2 != strlen(pathname))
- strncpy(firstfile->extension, strtok(NULL, "\\*"), sizeof(firstfile->extension));
+ if (strlen(path) + 1 != strlen(pathname))
+ strncpy(firstfile->extension, strtok(NULL, "*"), sizeof(firstfile->extension));
else
strncpy(firstfile->extension, "", sizeof(firstfile->extension));
@@ -52,8 +67,8 @@ bool FindNextFile(HANDLE d, WIN32_FIND_DATA* finddata) {
while ((file = readdir((DIR*)d)) != NULL) {
// We only want "DT_REG"ular Files, but reportedly some FS and OSes gives DT_UNKNOWN as type.
- if ((file->d_type == DT_UNKNOWN || file->d_type == DT_REG) &&
- (extensionLen == 0 || strncmp(&file->d_name[strlen(file->d_name) - extensionLen], finddata->extension, extensionLen) == 0)) {
+ if ((file->d_type == DT_UNKNOWN || file->d_type == DT_REG || file->d_type == DT_LNK) &&
+ (extensionLen == 0 || strncasecmp(&file->d_name[strlen(file->d_name) - extensionLen], finddata->extension, extensionLen) == 0)) {
sprintf(relativepath, "%s/%s", finddata->folder, file->d_name);
realpath(relativepath, path);