From 9e3d7ea44c2813ffaddb0accd768407ad1664a55 Mon Sep 17 00:00:00 2001 From: soruh Date: Thu, 2 Feb 2023 22:05:44 +0100 Subject: [PATCH] add EXE_SUFFIX to sendmail executable when not specified --- src/config.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/config.rs b/src/config.rs index e362464b..fa53c55b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,3 +1,4 @@ +use std::env::consts::EXE_SUFFIX; use std::process::exit; use std::sync::RwLock; @@ -749,12 +750,12 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> { } if cfg.use_sendmail { - let command = cfg.sendmail_command.as_deref().unwrap_or("sendmail"); + let command = cfg.sendmail_command.clone().unwrap_or_else(|| format!("sendmail{EXE_SUFFIX}")); - let mut path = std::path::PathBuf::from(command); + let mut path = std::path::PathBuf::from(&command); if !path.is_absolute() { - match which::which(command) { + match which::which(&command) { Ok(result) => path = result, Err(_) => err!(format!("sendmail command {command:?} not found in $PATH")), }