h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-05 08:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

path_make_canonical mishandles empty string.

Browse Source 
Fixes https://github.com/ridiculousfish/fishfish/issues/26
This commit is contained in:
ridiculousfish
2012-06-04 12:00:59 -07:00
parent 457e6a5f46
commit cc90f9cf80
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fish_tests.cpp
View File

@@ -576,7 +576,14 @@ static void test_path()
if( canon != L"/foo/bar" )
{
err( L"Bug in canonical PATH code" );
}
}
path = L"/";
path_make_canonical(path);
if (path != L"/")
{
err( L"Bug in canonical PATH code" );
}
}
/** Test is_potential_path */

4
path.cpp
View File

@@ -525,8 +525,8 @@ void path_make_canonical( wcstring &path )
replace_all(path, L"//", L"/");
} while (path.size() != size);
/* Remove trailing slashes */
while (size--) {
/* Remove trailing slashes, except don't remove the first one */
while (size-- > 1) {
if (path.at(size) != L'/')
break;
}