mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 06:30:08 +02:00
Fix trailing slash in PWD set by cd
(#12760)
# Description Fixes #12758. #12662 introduced a bug where calling `cd` with a path with a trailing slash would cause `PWD` to be set to a path including a trailing slash, which is not allowed. This adds a helper to `nu_path` to remove this, and uses it in the `cd` command to clean it up before setting `PWD`. # Tests + Formatting I added some tests to make sure we don't regress on this in the future. - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib`
This commit is contained in:
@ -24,15 +24,13 @@
|
||||
//! `Path::join()`. It works because `PathBuf::push("")` will add a trailing
|
||||
//! slash when the original path doesn't have one.
|
||||
|
||||
#[cfg(unix)]
|
||||
use std::os::unix::ffi::OsStrExt;
|
||||
#[cfg(windows)]
|
||||
use std::os::windows::ffi::OsStrExt;
|
||||
use std::{
|
||||
ffi::OsStr,
|
||||
path::{Component, Path},
|
||||
};
|
||||
|
||||
use crate::trailing_slash::has_trailing_slash;
|
||||
|
||||
/// Like `Path::components()`, but produces an extra empty component at the end
|
||||
/// when `path` contains a trailing slash.
|
||||
///
|
||||
@ -63,17 +61,6 @@ pub fn components(path: &Path) -> impl Iterator<Item = Component> {
|
||||
}))
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn has_trailing_slash(path: &Path) -> bool {
|
||||
let last = path.as_os_str().encode_wide().last();
|
||||
last == Some(b'\\' as u16) || last == Some(b'/' as u16)
|
||||
}
|
||||
#[cfg(unix)]
|
||||
fn has_trailing_slash(path: &Path) -> bool {
|
||||
let last = path.as_os_str().as_bytes().last();
|
||||
last == Some(&b'/')
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
//! We'll go through every variant of Component, with or without trailing
|
||||
|
@ -4,8 +4,10 @@ pub mod dots;
|
||||
pub mod expansions;
|
||||
mod helpers;
|
||||
mod tilde;
|
||||
mod trailing_slash;
|
||||
|
||||
pub use components::components;
|
||||
pub use expansions::{canonicalize_with, expand_path_with, expand_to_real_path, locate_in_dirs};
|
||||
pub use helpers::{config_dir, config_dir_old, home_dir};
|
||||
pub use tilde::expand_tilde;
|
||||
pub use trailing_slash::{has_trailing_slash, strip_trailing_slash};
|
||||
|
108
crates/nu-path/src/trailing_slash.rs
Normal file
108
crates/nu-path/src/trailing_slash.rs
Normal file
@ -0,0 +1,108 @@
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
||||
/// Strip any trailing slashes from a non-root path. This is required in some contexts, for example
|
||||
/// for the `PWD` environment variable.
|
||||
pub fn strip_trailing_slash(path: &Path) -> Cow<Path> {
|
||||
if has_trailing_slash(path) {
|
||||
// If there are, the safest thing to do is have Rust parse the path for us and build it
|
||||
// again. This will correctly handle a root directory, but it won't add the trailing slash.
|
||||
let mut out = PathBuf::with_capacity(path.as_os_str().len());
|
||||
out.extend(path.components());
|
||||
Cow::Owned(out)
|
||||
} else {
|
||||
// The path is safe and doesn't contain any trailing slashes.
|
||||
Cow::Borrowed(path)
|
||||
}
|
||||
}
|
||||
|
||||
/// `true` if the path has a trailing slash, including if it's the root directory.
|
||||
#[cfg(windows)]
|
||||
pub fn has_trailing_slash(path: &Path) -> bool {
|
||||
use std::os::windows::ffi::OsStrExt;
|
||||
|
||||
let last = path.as_os_str().encode_wide().last();
|
||||
last == Some(b'\\' as u16) || last == Some(b'/' as u16)
|
||||
}
|
||||
|
||||
/// `true` if the path has a trailing slash, including if it's the root directory.
|
||||
#[cfg(unix)]
|
||||
pub fn has_trailing_slash(path: &Path) -> bool {
|
||||
use std::os::unix::ffi::OsStrExt;
|
||||
|
||||
let last = path.as_os_str().as_bytes().last();
|
||||
last == Some(&b'/')
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[cfg_attr(not(unix), ignore = "only for Unix")]
|
||||
#[test]
|
||||
fn strip_root_unix() {
|
||||
assert_eq!(Path::new("/"), strip_trailing_slash(Path::new("/")));
|
||||
}
|
||||
|
||||
#[cfg_attr(not(unix), ignore = "only for Unix")]
|
||||
#[test]
|
||||
fn strip_non_trailing_unix() {
|
||||
assert_eq!(
|
||||
Path::new("/foo/bar"),
|
||||
strip_trailing_slash(Path::new("/foo/bar"))
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg_attr(not(unix), ignore = "only for Unix")]
|
||||
#[test]
|
||||
fn strip_trailing_unix() {
|
||||
assert_eq!(
|
||||
Path::new("/foo/bar"),
|
||||
strip_trailing_slash(Path::new("/foo/bar/"))
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg_attr(not(windows), ignore = "only for Windows")]
|
||||
#[test]
|
||||
fn strip_root_windows() {
|
||||
assert_eq!(Path::new(r"C:\"), strip_trailing_slash(Path::new(r"C:\")));
|
||||
}
|
||||
|
||||
#[cfg_attr(not(windows), ignore = "only for Windows")]
|
||||
#[test]
|
||||
fn strip_non_trailing_windows() {
|
||||
assert_eq!(
|
||||
Path::new(r"C:\foo\bar"),
|
||||
strip_trailing_slash(Path::new(r"C:\foo\bar"))
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg_attr(not(windows), ignore = "only for Windows")]
|
||||
#[test]
|
||||
fn strip_non_trailing_windows_unc() {
|
||||
assert_eq!(
|
||||
Path::new(r"\\foo\bar"),
|
||||
strip_trailing_slash(Path::new(r"\\foo\bar"))
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg_attr(not(windows), ignore = "only for Windows")]
|
||||
#[test]
|
||||
fn strip_trailing_windows() {
|
||||
assert_eq!(
|
||||
Path::new(r"C:\foo\bar"),
|
||||
strip_trailing_slash(Path::new(r"C:\foo\bar\"))
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg_attr(not(windows), ignore = "only for Windows")]
|
||||
#[test]
|
||||
fn strip_trailing_windows_unc() {
|
||||
assert_eq!(
|
||||
Path::new(r"\\foo\bar"),
|
||||
strip_trailing_slash(Path::new(r"\\foo\bar\"))
|
||||
);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user