system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-10-15 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wc: add message when reading directories

Browse source
This commit is contained in:
Arcterus 2014-07-10 09:10:09 -07:00
parent 59751d60f3
commit 593149ed49
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
common/util.rs
View file

@ -19,6 +19,22 @@ macro_rules! show_error(
})
)
#[macro_export]
macro_rules! show_warning(
($($args:expr),+) => ({
safe_write!(&mut ::std::io::stderr(), "{}: warning: ", ::NAME);
safe_writeln!(&mut ::std::io::stderr(), $($args),+);
})
)
#[macro_export]
macro_rules! show_info(
($($args:expr),+) => ({
safe_write!(&mut ::std::io::stderr(), "{}: ", ::NAME);
safe_writeln!(&mut ::std::io::stderr(), $($args),+);
})
)
#[macro_export]
macro_rules! eprint(
($($args:expr),+) => (safe_write!(&mut ::std::io::stderr(), $($args),+))
@ -29,14 +45,6 @@ macro_rules! eprintln(
($($args:expr),+) => (safe_writeln!(&mut ::std::io::stderr(), $($args),+))
)
#[macro_export]
macro_rules! show_warning(
($($args:expr),+) => ({
safe_write!(&mut ::std::io::stderr(), "{}: warning: ", ::NAME);
safe_writeln!(&mut ::std::io::stderr(), $($args),+);
})
)
#[macro_export]
macro_rules! crash(
($exitcode:expr, $($args:expr),+) => ({
@ -46,7 +54,6 @@ macro_rules! crash(
})
)
#[macro_export]
macro_rules! exit(
($exitcode:expr) => ({

8
wc/wc.rs
View file

@ -236,13 +236,17 @@ fn open(path: String) -> StdResult<BufferedReader<Box<Reader>>, int> {
return Ok(BufferedReader::new(reader));
}
match File::open(&std::path::Path::new(path.as_slice())) {
let fpath = Path::new(path.as_slice());
if fpath.is_dir() {
show_info!("{}: is a directory", path);
}
match File::open(&fpath) {
Ok(fd) => {
let reader = box fd as Box<Reader>;
Ok(BufferedReader::new(reader))
},
Err(e) => {
show_error!("wc: {0:s}: {1:s}", path, e.desc.to_string());
show_error!("wc: {}: {}", path, e);
Err(1)
}
}