From c8af6f066f6aa15e5557e478417edb125cad0809 Mon Sep 17 00:00:00 2001 From: Madhav Kanbur Date: Fri, 22 Jan 2021 11:47:21 +0530 Subject: [PATCH] Util_ROM/Reset() : Use strrchr() Signed-off-by: Madhav Kanbur --- src/frontend/Util_ROM.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/frontend/Util_ROM.cpp b/src/frontend/Util_ROM.cpp index 3af99fe8..4e53b9c3 100644 --- a/src/frontend/Util_ROM.cpp +++ b/src/frontend/Util_ROM.cpp @@ -536,11 +536,11 @@ int Reset() char romfilename[1024] = {0}, sramfilename[1024]; strncpy(sramfilename, SRAMPath[ROMSlot_NDS], 1024); // Use existing SRAMPath - int pos = strlen(sramfilename) - 1; - while(pos > 0 && sramfilename[pos] != '/' && sramfilename[pos] != '\\') - --pos; + char *pos = strrchr(sramfilename, '/'); + if(!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 printf("RESET loading from archive : %s\n", romfilename); romlen = Archive::ExtractFileFromArchive(ROMPath[ROMSlot_NDS], romfilename, &romdata); @@ -572,11 +572,11 @@ int Reset() char romfilename[1024] = {0}, sramfilename[1024]; strncpy(sramfilename, SRAMPath[ROMSlot_GBA], 1024); // Use existing SRAMPath - int pos = strlen(sramfilename) - 1; - while(pos > 0 && sramfilename[pos] != '/' && sramfilename[pos] != '\\') - --pos; + char *pos = strrchr(sramfilename, '/'); + if(!pos) + pos = strrchr(sramfilename, '\\'); - strncpy(romfilename, &sramfilename[pos + 1], 1024); + strncpy(romfilename, pos + 1, 1024); strncpy(&romfilename[strlen(romfilename) - 3], "gba", 3); printf("RESET loading from archive : %s\n", romfilename); romlen = Archive::ExtractFileFromArchive(ROMPath[ROMSlot_GBA], romfilename, &romdata);