Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 16:50:57 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Deeper C++-ification

Browse Source
This commit is contained in:
Nathan Woods 2016-07-11 08:27:03 -04:00
parent 130e05cc4e
commit 2bd5932b42
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/util/corefile.cpp
View File

@ -1272,17 +1272,21 @@ core_file::core_file()
std::string core_filename_extract_base(const std::string &name, bool strip_extension)
{
/* find the start of the name */
const char *start = name.c_str() + name.length();
while (start > name.c_str() && !util::is_directory_separator(start[-1]))
// find the start of the basename
auto start = name.end();
while (start != name.begin() && !util::is_directory_separator(start[-1]))
start--;
/* copy the rest into an astring */
std::string result(start);
// find the end of the basename
auto chop_position = strip_extension
? name.find_last_of('.')
: std::string::npos;
auto end = chop_position != std::string::npos
? name.begin() + chop_position
: name.end();
/* chop the extension if present */
if (strip_extension)
result = result.substr(0, result.find_last_of('.'));
// copy the result into an string
std::string result(start, end);
return result;
}