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

Fix trailing slash removal code with root directory

Browse Source
This commit is contained in:
Maxime Coste 2019-05-29 20:14:42 +10:00
parent 8ae490752f
commit 7de3ea786f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/file.cc
View File

@ -86,7 +86,7 @@ String real_path(StringView filename)
return res; return res;
StringView dir = res; StringView dir = res;
while (dir.substr(dir.length()-1_byte, 1_byte) == "/") while (not dir.empty() and dir.back() == '/')
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);
} }
@ -116,7 +116,7 @@ String compact_path(StringView filename)
return real_filename.substr(real_cwd.length()).str(); return real_filename.substr(real_cwd.length()).str();
StringView home = homedir(); StringView home = homedir();
while (home.substr(home.length()-1_byte, 1_byte) == "/") while (not home.empty() and home.back() == '/')
home = home.substr(0_byte, home.length()-1_byte); home = home.substr(0_byte, home.length()-1_byte);
if (not home.empty()) if (not home.empty())