X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=grep.h;h=2c4bdaca823c71f7628fb7626b7222e69db332a8;hb=00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb;hp=0c61b00cbf3c4f059aedc02d487b4103eea31823;hpb=01ddb1ff41cdbd98e257aa4c119a7d51a21f80be;p=git.git diff --git a/grep.h b/grep.h index 0c61b00cb..2c4bdaca8 100644 --- a/grep.h +++ b/grep.h @@ -84,13 +84,22 @@ struct grep_opt { int color; int max_depth; int funcname; + char color_context[COLOR_MAXLEN]; + char color_filename[COLOR_MAXLEN]; + char color_function[COLOR_MAXLEN]; + char color_lineno[COLOR_MAXLEN]; char color_match[COLOR_MAXLEN]; + char color_selected[COLOR_MAXLEN]; + char color_sep[COLOR_MAXLEN]; int regflags; unsigned pre_context; unsigned post_context; unsigned last_shown; int show_hunk_mark; void *priv; + + void (*output)(struct grep_opt *opt, const void *data, size_t size); + void *output_priv; }; extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t); @@ -99,4 +108,7 @@ extern void compile_grep_patterns(struct grep_opt *opt); extern void free_grep_patterns(struct grep_opt *opt); extern int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size); +extern struct grep_opt *grep_opt_dup(const struct grep_opt *opt); +extern int grep_threads_ok(const struct grep_opt *opt); + #endif