rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-04-08 16:53:58 +02:00
Code Issues Releases Activity

Fix stdin bug with --file.

Browse Source 
When `rg -f-` is used, the default search path should be `./` and not
`-`.
This commit is contained in:
Andrew Gallant 2016-11-17 20:48:11 -05:00
parent e37f783fc0
commit 0302d58eb8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/args.rs
View File

@ -370,10 +370,15 @@ impl<'a> ArgMatches<'a> {
/// Return the default path that ripgrep should search.
fn default_path(&self) -> PathBuf {
let file_is_stdin =
self.values_of_os("file").map_or(false, |mut files| {
files.any(|f| f == "-")
});
let search_cwd = atty::on_stdin()
|| !atty::stdin_is_readable()
|| (self.is_present("file") && file_is_stdin)
|| self.is_present("files")
|| self.is_present("type-list")
|| !atty::stdin_is_readable();
|| self.is_present("type-list");
if search_cwd {
Path::new("./").to_path_buf()
} else {