Merge pull request #11882 from fjtrujy/ps2FolderIssue

[PS2] Fixed Folder creation issues
This commit is contained in:
Autechre 2021-01-15 14:35:04 +01:00 committed by GitHub
commit 85af4d14d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -21,7 +21,7 @@ else
endif
ifeq ($(MUTE_WARNINGS), 1)
DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses -Wdiscarded-qualifiers
endif
INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include

View File

@ -47,7 +47,7 @@ static void create_path_names(void)
/* TODO/FIXME - third parameter here needs to be size of
* rootDevicePath(bootDeviceID) */
strlcpy(user_path, rootDevicePath(bootDeviceID), rootDevicePath(bootDeviceID));
strlcpy(user_path, rootDevicePath(bootDeviceID), sizeof(user_path));
strlcat(user_path, "RETROARCH", sizeof(user_path));
/* Content in the same folder */
@ -192,7 +192,7 @@ static void frontend_ps2_init(void *data)
#if defined(BUILD_FOR_PCSX2)
bootDeviceID = BOOT_DEVICE_MC0;
strlcpy(cwd, rootDevicePath(bootDeviceID), sizeof(rootDevicePath(bootDeviceID)));
strlcpy(cwd, rootDevicePath(bootDeviceID), sizeof(cwd));
#else
getcwd(cwd, sizeof(cwd));
bootDeviceID = getBootDeviceID(cwd);

View File

@ -164,7 +164,7 @@ bool waitUntilDeviceIsReady(enum BootDeviceIDs device_id)
{
struct stat buffer;
int ret = -1;
int retries = 10;
int retries = 100;
char *rootDevice = rootDevicePath(device_id);
while(ret != 0 && retries > 0)