Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

cp: added -v/--verbose flag

Browse source 
I forgot that -v refers to "verbose" and not "version"
when making earlier changes. So I fixed that and for
good measure added the verbose flag anyway.
This commit is contained in:
Jeremy Neptune 2016-07-15 14:41:50 -04:00
parent cc57ce7699
commit a3004fbbff
No known key found for this signature in database
GPG key ID: C09EDE50FDEF1BB7
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cp/cp.rs
View file

@ -34,9 +34,10 @@ pub fn uumain(args: Vec<String>) -> i32 {
let mut opts = Options::new(); let mut opts = Options::new();
opts.optflag("h", "help", "display this help and exit"); opts.optflag("h", "help", "display this help and exit");
opts.optflag("v", "version", "output version information and exit"); opts.optflag("", "version", "output version information and exit");
opts.optopt("t", "target-directory", "copy all SOURCE arguments into DIRECTORY", "DEST"); opts.optopt("t", "target-directory", "copy all SOURCE arguments into DIRECTORY", "DEST");
opts.optflag("T", "no-target-directory", "Treat DEST as a regular file and not a directory"); opts.optflag("T", "no-target-directory", "Treat DEST as a regular file and not a directory");
opts.optflag("v", "verbose", "explicitly state what is being done");
let matches = match opts.parse(&args[1..]) { let matches = match opts.parse(&args[1..]) {
Ok(m) => m, Ok(m) => m,
@ -45,7 +46,6 @@ pub fn uumain(args: Vec<String>) -> i32 {
panic!() panic!()
}, },
}; };
let usage = opts.usage("Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY."); let usage = opts.usage("Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.");
let mode = if matches.opt_present("version") { let mode = if matches.opt_present("version") {
Mode::Version Mode::Version
@ -79,7 +79,7 @@ fn help(usage: &str) {
} }
fn copy(matches: getopts::Matches) { fn copy(matches: getopts::Matches) {
let verbose = matches.opt_present("verbose");
let sources: Vec<String> = if matches.free.is_empty() { let sources: Vec<String> = if matches.free.is_empty() {
show_error!("Missing SOURCE or DEST argument. Try --help."); show_error!("Missing SOURCE or DEST argument. Try --help.");
panic!() panic!()
@ -136,6 +136,9 @@ fn copy(matches: getopts::Matches) {
if dest.is_dir() { if dest.is_dir() {
full_dest.push(source.file_name().unwrap()); //the destination path is the destination full_dest.push(source.file_name().unwrap()); //the destination path is the destination
} // directory + the file name we're copying } // directory + the file name we're copying
if verbose {
println!("{} -> {}", source.display(), full_dest.display());
}
if let Err(err) = fs::copy(source, full_dest) { if let Err(err) = fs::copy(source, full_dest) {
show_error!("{}", err); show_error!("{}", err);
panic!(); panic!();
@ -157,7 +160,9 @@ fn copy(matches: getopts::Matches) {
full_dest.push(source.file_name().unwrap()); full_dest.push(source.file_name().unwrap());
println!("{}", full_dest.display()); if verbose {
println!("{} -> {}", source.display(), full_dest.display());
}
let io_result = fs::copy(source, full_dest); let io_result = fs::copy(source, full_dest);