rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-03-17 20:28:03 +02:00
Code Issues Releases Activity

cli: tweak how "is one file" predicate works

Browse Source 
In effect, we switch from `path.is_file()` to `!path.is_dir()`. In cases
where process substitution is used, for example, the path can actually
have type "fifo" instead of "file." Even if it's a fifo, we want to
treat it as-if it were a file. The real key here is that we basically
always want to consider a lone argument as a file so long as we know it
isn't a directory. Because a directory is the only thing that will
causes us to (potentially) search more than one thing.

Fixes #2736
This commit is contained in:
Andrew Gallant 2024-02-15 11:59:59 -05:00
parent 9b42af96f0
commit 4a30819302
No known key found for this signature in database
GPG Key ID: B2E3A4923F8B0D44
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/cli/src/lib.rs
View File

@ -182,6 +182,7 @@ pub fn is_readable_stdin() -> bool {
let file = File::from(fd);
let Ok(md) = file.metadata() else { return false };
let ft = md.file_type();
dbg!(&ft);
ft.is_file() || ft.is_fifo() || ft.is_socket()
}

11
crates/core/flags/hiargs.rs
View File

@ -1080,9 +1080,18 @@ impl Paths {
}
paths.push(path);
}
log::debug!("number of paths given to search: {}", paths.len());
if !paths.is_empty() {
let is_one_file = paths.len() == 1
&& (paths[0] == Path::new("-") || paths[0].is_file());
// Note that we specifically use `!paths[0].is_dir()` here
// instead of `paths[0].is_file()`. Namely, the latter can
// return `false` even when the path is something resembling
// a file. So instead, we just consider the path a file as
// long as we know it isn't a directory.
//
// See: https://github.com/BurntSushi/ripgrep/issues/2736
&& (paths[0] == Path::new("-") || !paths[0].is_dir());
log::debug!("is_one_file? {is_one_file:?}");
return Ok(Paths { paths, has_implicit_path: false, is_one_file });
}
// N.B. is_readable_stdin is a heuristic! Part of the issue is that a