Skip a file if stdout is being redirected to it. This fixes #122

ggreer · Feb 9, 2013 · 6c0dcb0 · 6c0dcb0
1 parent 4f2e18f
commit 6c0dcb0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/options.c b/src/options.c
@@ -226,7 +226,7 @@ void parse_options(int argc, char **argv, char **base_paths[], char **paths[]) {
         if (rv != 0) {
             die("Error fstat()ing stdout");
         }
-        statbuf;
+        opts.stdout_inode = statbuf.st_ino;
     }
 
     while ((ch = getopt_long(argc, argv, "A:aB:C:DG:g:fhiLlm:np:QRrSsvVtuUwz", longopts, &opt_index)) != -1) {

diff --git a/src/options.h b/src/options.h
@@ -2,6 +2,8 @@
 #define OPTIONS_H
 
 #include <getopt.h>
+#include <sys/stat.h>
+
 #include <pcre.h>
 
 #define DEFAULT_CONTEXT_LEN 2
@@ -53,6 +55,7 @@ typedef struct {
     int search_hidden_files;
     int search_stream; /* true if tail -F blah | ag */
     int stats;
+    ino_t stdout_inode;
     char *query;
     int query_len;
     char *pager;

diff --git a/src/search.c b/src/search.c
@@ -211,6 +211,11 @@ void search_file(const char *file_full_path) {
         goto cleanup;
     }
 
+    if (opts.stdout_inode != 0 && opts.stdout_inode == statbuf.st_ino) {
+        log_debug("Skipping %s because stdout is redirected to it", file_full_path);
+        goto cleanup;
+    }
+
     if ((statbuf.st_mode & S_IFMT) == 0) {
         log_err("%s is not a file. Mode %u. Skipping...", file_full_path, statbuf.st_mode);
         goto cleanup;