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

Third time is a charm :-)

Browse Source
This commit is contained in:
Nathan Woods 2016-07-29 22:14:51 -04:00
parent 22c402885d
commit 8db5491763
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/util/zippath.cpp
View File

@ -114,22 +114,22 @@ int is_path_separator(char c)
static void parse_parent_path(const std::string &path, std::string::size_type *beginpos, std::string::size_type *endpos) static void parse_parent_path(const std::string &path, std::string::size_type *beginpos, std::string::size_type *endpos)
{ {
std::string::size_type length = path.length(); std::string::size_type length = path.length();
int pos; std::string::size_type pos;
/* skip over trailing path separators */ // skip over trailing path separators
pos = length - 1; pos = length - 1;
while((pos > 0) && is_path_separator(path[pos])) while ((pos > 0) && is_path_separator(path[pos]))
pos--; pos--;
/* return endpos */ // return endpos
if (endpos != nullptr) if (endpos != nullptr)
*endpos = pos; *endpos = pos;
/* now skip until we find a path separator */ // now skip until we find a path separator
while((pos >= 0) && !is_path_separator(path[pos])) while ((pos != std::string::npos) && !is_path_separator(path[pos]))
pos--; pos = (pos > 0) ? pos - 1 : std::string::npos;
/* return beginpos */ // return beginpos
if (beginpos != nullptr) if (beginpos != nullptr)
*beginpos = pos; *beginpos = pos;
} }
@ -145,7 +145,7 @@ std::string &zippath_parent(std::string &dst, const std::string &path)
std::string::size_type pos; std::string::size_type pos;
parse_parent_path(path, &pos, nullptr); parse_parent_path(path, &pos, nullptr);
if (pos >= 0) if (pos != std::string::npos)
dst = path.substr(0, pos + 1); dst = path.substr(0, pos + 1);
else else
dst.clear(); dst.clear();