RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-09-15 11:36:16 +00:00
Code Issues Activity

mv: avoid attempting to set xattr on redox

Browse source
This commit is contained in:
Chad Williamson 2024-04-11 12:54:58 -05:00 • committed by Ben Wiederhake
parent 5bf939aec6
commit 9d82fa3b9a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/uu/mv/src/mv.rs
View file

@ -27,7 +27,7 @@ use uucore::fs::{
are_hardlinks_or_one_way_symlink_to_same_file, are_hardlinks_to_same_file, are_hardlinks_or_one_way_symlink_to_same_file, are_hardlinks_to_same_file,
path_ends_with_terminator, path_ends_with_terminator,
}; };
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(any(target_os = "macos", target_os = "redox"))))]
use uucore::fsxattr; use uucore::fsxattr;
use uucore::update_control; use uucore::update_control;
@ -634,7 +634,7 @@ fn rename_with_fallback(
None None
}; };
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(any(target_os = "macos", target_os = "redox"))))]
let xattrs = let xattrs =
fsxattr::retrieve_xattrs(from).unwrap_or_else(|_| std::collections::HashMap::new()); fsxattr::retrieve_xattrs(from).unwrap_or_else(|_| std::collections::HashMap::new());
@ -648,7 +648,7 @@ fn rename_with_fallback(
move_dir(from, to, &options) move_dir(from, to, &options)
}; };
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(any(target_os = "macos", target_os = "redox"))))]
fsxattr::apply_xattrs(to, xattrs).unwrap(); fsxattr::apply_xattrs(to, xattrs).unwrap();
if let Err(err) = result { if let Err(err) = result {
@ -661,11 +661,11 @@ fn rename_with_fallback(
}; };
} }
} else { } else {
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(any(target_os = "macos", target_os = "redox"))))]
fs::copy(from, to) fs::copy(from, to)
.and_then(|_| fsxattr::copy_xattrs(&from, &to)) .and_then(|_| fsxattr::copy_xattrs(&from, &to))
.and_then(|_| fs::remove_file(from))?; .and_then(|_| fs::remove_file(from))?;
#[cfg(any(target_os = "macos", not(unix)))] #[cfg(any(target_os = "macos", target_os = "redox", not(unix)))]
fs::copy(from, to).and_then(|_| fs::remove_file(from))?; fs::copy(from, to).and_then(|_| fs::remove_file(from))?;
} }
} }