- switched print statement to match GNU exchange format

- switched to using the translate! macro instead of get_message

Author: hz2

src/uu/mv/src/mv.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) sourcepath targetpath nushell canonicalized
+// spell-checker:ignore (ToDO) sourcepath targetpath nushell canonicalized renameat FDCWD ENOTSUP
 
 mod error;
 #[cfg(unix)]
@@ -53,6 +53,7 @@ use fs_extra::dir::get_size as dir_get_size;
 
 use crate::error::MvError;
 use uucore::locale::{get_message, get_message_with_args};
+use uucore::translate;
 
 /// Options contains all the possible behaviors and flags for mv.
 ///
@@ -185,25 +186,25 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         if files.len() != 2 {
             return Err(UUsageError::new(
                 1,
-                get_message("mv-error-exchange-needs-two-files"),
+                translate!("--exchange requires exactly two files"),
             ));
         }
         if matches.contains_id(OPT_TARGET_DIRECTORY) {
             return Err(UUsageError::new(
                 1,
-                get_message("mv-error-exchange-conflicts-with-target-directory"),
+                translate!("--exchange conflicts with --target-directory"),
             ));
         }
         if backup_mode != BackupMode::None {
             return Err(UUsageError::new(
                 1,
-                get_message("mv-error-exchange-conflicts-with-backup"),
+                translate!("--exchange conflicts with backup options"),
             ));
         }
         if update_mode != UpdateMode::All {
             return Err(UUsageError::new(
                 1,
-                get_message("mv-error-exchange-conflicts-with-update"),
+                translate!("--exchange conflicts with update options"),
             ));
         }
     }
@@ -331,7 +332,7 @@ pub fn uu_app() -> Command {
         .arg(
             Arg::new(OPT_EXCHANGE)
                 .long(OPT_EXCHANGE)
-                .help(get_message("mv-help-exchange"))
+                .help(translate!("exchange two files"))
                 .action(ArgAction::SetTrue),
         )
 }
@@ -358,10 +359,8 @@ fn exchange_files(path1: &Path, path2: &Path, opts: &Options) -> UResult<()> {
     use std::os::unix::ffi::OsStrExt;
 
     // Convert paths to C strings
-    let c_path1 = CString::new(path1.as_os_str().as_bytes())
-        .map_err(|e| USimpleError::new(1, format!("Invalid path {}: {e}", path1.display())))?;
-    let c_path2 = CString::new(path2.as_os_str().as_bytes())
-        .map_err(|e| USimpleError::new(1, format!("Invalid path {}: {e}", path2.display())))?;
+    let c_path1 = CString::new(path1.as_os_str().as_bytes()).unwrap();
+    let c_path2 = CString::new(path2.as_os_str().as_bytes()).unwrap();
 
     // RENAME_EXCHANGE flag for renameat2
     const RENAME_EXCHANGE: libc::c_int = 2;
@@ -380,23 +379,23 @@ fn exchange_files(path1: &Path, path2: &Path, opts: &Options) -> UResult<()> {
 
     if result == 0 {
         if opts.verbose {
-            println!("{} <-> {}", path1.display(), path2.display());
+            println!("exchanged '{}' <-> '{}'", path1.display(), path2.display());
         }
         Ok(())
     } else {
         let errno = unsafe { *libc::__errno_location() };
         match errno {
             libc::ENOTSUP | libc::EINVAL => Err(USimpleError::new(
                 1,
-                get_message("mv-error-exchange-not-supported"),
+                translate!("--exchange is not supported on this filesystem"),
             )),
             libc::ENOENT => {
                 let missing_path = if path1.exists() { path2 } else { path1 };
                 Err(MvError::NoSuchFile(missing_path.display().to_string()).into())
             }
             libc::EXDEV => Err(USimpleError::new(
                 1,
-                get_message("mv-error-exchange-cross-device"),
+                translate!("--exchange cannot exchange files across different filesystems"),
             )),
             _ => {
                 let error_msg = io::Error::from_raw_os_error(errno);
@@ -414,7 +413,7 @@ fn exchange_files(path1: &Path, path2: &Path, opts: &Options) -> UResult<()> {
 fn exchange_files(_path1: &Path, _path2: &Path, _opts: &Options) -> UResult<()> {
     Err(USimpleError::new(
         1,
-        get_message("mv-error-exchange-not-supported"),
+        translate!("--exchange is not supported on this system"),
     ))
 }
 
@@ -648,7 +647,7 @@ pub fn mv(files: &[OsString], opts: &Options) -> UResult<()> {
         if paths.len() != 2 {
             return Err(USimpleError::new(
                 1,
-                get_message("mv-error-exchange-needs-two-files"),
+                translate!("--exchange requires exactly two files"),
             ));
         }
         return exchange_files(&paths[0], &paths[1], opts);