Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-15 07:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5486 from tertsdiepraam/cp-remove-crash-call

Browse source 
`cp`: remove `crash!` call
This commit is contained in:
Daniel Hofstetter 2023-11-03 08:23:24 +01:00 committed by GitHub
commit 0cad85f2fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/uu/cp/src/cp.rs
View file

@ -7,7 +7,6 @@
#![allow(clippy::extra_unused_lifetimes)] #![allow(clippy::extra_unused_lifetimes)]
use quick_error::quick_error; use quick_error::quick_error;
use std::borrow::Cow;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::env; use std::env;
@ -41,8 +40,8 @@ use uucore::{backup_control, update_control};
// requires these enum. // requires these enum.
pub use uucore::{backup_control::BackupMode, update_control::UpdateMode}; pub use uucore::{backup_control::BackupMode, update_control::UpdateMode};
use uucore::{ use uucore::{
crash, format_usage, help_about, help_section, help_usage, prompt_yes, show_error, format_usage, help_about, help_section, help_usage, prompt_yes, show_error, show_warning,
show_warning, util_name, util_name,
}; };
use crate::copydir::copy_directory; use crate::copydir::copy_directory;
@ -144,6 +143,7 @@ pub enum SparseMode {
} }
/// The expected file type of copy target /// The expected file type of copy target
#[derive(Copy, Clone)]
pub enum TargetType { pub enum TargetType {
Directory, Directory,
File, File,
@ -1195,7 +1195,7 @@ pub fn copy(sources: &[PathBuf], target: &Path, options: &Options) -> CopyResult
&progress_bar, &progress_bar,
source, source,
target, target,
&target_type, target_type,
options, options,
&mut symlinked_files, &mut symlinked_files,
&mut copied_files, &mut copied_files,
@ -1220,7 +1220,7 @@ pub fn copy(sources: &[PathBuf], target: &Path, options: &Options) -> CopyResult
fn construct_dest_path( fn construct_dest_path(
source_path: &Path, source_path: &Path,
target: &Path, target: &Path,
target_type: &TargetType, target_type: TargetType,
options: &Options, options: &Options,
) -> CopyResult<PathBuf> { ) -> CopyResult<PathBuf> {
if options.no_target_dir && target.is_dir() { if options.no_target_dir && target.is_dir() {
@ -1235,7 +1235,7 @@ fn construct_dest_path(
return Err("with --parents, the destination must be a directory".into()); return Err("with --parents, the destination must be a directory".into());
} }
Ok(match *target_type { Ok(match target_type {
TargetType::Directory => { TargetType::Directory => {
let root = if options.parents { let root = if options.parents {
Path::new("") Path::new("")
@ -1252,7 +1252,7 @@ fn copy_source(
progress_bar: &Option<ProgressBar>, progress_bar: &Option<ProgressBar>,
source: &Path, source: &Path,
target: &Path, target: &Path,
target_type: &TargetType, target_type: TargetType,
options: &Options, options: &Options,
symlinked_files: &mut HashSet<FileInformation>, symlinked_files: &mut HashSet<FileInformation>,
copied_files: &mut HashMap<FileInformation, PathBuf>, copied_files: &mut HashMap<FileInformation, PathBuf>,
@ -1995,24 +1995,12 @@ fn copy_link(
) -> CopyResult<()> { ) -> CopyResult<()> {
// Here, we will copy the symlink itself (actually, just recreate it) // Here, we will copy the symlink itself (actually, just recreate it)
let link = fs::read_link(source)?; let link = fs::read_link(source)?;
let dest: Cow<'_, Path> = if dest.is_dir() { // we always need to remove the file to be able to create a symlink,
match source.file_name() { // even if it is writeable.
Some(name) => dest.join(name).into(), if dest.is_symlink() || dest.is_file() {
None => crash!( fs::remove_file(dest)?;
EXIT_ERR, }
"cannot stat {}: No such file or directory", symlink_file(&link, dest, &context_for(&link, dest), symlinked_files)
source.quote()
),
}
} else {
// we always need to remove the file to be able to create a symlink,
// even if it is writeable.
if dest.is_symlink() || dest.is_file() {
fs::remove_file(dest)?;
}
dest.into()
};
symlink_file(&link, &dest, &context_for(&link, &dest), symlinked_files)
} }
/// Generate an error message if `target` is not the correct `target_type` /// Generate an error message if `target` is not the correct `target_type`