aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

baseNameOf: Enhance basename compatibility

Browse source 
* If the path ends with a slash, drop it.
* If the remaining path doesn’t contain slashes, just return it.

Fixes #574.
This commit is contained in:
Kirill Elagin 2015-07-13 15:25:13 +03:00 committed by Eelco Dolstra
parent 896428c818
commit 3b0f60e5c2
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libutil/util.cc
View file

@ -149,10 +149,19 @@ Path dirOf(const Path & path)
string baseNameOf(const Path & path) string baseNameOf(const Path & path)
{ {
Path::size_type pos = path.rfind('/'); if (path.empty())
return string("");
Path::size_type last = path.length() - 1;
if (path[last] == '/' && last > 0)
last -= 1;
Path::size_type pos = path.rfind('/', last);
if (pos == string::npos) if (pos == string::npos)
throw Error(format("invalid file name ‘%1%’") % path); pos = 0;
return string(path, pos + 1); else
pos += 1;
return string(path, pos, last - pos + 1);
} }