archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-16 07:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #663 from erorcun/master

Browse Source 
Fix casepath chaos
This commit is contained in:
erorcun
2020-07-28 17:41:49 +03:00
committed by GitHub
parent 2e8048d0fe eb8844fd11
commit e47eaa1425
6 changed files with 134 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/CdStreamPosix.cpp
View File

@ -189,10 +189,11 @@ GetGTA3ImgSize(void)
realpath(gImgNames[0], path);
if (stat(path, &statbuf) == -1) {
// Try case-insensitivity
char *r = (char*)alloca(strlen(gImgNames[0]) + 4);
if (casepath(gImgNames[0], r))
char* real = casepath(gImgNames[0], false);
if (real)
{
realpath(r, path);
realpath(real, path);
free(real);
if (stat(path, &statbuf) != -1)
goto ok;
}
@ -210,7 +211,6 @@ CdStreamShutdown(void)
{
// Destroying semaphores and free(gpReadInfo) will be done at threads
#ifndef ONE_THREAD_PER_CHANNEL
free(gChannelRequestQ.items);
gCdStreamThreadStatus = 2;
sem_post(&gCdStreamSema);
#endif
@ -442,6 +442,7 @@ void *CdStreamThread(void *param)
sem_destroy(&gpReadInfo[i].pDoneSemaphore);
}
sem_destroy(&gCdStreamSema);
free(gChannelRequestQ.items);
#else
sem_destroy(&gpReadInfo[channel].pStartSemaphore);
sem_destroy(&gpReadInfo[channel].pDoneSemaphore);
@ -460,10 +461,11 @@ CdStreamAddImage(char const *path)
// Fix case sensitivity and backslashes.
if (gImgFiles[gNumImages] == -1) {
char *r = (char*)alloca(strlen(path) + 4);
if (casepath(path, r))
char* real = casepath(path, false);
if (real)
{
gImgFiles[gNumImages] = open(r, _gdwCdStreamFlags);
gImgFiles[gNumImages] = open(real, _gdwCdStreamFlags);
free(real);
}
}

37
src/core/FileMgr.cpp
View File

@ -4,6 +4,7 @@
#include <direct.h>
#endif
#include "common.h"
#include "crossplatform.h"
#include "FileMgr.h"
@ -31,19 +32,16 @@ static myFILE myfiles[NUMFILES];
#include <dirent.h>
#include <errno.h>
#include <unistd.h>
#include "crossplatform.h"
#define _getcwd getcwd
// Case-insensitivity on linux (from https://github.com/OneSadCookie/fcaseopen)
void mychdir(char const *path)
{
char *r = (char*)alloca(strlen(path) + 4);
if (casepath(path, r))
{
char* r = casepath(path, false);
if (r) {
chdir(r);
}
else
{
free(r);
} else {
errno = ENOENT;
}
}
@ -73,30 +71,7 @@ found:
*p++ = 'b';
*p = '\0';
#if !defined(_WIN32)
char *newPath = strdup(filename);
// Normally casepath() fixes backslashes, but if the mode is sth other than r/rb it will create new file with backslashes on linux, so fix backslashes here
char *nextBs;
while(nextBs = strstr(newPath, "\\")){
*nextBs = '/';
}
#else
const char *newPath = filename;
#endif
myfiles[fd].file = fopen(newPath, realmode);
// Be case-insensitive on linux (from https://github.com/OneSadCookie/fcaseopen/)
#if !defined(_WIN32)
if (!myfiles[fd].file) {
char *r = (char*)alloca(strlen(newPath) + 4);
if (casepath(newPath, r))
{
myfiles[fd].file = fopen(r, realmode);
}
}
free(newPath);
#endif
myfiles[fd].file = fcaseopen(filename, realmode);
if(myfiles[fd].file == nil)
return 0;
return fd;