diff --git a/Cargo.toml b/Cargo.toml index dde42a4..c5d4640 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust_util" -version = "0.2.2" +version = "0.2.3" authors = ["Hatter Jiang "] edition = "2018" description = "Hatter's Rust Util" diff --git a/src/lib.rs b/src/lib.rs index 2dccce8..409d727 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,6 +9,7 @@ pub mod util_os; pub mod util_env; pub mod util_cmd; pub mod util_msg; +pub mod util_str; pub mod util_size; pub mod util_file; pub mod util_time; diff --git a/src/util_io.rs b/src/util_io.rs index 6a9b93a..dd9b189 100644 --- a/src/util_io.rs +++ b/src/util_io.rs @@ -11,6 +11,7 @@ use std::{ use super::{ XResult, new_box_ioerror, }; use super::util_size::get_display_size; use super::util_msg::print_lastline; +use super::util_file::resolve_file_path; pub const DEFAULT_BUF_SIZE: usize = 8 * 1024; @@ -19,7 +20,7 @@ pub fn get_read_stdin_or_file(file: &str) -> XResult> { if file.is_empty() { Ok(Box::new(io::stdin())) } else { - match File::open(file) { + match File::open(&resolve_file_path(file)) { Ok(f) => Ok(Box::new(f)), Err(err) => Err(new_box_ioerror(&format!("Open file {}, erorr: {}", file, err))), }