From f01846bd443aaf92fdd5ac20f461beac3f6ee3fd Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Sat, 10 Jul 2021 15:52:06 +0100 Subject: Do not resolve executables as relative path from current directory (#658) * Refactor: child pager process creation * Protect calls to Command::new behind grep_cli::resolve_binary * Move less env-var setting into less-specific branch --- src/bat_utils/less.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/bat_utils/less.rs') diff --git a/src/bat_utils/less.rs b/src/bat_utils/less.rs index 79ecd43b..1ca9f76f 100644 --- a/src/bat_utils/less.rs +++ b/src/bat_utils/less.rs @@ -1,8 +1,12 @@ use std::process::Command; pub fn retrieve_less_version() -> Option { - let cmd = Command::new("less").arg("--version").output().ok()?; - parse_less_version(&cmd.stdout) + if let Ok(less_path) = grep_cli::resolve_binary("less") { + let cmd = Command::new(less_path).arg("--version").output().ok()?; + parse_less_version(&cmd.stdout) + } else { + None + } } fn parse_less_version(output: &[u8]) -> Option { -- cgit v1.2.3