extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 15:11:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Conditionally disable expansion for external command (#6014)

Browse Source 
* Fix 5978

* Add unit test for explicit glob

* Format

* Expansion vs none-expansion

* Add unit tests

* Fix format..

* Add debug message for MacOS

* Fix UT on Mac and add tests for windows

* cleanup

* clean up windows test

* single and double qoutes tests

* format...

* Save format.

* Add log to failed windows unit tests

* try `touch` a file

* PS or CMD

* roll back some change

* format

* Remove log and test case

* Add unit test comments

* Fix

Co-authored-by: Frank <v-frankz@microsoft.com>
This commit is contained in:
Kangaxx-0
2022-07-17 14:30:33 -07:00
committed by GitHub
parent d8d88cd395
commit eeaca50dee
3 changed files with 227 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/nu-command/src/system/run_external.rs
View File

@ -402,7 +402,7 @@ impl ExternalCommand {
/// Spawn a command without shelling out to an external shell
pub fn spawn_simple_command(&self, cwd: &str) -> Result<std::process::Command, ShellError> {
let head = trim_enclosing_quotes(&self.name.item);
let (head, _) = trim_enclosing_quotes(&self.name.item);
let head = nu_path::expand_to_real_path(head)
.to_string_lossy()
.to_string();
@ -410,8 +410,9 @@ impl ExternalCommand {
let mut process = std::process::Command::new(&head);
for arg in self.args.iter() {
let (trimmed_args, run_glob_expansion) = trim_enclosing_quotes(&arg.item);
let mut arg = Spanned {
item: remove_quotes(trim_enclosing_quotes(&arg.item)),
item: remove_quotes(trimmed_args),
span: arg.span,
};
@ -421,7 +422,7 @@ impl ExternalCommand {
let cwd = PathBuf::from(cwd);
if arg.item.contains('*') {
if arg.item.contains('*') && run_glob_expansion {
if let Ok((prefix, matches)) =
nu_engine::glob_from(&arg, &cwd, self.name.span, None)
{
@ -516,14 +517,14 @@ fn shell_arg_escape(arg: &str) -> String {
}
}
fn trim_enclosing_quotes(input: &str) -> String {
fn trim_enclosing_quotes(input: &str) -> (String, bool) {
let mut chars = input.chars();
match (chars.next(), chars.next_back()) {
(Some('"'), Some('"')) => chars.collect(),
(Some('\''), Some('\'')) => chars.collect(),
(Some('`'), Some('`')) => chars.collect(),
_ => input.to_string(),
(Some('"'), Some('"')) => (chars.collect(), false),
(Some('\''), Some('\'')) => (chars.collect(), false),
(Some('`'), Some('`')) => (chars.collect(), true),
_ => (input.to_string(), true),
}
}