ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use strlcpy and strlcat in the Mac port

This commit is contained in:
Michael Buckley 2020-09-07 11:23:05 -07:00
parent 8d2bc33023
commit a893ad05e3
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
macosx/mac-file.mm
View File

@ -231,38 +231,38 @@ const char * S9xGetFilename (const char *inExt, enum s9x_getdirtype dirtype)
{ {
case '.srm': case '.srm':
case '.rtc': case '.rtc':
strcpy(folderName, "SRAMs"); strlcpy(folderName, "SRAMs", sizeof(folderName));
break; break;
case '.frz': case '.frz':
strcpy(folderName, "Freezes"); strlcpy(folderName, "Freezes", sizeof(folderName));
break; break;
case '.spc': case '.spc':
strcpy(folderName, "SPCs"); strlcpy(folderName, "SPCs", sizeof(folderName));
break; break;
case '.cht': case '.cht':
strcpy(folderName, "Cheats"); strlcpy(folderName, "Cheats", sizeof(folderName));
break; break;
case '.ups': case '.ups':
case '.ips': case '.ips':
strcpy(folderName, "Patches"); strlcpy(folderName, "Patches", sizeof(folderName));
break; break;
case '.png': case '.png':
strcpy(folderName, "Screenshots"); strlcpy(folderName, "Screenshots", sizeof(folderName));
break; break;
case '.dat': case '.dat':
case '.out': case '.out':
case '.log': case '.log':
strcpy(folderName, "Logs"); strlcpy(folderName, "Logs", sizeof(folderName));
break; break;
case '.bio': // dummy case '.bio': // dummy
strcpy(folderName, "BIOSes"); strlcpy(folderName, "BIOSes", sizeof(folderName));
break; break;
} }
@ -296,7 +296,7 @@ const char * S9xGetFilename (const char *inExt, enum s9x_getdirtype dirtype)
{ {
_splitpath(Memory.ROMFilename, drive, dir, fname, ext); _splitpath(Memory.ROMFilename, drive, dir, fname, ext);
strcat(fname, inExt); strlcat(fname, inExt, sizeof(fname));
_makepath(filePath[index], drive, dir, fname, ""); _makepath(filePath[index], drive, dir, fname, "");
} }
} }
@ -304,7 +304,7 @@ const char * S9xGetFilename (const char *inExt, enum s9x_getdirtype dirtype)
{ {
_splitpath(Memory.ROMFilename, drive, dir, fname, ext); _splitpath(Memory.ROMFilename, drive, dir, fname, ext);
strcat(fname, inExt); strlcat(fname, inExt, sizeof(fname));
_makepath(filePath[index], drive, dir, fname, ""); _makepath(filePath[index], drive, dir, fname, "");
} }
@ -394,7 +394,7 @@ const char * S9xBasename (const char *in)
{ {
static char s[PATH_MAX + 1]; static char s[PATH_MAX + 1];
strncpy(s, in, PATH_MAX + 1); strlcpy(s, in, sizeof(s));
s[PATH_MAX] = 0; s[PATH_MAX] = 0;
size_t l = strlen(s); size_t l = strlen(s);
@ -422,14 +422,14 @@ const char * S9xGetDirectory (enum s9x_getdirtype dirtype)
switch (dirtype) switch (dirtype)
{ {
case SNAPSHOT_DIR: strcpy(inExt, ".frz"); break; case SNAPSHOT_DIR: strlcpy(inExt, ".frz", sizeof(inExt)); break;
case SRAM_DIR: strcpy(inExt, ".srm"); break; case SRAM_DIR: strlcpy(inExt, ".srm", sizeof(inExt)); break;
case SCREENSHOT_DIR: strcpy(inExt, ".png"); break; case SCREENSHOT_DIR: strlcpy(inExt, ".png", sizeof(inExt)); break;
case SPC_DIR: strcpy(inExt, ".spc"); break; case SPC_DIR: strlcpy(inExt, ".spc", sizeof(inExt)); break;
case CHEAT_DIR: strcpy(inExt, ".cht"); break; case CHEAT_DIR: strlcpy(inExt, ".cht", sizeof(inExt)); break;
case BIOS_DIR: strcpy(inExt, ".bio"); break; case BIOS_DIR: strlcpy(inExt, ".bio", sizeof(inExt)); break;
case LOG_DIR: strcpy(inExt, ".log"); break; case LOG_DIR: strlcpy(inExt, ".log", sizeof(inExt)); break;
default: strcpy(inExt, ".xxx"); break; default: strlcpy(inExt, ".xxx", sizeof(inExt)); break;
} }
_splitpath(S9xGetFilename(inExt, dirtype), drive, dir, fname, ext); _splitpath(S9xGetFilename(inExt, dirtype), drive, dir, fname, ext);

12
macosx/mac-musicbox.mm
View File

@ -414,20 +414,20 @@ static void SPCPlayExec (void)
static void MusicBoxForceFreeze (void) static void MusicBoxForceFreeze (void)
{ {
char filename[PATH_MAX + 1]; char filename[PATH_MAX + 1];
strcpy(filename, S9xGetFreezeFilename(999)); strlcpy(filename, S9xGetFreezeFilename(999), sizeof(filename));
strcat(filename, ".tmp"); strlcat(filename, ".tmp", sizeof(filename));
S9xFreezeGame(filename); S9xFreezeGame(filename);
} }
static void MusicBoxForceDefrost (void) static void MusicBoxForceDefrost (void)
{ {
char filename[PATH_MAX + 1]; char filename[PATH_MAX + 1];
strcpy(filename, S9xGetFreezeFilename(999)); strlcpy(filename, S9xGetFreezeFilename(999), sizeof(filename));
strcat(filename, ".tmp"); strlcat(filename, ".tmp", sizeof(filename));
S9xUnfreezeGame(filename); S9xUnfreezeGame(filename);
remove(filename); remove(filename);