src/ignore.c

@@ -20,6 +20,8 @@ const int fnmatch_flags = FNM_PATHNAME; #endif +ignores *root_ignores;+ /* TODO: build a huge-ass list of files we want to ignore by default (build cache stuff, pyc files, etc) */  const char *evil_hardcoded_ignore_files[] = {

src/ignore.h

@@ -29,7 +29,7 @@ struct ignores { }; typedef struct ignores ignores; -ignores *root_ignores;+extern ignores *root_ignores;  extern const char *evil_hardcoded_ignore_files[]; extern const char *ignore_pattern_files[];

src/log.c

@@ -4,6 +4,7 @@ #include "log.h" #include "util.h" +pthread_mutex_t print_mtx = PTHREAD_MUTEX_INITIALIZER; static enum log_level log_threshold = LOG_LEVEL_ERR;  void set_log_level(enum log_level threshold) {

src/log.h

@@ -9,7 +9,7 @@ #include <pthread.h> #endif -pthread_mutex_t print_mtx;+extern pthread_mutex_t print_mtx;  enum log_level {     LOG_LEVEL_DEBUG = 10,

src/options.c

@@ -20,6 +20,8 @@ const char *color_line_number = "\033[1;33m"; /* bold yellow */ const char *color_match = "\033[30;43m";      /* black with yellow background */ const char *color_path = "\033[1;32m";        /* bold green */ +cli_options opts;+ /* TODO: try to obey out_fd? */ void usage(void) {     printf("\n");

src/options.h

@@ -92,7 +92,7 @@ typedef struct { } cli_options;  /* global options. parse_options gives it sane values, everything else reads from it */-cli_options opts;+extern cli_options opts;  typedef struct option option_t; 

src/search.c

@@ -2,6 +2,19 @@ #include "print.h" #include "scandir.h" +size_t alpha_skip_lookup[256];+size_t *find_skip_lookup;+uint8_t h_table[H_SIZE] __attribute__((aligned(64)));++work_queue_t *work_queue = NULL;+work_queue_t *work_queue_tail = NULL;+int done_adding_files = 0;+pthread_cond_t files_ready = PTHREAD_COND_INITIALIZER;+pthread_mutex_t stats_mtx = PTHREAD_MUTEX_INITIALIZER;+pthread_mutex_t work_queue_mtx = PTHREAD_MUTEX_INITIALIZER;++symdir_t *symhash = NULL;+ /* Returns: -1 if skipped, otherwise # of matches */ ssize_t search_buf(const char *buf, const size_t buf_len,                    const char *dir_full_path) {

src/search.h

@@ -31,9 +31,9 @@ #include "uthash.h" #include "util.h" -size_t alpha_skip_lookup[256];-size_t *find_skip_lookup;-uint8_t h_table[H_SIZE] __attribute__((aligned(64)));+extern size_t alpha_skip_lookup[256];+extern size_t *find_skip_lookup;+extern uint8_t h_table[H_SIZE] __attribute__((aligned(64)));  struct work_queue_t {     char *path;@@ -41,12 +41,12 @@ struct work_queue_t { }; typedef struct work_queue_t work_queue_t; -work_queue_t *work_queue;-work_queue_t *work_queue_tail;-int done_adding_files;-pthread_cond_t files_ready;-pthread_mutex_t stats_mtx;-pthread_mutex_t work_queue_mtx;+extern work_queue_t *work_queue;+extern work_queue_t *work_queue_tail;+extern int done_adding_files;+extern pthread_cond_t files_ready;+extern pthread_mutex_t stats_mtx;+extern pthread_mutex_t work_queue_mtx;   /* For symlink loop detection */@@ -64,7 +64,7 @@ typedef struct {     UT_hash_handle hh; } symdir_t; -symdir_t *symhash;+extern symdir_t *symhash;  ssize_t search_buf(const char *buf, const size_t buf_len,                    const char *dir_full_path);

src/util.c

@@ -21,6 +21,8 @@     }                                     \     return ptr; +FILE *out_fd = NULL;+ag_stats stats; void *ag_malloc(size_t size) {     void *ptr = malloc(size);     CHECK_AND_RETURN(ptr)

src/util.h

@@ -12,7 +12,7 @@ #include "log.h" #include "options.h" -FILE *out_fd;+extern FILE *out_fd;  #ifndef TRUE #define TRUE 1@@ -51,7 +51,7 @@ typedef struct { } ag_stats;  -ag_stats stats;+extern ag_stats stats;  /* Union to translate between chars and words without violating strict aliasing */ typedef union {