diff options
author | Roy Ivy III <rivy.dev@gmail.com> | 2020-06-01 10:30:29 -0500 |
---|---|---|
committer | David Peter <sharkdp@users.noreply.github.com> | 2020-06-03 09:13:47 +0200 |
commit | 99226b745f20e267cebfeed411ad46741eb16d84 (patch) | |
tree | 41a9603366a6207f846573e88b90e061f75003ee | |
parent | 4840c7cd78910d54a7959d8d0d4187ca84d90c2d (diff) |
Revert 9ed8db22c ('windows' pager process execution fix) based on PR feedback/owner request
-rw-r--r-- | src/output.rs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/output.rs b/src/output.rs index 31b2994a..e7d59d67 100644 --- a/src/output.rs +++ b/src/output.rs @@ -74,18 +74,8 @@ impl OutputType { let is_less = pager_path.file_stem() == Some(&OsString::from("less")); - #[cfg(windows)] - let (pager_path, args) = { - let p = std::env::var("ComSpec").unwrap_or_else(|_| "cmd".to_string()); - let mut a = args.to_vec(); - a.insert(0, pager_path.to_str().unwrap().to_string()); - a.insert(0, "/d/c".to_string()); - (p, a) - }; - - let mut p = Command::new(&pager_path); - let mut process = if is_less { + let mut p = Command::new(&pager_path); if args.is_empty() || replace_arguments_to_less { p.arg("--RAW-CONTROL-CHARS"); if quit_if_one_screen { @@ -116,6 +106,7 @@ impl OutputType { p.env("LESSCHARSET", "UTF-8"); p } else { + let mut p = Command::new(&pager_path); p.args(args); p }; |