piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Util_ROM/Reset() : Use strrchr()

Browse Source 
Signed-off-by: Madhav Kanbur <abcdjdj@gmail.com>
This commit is contained in:
Madhav Kanbur
2021-01-22 11:47:21 +05:30
parent 0258677af2
commit c8af6f066f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/Util_ROM.cpp
View File

@ -536,11 +536,11 @@ int Reset()
char romfilename[1024] = {0}, sramfilename[1024]; char romfilename[1024] = {0}, sramfilename[1024];
strncpy(sramfilename, SRAMPath[ROMSlot_NDS], 1024); // Use existing SRAMPath strncpy(sramfilename, SRAMPath[ROMSlot_NDS], 1024); // Use existing SRAMPath
int pos = strlen(sramfilename) - 1; char *pos = strrchr(sramfilename, '/');
while(pos > 0 && sramfilename[pos] != '/' && sramfilename[pos] != '\\') if(!pos)
--pos; pos = strrchr(sramfilename, '\\');
strncpy(romfilename, &sramfilename[pos + 1], 1024); strncpy(romfilename, pos + 1, 1024);
strncpy(&romfilename[strlen(romfilename) - 3], NDSROMExtension, 3); // extension could be nds, srl or dsi strncpy(&romfilename[strlen(romfilename) - 3], NDSROMExtension, 3); // extension could be nds, srl or dsi
printf("RESET loading from archive : %s\n", romfilename); printf("RESET loading from archive : %s\n", romfilename);
romlen = Archive::ExtractFileFromArchive(ROMPath[ROMSlot_NDS], romfilename, &romdata); romlen = Archive::ExtractFileFromArchive(ROMPath[ROMSlot_NDS], romfilename, &romdata);
@ -572,11 +572,11 @@ int Reset()
char romfilename[1024] = {0}, sramfilename[1024]; char romfilename[1024] = {0}, sramfilename[1024];
strncpy(sramfilename, SRAMPath[ROMSlot_GBA], 1024); // Use existing SRAMPath strncpy(sramfilename, SRAMPath[ROMSlot_GBA], 1024); // Use existing SRAMPath
int pos = strlen(sramfilename) - 1; char *pos = strrchr(sramfilename, '/');
while(pos > 0 && sramfilename[pos] != '/' && sramfilename[pos] != '\\') if(!pos)
--pos; pos = strrchr(sramfilename, '\\');
strncpy(romfilename, &sramfilename[pos + 1], 1024); strncpy(romfilename, pos + 1, 1024);
strncpy(&romfilename[strlen(romfilename) - 3], "gba", 3); strncpy(&romfilename[strlen(romfilename) - 3], "gba", 3);
printf("RESET loading from archive : %s\n", romfilename); printf("RESET loading from archive : %s\n", romfilename);
romlen = Archive::ExtractFileFromArchive(ROMPath[ROMSlot_GBA], romfilename, &romdata); romlen = Archive::ExtractFileFromArchive(ROMPath[ROMSlot_GBA], romfilename, &romdata);