xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip all trailing slashes in real_path and compact_path

Browse Source
This commit is contained in:
Robert Melton 2019-05-19 19:52:05 -04:00
parent 6a65415a19
commit a43313c6ce
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/file.cc
View File

@ -86,7 +86,7 @@ String real_path(StringView filename)
return res; return res;
StringView dir = res; StringView dir = res;
if (dir.substr(dir.length()-1_byte, 1_byte) == "/") while (dir.substr(dir.length()-1_byte, 1_byte) == "/")
dir = dir.substr(0_byte, dir.length()-1_byte); dir = dir.substr(0_byte, dir.length()-1_byte);
return format("{}/{}", dir, non_existing); return format("{}/{}", dir, non_existing);
} }
@ -115,7 +115,10 @@ String compact_path(StringView filename)
if (prefix_match(real_filename, real_cwd)) if (prefix_match(real_filename, real_cwd))
return real_filename.substr(real_cwd.length()).str(); return real_filename.substr(real_cwd.length()).str();
const StringView home = homedir(); StringView home = homedir();
while (home.substr(home.length()-1_byte, 1_byte) == "/")
home = home.substr(0_byte, home.length()-1_byte);
if (not home.empty()) if (not home.empty())
{ {
ByteCount home_len = home.length(); ByteCount home_len = home.length();