Merge branch 'maint'

[git.git] / grep.h

diff --git a/grep.h b/grep.h
index f00db0e40273c7cca1695ddc6be00921f9da8ef4..d35bc29bfd76f27c066f40dcb3f31078b4100059 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -32,6 +32,7 @@ struct grep_pat {
        enum grep_header_field field;
        regex_t regexp;
        unsigned fixed:1;
+       unsigned ignore_case:1;
        unsigned word_regexp:1;
 };
 
@@ -58,11 +59,15 @@ struct grep_expr {
 struct grep_opt {
        struct grep_pat *pattern_list;
        struct grep_pat **pattern_tail;
+       struct grep_pat *header_list;
+       struct grep_pat **header_tail;
        struct grep_expr *pattern_expression;
+       const char *prefix;
        int prefix_length;
        regex_t regexp;
        int linenum;
        int invert;
+       int ignore_case;
        int status_only;
        int name_only;
        int unmatch_name_only;
@@ -79,15 +84,18 @@ struct grep_opt {
        int pathname;
        int null_following_name;
        int color;
+       int max_depth;
        int funcname;
        char color_match[COLOR_MAXLEN];
-       const char *color_external;
        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);
@@ -96,4 +104,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