thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch all PATH_MAX to SYS_MAX_PATH

Browse source
This commit is contained in:
MysterD 2022-02-25 18:33:31 -08:00
parent 33ced38baa
commit 2d70b9bb87
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/pc/mod_list.c
View file

@ -13,7 +13,7 @@ struct ModTable gModTableRemote = { .entries = NULL, .entryCount = 0, .totalSize
struct ModTable* gModTableCurrent = &gModTableLocal; struct ModTable* gModTableCurrent = &gModTableLocal;
static char sTmpSession[MAX_SESSION_CHARS] = { 0 }; static char sTmpSession[MAX_SESSION_CHARS] = { 0 };
static char sTmpPath[PATH_MAX] = { 0 }; static char sTmpPath[SYS_MAX_PATH] = { 0 };
static bool acceptable_file(char* string) { static bool acceptable_file(char* string) {
if (strchr(string, '/') != NULL) { return false; } if (strchr(string, '/') != NULL) { return false; }
@ -27,9 +27,9 @@ static void mod_list_delete_tmp(void) {
DIR* d = opendir(sTmpPath); DIR* d = opendir(sTmpPath);
if (!d) { closedir(d); return; } if (!d) { closedir(d); return; }
static char path[PATH_MAX] = { 0 }; static char path[SYS_MAX_PATH] = { 0 };
while ((dir = readdir(d)) != NULL) { while ((dir = readdir(d)) != NULL) {
snprintf(path, PATH_MAX - 1, "%s/%s", sTmpPath, dir->d_name); snprintf(path, SYS_MAX_PATH - 1, "%s/%s", sTmpPath, dir->d_name);
if (!fs_sys_file_exists(path)) { continue; } if (!fs_sys_file_exists(path)) { continue; }
#if defined(_WIN32) #if defined(_WIN32)
@ -70,7 +70,7 @@ void mod_list_add_tmp(u16 index, u16 remoteIndex, char* name, size_t size) {
entry->size = size; entry->size = size;
table->totalSize += size; table->totalSize += size;
char sanitizedName[PATH_MAX] = { 0 }; char sanitizedName[SYS_MAX_PATH] = { 0 };
char* n = name; char* n = name;
char* s = sanitizedName; char* s = sanitizedName;
while (*n != '\0') { while (*n != '\0') {
@ -81,7 +81,7 @@ void mod_list_add_tmp(u16 index, u16 remoteIndex, char* name, size_t size) {
n++; n++;
} }
snprintf(entry->path, PATH_MAX - 1, "%s/%s-%u-%s", sTmpPath, sTmpSession, index, sanitizedName); snprintf(entry->path, SYS_MAX_PATH - 1, "%s/%s-%u-%s", sTmpPath, sTmpSession, index, sanitizedName);
entry->fp = fopen(entry->path, "wb"); entry->fp = fopen(entry->path, "wb");
entry->remoteIndex = remoteIndex; entry->remoteIndex = remoteIndex;
@ -143,7 +143,7 @@ static void mod_list_add_local(u16 index, const char* path, char* name) {
struct ModListEntry* entry = &table->entries[index]; struct ModListEntry* entry = &table->entries[index];
entry->name = strdup(name); entry->name = strdup(name);
snprintf(entry->path, PATH_MAX - 1, "%s/%s", path, name); snprintf(entry->path, SYS_MAX_PATH - 1, "%s/%s", path, name);
entry->fp = fopen(entry->path, "rb"); entry->fp = fopen(entry->path, "rb");
mod_list_extract_lua_fields(entry); mod_list_extract_lua_fields(entry);
@ -299,11 +299,11 @@ void mod_list_init(void) {
gModTableCurrent = &gModTableLocal; gModTableCurrent = &gModTableLocal;
srand(time(0)); srand(time(0));
snprintf(sTmpSession, MAX_SESSION_CHARS, "%06X", (u32)(rand() % 0xFFFFFF)); snprintf(sTmpSession, MAX_SESSION_CHARS, "%06X", (u32)(rand() % 0xFFFFFF));
snprintf(sTmpPath, PATH_MAX - 1, "%s", fs_get_write_path("tmp")); snprintf(sTmpPath, SYS_MAX_PATH - 1, "%s", fs_get_write_path("tmp"));
if (!fs_sys_dir_exists(sTmpPath)) { fs_sys_mkdir(sTmpPath); } if (!fs_sys_dir_exists(sTmpPath)) { fs_sys_mkdir(sTmpPath); }
char userModPath[PATH_MAX] = { 0 }; char userModPath[SYS_MAX_PATH] = { 0 };
snprintf(userModPath, PATH_MAX - 1, "%s", fs_get_write_path("mods")); snprintf(userModPath, SYS_MAX_PATH - 1, "%s", fs_get_write_path("mods"));
if (!fs_sys_dir_exists(userModPath)) { fs_sys_mkdir(userModPath); } if (!fs_sys_dir_exists(userModPath)) { fs_sys_mkdir(userModPath); }
mod_table_clear(&gModTableLocal); mod_table_clear(&gModTableLocal);

3
src/pc/mod_list.h
View file

@ -6,13 +6,14 @@
#include <types.h> #include <types.h>
#include <stdbool.h> #include <stdbool.h>
#include <limits.h> #include <limits.h>
#include "src/pc/platform.h"
#define MOD_PATH "./mods" #define MOD_PATH "./mods"
struct ModListEntry { struct ModListEntry {
char* name; char* name;
FILE* fp; FILE* fp;
char path[PATH_MAX]; char path[SYS_MAX_PATH];
size_t size; size_t size;
u64 curOffset; u64 curOffset;
u16 remoteIndex; u16 remoteIndex;

2
src/pc/platform.h
View file

@ -7,7 +7,7 @@
/* Platform-specific functions and whatnot */ /* Platform-specific functions and whatnot */
#define SYS_MAX_PATH 1024 // FIXME: define this on different platforms #define SYS_MAX_PATH 4096 // FIXME: define this on different platforms
// NULL terminated list of platform specific read-only data paths // NULL terminated list of platform specific read-only data paths
extern const char *sys_ropaths[]; extern const char *sys_ropaths[];