From 2a1a923accfb1e895085c5c1edac767e879abcbd Mon Sep 17 00:00:00 2001
From: Andreas Hartmann <andreas.h@rtmann.de>
Date: Wed, 21 Jul 2021 09:30:15 +0200
Subject: [PATCH] ln: Adapt to modified `backup_control` interface

---
 src/uu/ln/src/ln.rs | 46 +++++----------------------------------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs
index f1689a44b..4eeb637e7 100644
--- a/src/uu/ln/src/ln.rs
+++ b/src/uu/ln/src/ln.rs
@@ -54,7 +54,6 @@ enum LnError {
     FailedToLink(String),
     MissingDestination(String),
     ExtraOperand(String),
-    InvalidBackupMode(String),
 }
 
 impl Display for LnError {
@@ -72,7 +71,6 @@ impl Display for LnError {
                 s,
                 uucore::execution_phrase()
             ),
-            Self::InvalidBackupMode(s) => write!(f, "{}", s),
         }
     }
 }
@@ -87,7 +85,6 @@ impl UError for LnError {
             Self::FailedToLink(_) => 1,
             Self::MissingDestination(_) => 1,
             Self::ExtraOperand(_) => 1,
-            Self::InvalidBackupMode(_) => 1,
         }
     }
 }
@@ -119,13 +116,10 @@ fn long_usage() -> String {
 static ABOUT: &str = "change file owner and group";
 
 mod options {
-    pub const BACKUP_NO_ARG: &str = "b";
-    pub const BACKUP: &str = "backup";
     pub const FORCE: &str = "force";
     pub const INTERACTIVE: &str = "interactive";
     pub const NO_DEREFERENCE: &str = "no-dereference";
     pub const SYMBOLIC: &str = "symbolic";
-    pub const SUFFIX: &str = "suffix";
     pub const TARGET_DIRECTORY: &str = "target-directory";
     pub const NO_TARGET_DIRECTORY: &str = "no-target-directory";
     pub const RELATIVE: &str = "relative";
@@ -164,19 +158,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         OverwriteMode::NoClobber
     };
 
-    let backup_mode = backup_control::determine_backup_mode(
-        matches.is_present(options::BACKUP_NO_ARG),
-        matches.is_present(options::BACKUP),
-        matches.value_of(options::BACKUP),
-    );
-    let backup_mode = match backup_mode {
-        Err(err) => {
-            return Err(LnError::InvalidBackupMode(err).into());
-        }
-        Ok(mode) => mode,
-    };
-
-    let backup_suffix = backup_control::determine_backup_suffix(matches.value_of(options::SUFFIX));
+    let backup_mode = backup_control::determine_backup_mode(&matches)?;
+    let backup_suffix = backup_control::determine_backup_suffix(&matches);
 
     let settings = Settings {
         overwrite: overwrite_mode,
@@ -199,20 +182,8 @@ pub fn uu_app() -> App<'static, 'static> {
     App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
-        .arg(
-            Arg::with_name(options::BACKUP)
-                .long(options::BACKUP)
-                .help("make a backup of each existing destination file")
-                .takes_value(true)
-                .require_equals(true)
-                .min_values(0)
-                .value_name("CONTROL"),
-        )
-        .arg(
-            Arg::with_name(options::BACKUP_NO_ARG)
-                .short(options::BACKUP_NO_ARG)
-                .help("like --backup but does not accept an argument"),
-        )
+        .arg(backup_control::arguments::backup())
+        .arg(backup_control::arguments::backup_no_args())
         // TODO: opts.arg(
         //    Arg::with_name(("d", "directory", "allow users with appropriate privileges to attempt \
         //                                       to make hard links to directories");
@@ -250,14 +221,7 @@ pub fn uu_app() -> App<'static, 'static> {
                 // override added for https://github.com/uutils/coreutils/issues/2359
                 .overrides_with(options::SYMBOLIC),
         )
-        .arg(
-            Arg::with_name(options::SUFFIX)
-                .short("S")
-                .long(options::SUFFIX)
-                .help("override the usual backup suffix")
-                .value_name("SUFFIX")
-                .takes_value(true),
-        )
+        .arg(backup_control::arguments::suffix())
         .arg(
             Arg::with_name(options::TARGET_DIRECTORY)
                 .short("t")