Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/uu/mv/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ mv-debug-skipped = skipped {$target}

# Prompt messages
mv-prompt-overwrite = overwrite {$target}?
mv-prompt-overriding-mode = overwrite {$target}, overriding mode {$mode} ({$mode_str})?

# Progress messages
mv-progress-moving = moving
1 change: 1 addition & 0 deletions src/uu/mv/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ mv-debug-skipped = ignoré {$target}

# Messages de confirmation
mv-prompt-overwrite = écraser {$target} ?
mv-prompt-overriding-mode = écraser {$target}, en ignorant le mode {$mode} ({$mode_str}) ?

# Messages de progression
mv-progress-moving = déplacement
42 changes: 38 additions & 4 deletions src/uu/mv/src/mv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -732,10 +732,44 @@ fn rename(
return Ok(());
}
OverwriteMode::Interactive => {
if !prompt_yes!(
"{}",
translate!("mv-prompt-overwrite", "target" => to.quote())
) {
// We assign 'msg' the result of this block
let msg = {
let default_msg = translate!("mv-prompt-overwrite", "target" => to.quote());

#[cfg(unix)]
{
use libc::mode_t;
use std::os::unix::fs::PermissionsExt;

// We use an 'if let' as an expression here
if let Ok(meta) = fs::metadata(to) {
let mode = meta.permissions().mode() & 0o777;
if (mode & 0o200) == 0 {
let octal_mode = format!("{mode:04o}");
let mode_string = format!("\u{200c}{octal_mode}");

// This is the "return" value of the inner block
translate!(
"mv-prompt-overriding-mode",
"target" => to.quote(),
"mode" => mode_string,
"mode_str" => uucore::fs::display_permissions_unix(mode as mode_t, false)
)
} else {
default_msg
}
} else {
default_msg
}
}

#[cfg(not(unix))]
{
default_msg
}
};

if !prompt_yes!("{}", msg) {
return Err(io::Error::other(""));
}
}
Expand Down
Loading