use uniform logic for selecting between 'vi' or 'editor'

Author: squell

src/defaults/mod.rs

@@ -21,6 +21,12 @@ use settings_dsl::{
     result_of, storage_of,
 };
 
+pub const SYSTEM_EDITOR: &str = if cfg!(target_os = "linux") {
+    "/usr/bin/editor"
+} else {
+    "/usr/bin/vi"
+};
+
 defaults! {
     always_query_group_plugin = false  #ignored
     always_set_home           = false  #ignored
@@ -54,7 +60,7 @@ defaults! {
     passwd_timeout            = (5*60) (!= 0) {fractional_minutes}
     timestamp_timeout         = (15*60) (!= 0) {fractional_minutes}
 
-    editor                    = "/usr/bin/editor"
+    editor                    = SYSTEM_EDITOR
     env_editor                = true
 
     env_keep                  = ["COLORS", "DISPLAY", "HOSTNAME", "KRB5CCNAME", "LS_COLORS", "PATH",

src/sudoers/mod.rs

@@ -345,11 +345,7 @@ fn select_editor(settings: &Settings, trusted_env: bool) -> PathBuf {
 
     // fallback on hardcoded path -- always provide something to the caller
 
-    PathBuf::from(if cfg!(target_os = "linux") {
-        "/usr/bin/editor"
-    } else {
-        "/usr/bin/vi"
-    })
+    PathBuf::from(defaults::SYSTEM_EDITOR)
 }
 
 // a `take_while` variant that does not consume the first non-matching item

src/visudo/mod.rs

@@ -273,11 +273,7 @@ fn edit_sudoers_file(
         sudoers.visudo_editor_path(&host_name, &current_user, &current_user)
     } else {
         // there is no /etc/sudoers config yet, so use a system default
-        PathBuf::from(if cfg!(target_os = "linux") {
-            "/usr/bin/editor"
-        } else {
-            "/usr/bin/vi"
-        })
+        PathBuf::from(crate::defaults::SYSTEM_EDITOR)
     };
 
     loop {