Skip to content

Commit

Permalink
Be more conservative with stdin.
Browse files Browse the repository at this point in the history
If no paths are given to ripgrep, only read from stdin if it's a file or
a FIFO. In particular, if something like `rg foo < /dev/null` is used,
then don't try to read from stdin.

Fixes #35, #81
  • Loading branch information
BurntSushi committed Sep 25, 2016
1 parent 2015c56 commit ab0d1c1
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ impl RawArgs {
if self.arg_path.is_empty() {
if atty::on_stdin()
|| self.flag_files
|| self.flag_type_list {
|| self.flag_type_list
|| !atty::stdin_is_readable() {
vec![Path::new("./").to_path_buf()]
} else {
vec![Path::new("-").to_path_buf()]
Expand Down
23 changes: 23 additions & 0 deletions src/atty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,29 @@ from (or to) a terminal. Windows and Unix do this differently, so implement
both here.
*/

#[cfg(unix)]
pub fn stdin_is_readable() -> bool {
use std::fs::File;
use std::os::unix::fs::FileTypeExt;
use std::os::unix::io::{FromRawFd, IntoRawFd};
use libc;

let file = unsafe { File::from_raw_fd(libc::STDIN_FILENO) };
let md = file.metadata();
let _ = file.into_raw_fd();
let ft = match md {
Err(_) => return false,
Ok(md) => md.file_type(),
};
ft.is_file() || ft.is_fifo()
}

#[cfg(windows)]
pub fn stdin_is_readable() -> bool {
// ???
true
}

#[cfg(unix)]
pub fn on_stdin() -> bool {
use libc;
Expand Down

0 comments on commit ab0d1c1

Please sign in to comment.