github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 14:29:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cd .. to the root directory

Browse Source 
The leading slash always needs to be present, even if there aren't any other
components. This was introduced by the Rust port.
This commit is contained in:
Xiretza 2024-07-28 16:40:14 +00:00 committed by Peter Ammon
parent 3d816174fd
commit fd006e02da
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wutil/mod.rs
View File

@ -331,8 +331,12 @@ pub fn path_normalize_for_cd(wd: &wstr, path: &wstr) -> WString {
paths.extend(path_comps);
let mut result =
WString::with_capacity(paths.iter().fold(0, |sum, s| sum + s.len()) + paths.len() + 1);
for p in &paths {
result.push(SEP);
result.push(SEP);
// TODO: intersperse() https://github.com/rust-lang/rust/issues/79524
for (i, p) in paths.iter().enumerate() {
if i != 0 {
result.push(SEP);
}
result.push_utfstr(*p);
}
result
@ -402,6 +406,14 @@ mod path_cd_tests {
assert_eq!(path_normalize_for_cd(wd, path), L!("/.."));
}
#[test]
fn up_to_root_directory() {
let wd = L!("/foo/");
let path = L!("..");
eprintln!("({}, {})", wd, path);
assert_eq!(path_normalize_for_cd(wd, path), L!("/"));
}
#[test]
fn empty_path() {
let wd = L!("/home/user/");

6
tests/checks/cd.fish
View File

@ -194,6 +194,12 @@ cd $old_path
cd file
cd $old_path
# Test that going up to the root directory using .. works
cd /(string split --no-empty -f 1 / (pwd))
cd ..
pwd
#CHECK: /
# cd back before removing the test directory again.
cd $oldpwd
rm -Rf $base