mirror of
https://github.com/nushell/nushell
synced 2025-01-19 00:24:10 +00:00
e1c6be0682
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Fixes #10365 Use bytes() instead of chars() to get an actual index that can be used with file.split_at(). utf8 is safe to process bytewise, since an ascii character can never be mistaken for a non-ascii character # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting - [x] Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - [x] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - [x] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - [x] `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - [x] `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library <!-- > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
247 lines
7.5 KiB
Rust
247 lines
7.5 KiB
Rust
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))]
|
|
use pwd::Passwd;
|
|
use std::path::{Path, PathBuf};
|
|
|
|
#[cfg(target_os = "macos")]
|
|
const FALLBACK_USER_HOME_BASE_DIR: &str = "/Users";
|
|
|
|
#[cfg(target_os = "windows")]
|
|
const FALLBACK_USER_HOME_BASE_DIR: &str = "C:\\Users\\";
|
|
|
|
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))]
|
|
const FALLBACK_USER_HOME_BASE_DIR: &str = "/home";
|
|
|
|
#[cfg(all(unix, target_os = "android"))]
|
|
const FALLBACK_USER_HOME_BASE_DIR: &str = "/data";
|
|
|
|
#[cfg(target_os = "android")]
|
|
const TERMUX_HOME: &str = "/data/data/com.termux/files/home";
|
|
|
|
fn expand_tilde_with_home(path: impl AsRef<Path>, home: Option<PathBuf>) -> PathBuf {
|
|
let path = path.as_ref();
|
|
|
|
if !path.starts_with("~") {
|
|
let string = path.to_string_lossy();
|
|
let mut path_as_string = string.as_ref().bytes();
|
|
return match path_as_string.next() {
|
|
Some(b'~') => expand_tilde_with_another_user_home(path),
|
|
_ => path.into(),
|
|
};
|
|
}
|
|
|
|
let path_last_char = path.as_os_str().to_string_lossy().chars().last();
|
|
let need_trailing_slash = path_last_char == Some('/') || path_last_char == Some('\\');
|
|
|
|
match home {
|
|
None => path.into(),
|
|
Some(mut h) => {
|
|
if h == Path::new("/") {
|
|
// Corner case: `h` is a root directory;
|
|
// don't prepend extra `/`, just drop the tilde.
|
|
path.strip_prefix("~").unwrap_or(path).into()
|
|
} else {
|
|
if let Ok(p) = path.strip_prefix("~/") {
|
|
// Corner case: `p` is empty;
|
|
// Don't append extra '/', just keep `h` as is.
|
|
// This happens because PathBuf.push will always
|
|
// add a separator if the pushed path is relative,
|
|
// even if it's empty
|
|
if p != Path::new("") {
|
|
h.push(p)
|
|
}
|
|
|
|
if need_trailing_slash {
|
|
h.push("");
|
|
}
|
|
}
|
|
h
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn fallback_home_dir(username: &str) -> PathBuf {
|
|
PathBuf::from_iter([FALLBACK_USER_HOME_BASE_DIR, username])
|
|
}
|
|
|
|
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "android")))]
|
|
fn user_home_dir(username: &str) -> PathBuf {
|
|
let passwd = Passwd::from_name(username);
|
|
match &passwd.ok() {
|
|
Some(Some(dir)) => PathBuf::from(&dir.dir),
|
|
_ => fallback_home_dir(username),
|
|
}
|
|
}
|
|
|
|
#[cfg(any(target_os = "android", target_os = "windows", target_os = "macos"))]
|
|
fn user_home_dir(username: &str) -> PathBuf {
|
|
use std::path::Component;
|
|
|
|
match dirs_next::home_dir() {
|
|
None => {
|
|
// Termux always has the same home directory
|
|
#[cfg(target_os = "android")]
|
|
if is_termux() {
|
|
return PathBuf::from(TERMUX_HOME);
|
|
}
|
|
|
|
fallback_home_dir(username)
|
|
}
|
|
Some(user) => {
|
|
let mut expected_path = user;
|
|
|
|
if !cfg!(target_os = "android")
|
|
&& expected_path
|
|
.components()
|
|
.last()
|
|
.map(|last| last != Component::Normal(username.as_ref()))
|
|
.unwrap_or(false)
|
|
{
|
|
expected_path.pop();
|
|
expected_path.push(Path::new(username));
|
|
}
|
|
|
|
if expected_path.is_dir() {
|
|
expected_path
|
|
} else {
|
|
fallback_home_dir(username)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Returns true if the shell is running inside the Termux terminal emulator
|
|
/// app.
|
|
#[cfg(target_os = "android")]
|
|
fn is_termux() -> bool {
|
|
std::env::var("TERMUX_VERSION").is_ok()
|
|
}
|
|
|
|
fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
|
|
return match path.to_str() {
|
|
Some(file_path) => {
|
|
let mut file = file_path.to_string();
|
|
match file_path.find(|c| c == '/' || c == '\\') {
|
|
None => {
|
|
file.remove(0);
|
|
user_home_dir(&file)
|
|
}
|
|
Some(i) => {
|
|
let (pre_name, rest_of_path) = file.split_at(i);
|
|
let mut name = pre_name.to_string();
|
|
let mut rest_path = rest_of_path.to_string();
|
|
rest_path.remove(0);
|
|
name.remove(0);
|
|
let mut path = user_home_dir(&name);
|
|
path.push(Path::new(&rest_path));
|
|
path
|
|
}
|
|
}
|
|
}
|
|
None => path.to_path_buf(),
|
|
};
|
|
}
|
|
|
|
/// Expand tilde ("~") into a home directory if it is the first path component
|
|
pub fn expand_tilde(path: impl AsRef<Path>) -> PathBuf {
|
|
// TODO: Extend this to work with "~user" style of home paths
|
|
expand_tilde_with_home(path, dirs_next::home_dir())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use std::path::MAIN_SEPARATOR;
|
|
|
|
fn check_expanded(s: &str) {
|
|
let home = Path::new("/home");
|
|
let buf = Some(PathBuf::from(home));
|
|
assert!(expand_tilde_with_home(Path::new(s), buf).starts_with(home));
|
|
|
|
// Tests the special case in expand_tilde for "/" as home
|
|
let home = Path::new("/");
|
|
let buf = Some(PathBuf::from(home));
|
|
assert!(!expand_tilde_with_home(Path::new(s), buf).starts_with("//"));
|
|
}
|
|
|
|
fn check_not_expanded(s: &str) {
|
|
let home = PathBuf::from("/home");
|
|
let expanded = expand_tilde_with_home(Path::new(s), Some(home));
|
|
assert_eq!(expanded, Path::new(s));
|
|
}
|
|
|
|
#[test]
|
|
fn string_with_tilde() {
|
|
check_expanded("~");
|
|
}
|
|
|
|
#[test]
|
|
fn string_with_tilde_forward_slash() {
|
|
check_expanded("~/test/");
|
|
}
|
|
|
|
#[test]
|
|
fn string_with_tilde_double_forward_slash() {
|
|
check_expanded("~//test/");
|
|
}
|
|
|
|
#[test]
|
|
fn string_with_tilde_other_user() {
|
|
let s = "~someone/test/";
|
|
let expected = format!("{FALLBACK_USER_HOME_BASE_DIR}/someone/test/");
|
|
|
|
assert_eq!(expand_tilde(Path::new(s)), PathBuf::from(expected));
|
|
}
|
|
|
|
#[test]
|
|
fn string_with_multi_byte_chars() {
|
|
let s = "~あ/";
|
|
let expected = format!("{FALLBACK_USER_HOME_BASE_DIR}/あ/");
|
|
|
|
assert_eq!(expand_tilde(Path::new(s)), PathBuf::from(expected));
|
|
}
|
|
|
|
#[test]
|
|
fn does_not_expand_tilde_if_tilde_is_not_first_character() {
|
|
check_not_expanded("1~1");
|
|
}
|
|
|
|
#[test]
|
|
fn path_does_not_include_trailing_separator() {
|
|
let home = Path::new("/home");
|
|
let buf = Some(PathBuf::from(home));
|
|
let expanded = expand_tilde_with_home(Path::new("~"), buf);
|
|
let expanded_str = expanded.to_str().unwrap();
|
|
assert!(!expanded_str.ends_with(MAIN_SEPARATOR));
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[test]
|
|
fn string_with_tilde_backslash() {
|
|
check_expanded("~\\test/test2/test3");
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[test]
|
|
fn string_with_double_tilde_backslash() {
|
|
check_expanded("~\\\\test\\test2/test3");
|
|
}
|
|
|
|
// [TODO] Figure out how to reliably test with real users.
|
|
#[test]
|
|
fn user_home_dir_fallback() {
|
|
let user = "nonexistent";
|
|
let expected_home = PathBuf::from_iter([FALLBACK_USER_HOME_BASE_DIR, user]);
|
|
|
|
#[cfg(target_os = "android")]
|
|
let expected_home = if is_termux() {
|
|
PathBuf::from(TERMUX_HOME)
|
|
} else {
|
|
expected_home
|
|
};
|
|
|
|
let actual_home = super::user_home_dir(user);
|
|
|
|
assert_eq!(expected_home, actual_home, "wrong home");
|
|
}
|
|
}
|