extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-28 19:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix and refactor cd for Filesystem Shell. (#1452)

Browse Source 
* Fix and refactor cd for Filesystem Shell.
Reorder check conditions, don't check existence twice.
If building for unix check exec bit on folder.

* Import PermissionsExt only on unix target.

* It seems that this is the correct way?
This commit is contained in:
Kevin DCR 2020-03-06 02:13:47 -05:00 committed by GitHub
parent db24ad8f36
commit 287652573b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/nu-cli/src/shell/filesystem_shell.rs
View File

@ -18,6 +18,9 @@ use std::path::PathBuf;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use trash as SendToTrash; use trash as SendToTrash;
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt;
pub struct FilesystemShell { pub struct FilesystemShell {
pub(crate) path: String, pub(crate) path: String,
pub(crate) last_path: String, pub(crate) last_path: String,
@ -172,8 +175,8 @@ impl Shell for FilesystemShell {
Some(o) => o, Some(o) => o,
_ => { _ => {
return Err(ShellError::labeled_error( return Err(ShellError::labeled_error(
"Can not change to home directory", "Cannot change to home directory",
"can not go to home", "cannot go to home",
&args.call_info.name_tag, &args.call_info.name_tag,
)) ))
} }
@ -185,25 +188,48 @@ impl Shell for FilesystemShell {
PathBuf::from(&self.last_path) PathBuf::from(&self.last_path)
} else { } else {
let path = PathBuf::from(self.path()); let path = PathBuf::from(self.path());
let path = dunce::canonicalize(path.join(&target)).map_err(|_| {
ShellError::labeled_error(
"Cannot change to directory",
"directory not found",
&v.tag,
)
})?;
if target.exists() && !target.is_dir() { if !path.is_dir() {
return Err(ShellError::labeled_error( return Err(ShellError::labeled_error(
"Can not change to directory", "Cannot change to directory",
"is not a directory", "is not a directory",
&v.tag, &v.tag,
)); ));
} }
match dunce::canonicalize(path.join(&target)) { #[cfg(unix)]
Ok(p) => p, {
Err(_) => { let has_exec = path
.metadata()
.map(|m| {
let mode = umask::Mode::from(m.permissions().mode());
mode.has(umask::ALL_EXEC)
})
.map_err(|e| {
ShellError::labeled_error(
"Cannot change to directory",
format!("cannot stat ({})", e),
&v.tag,
)
})?;
if !has_exec {
return Err(ShellError::labeled_error( return Err(ShellError::labeled_error(
"Cannot change to directory", "Cannot change to directory",
"directory not found", "permission denied",
&v.tag, &v.tag,
)) ));
} }
} }
path
} }
} }
}; };