X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=grep.h;h=a65280026d5dee8ab059bead79f05d6a1111147a;hb=cd4c4e2481dd6fcb7ceb39242fa722993f8c0ab1;hp=06621fe663545af52fbc42827a8374ab5bd42f38;hpb=ed36a48e6d246f4f60d44b27e8c1e660151cd0b4;p=git.git

diff --git a/grep.h b/grep.h
index 06621fe66..a65280026 100644
--- a/grep.h
+++ b/grep.h
@@ -1,6 +1,13 @@
 #ifndef GREP_H
 #define GREP_H
 #include "color.h"
+#ifdef USE_LIBPCRE
+#include <pcre.h>
+#else
+typedef int pcre;
+typedef int pcre_extra;
+#endif
+#include "kwset.h"
 
 enum grep_pat_token {
 	GREP_PATTERN,
@@ -33,6 +40,9 @@ struct grep_pat {
 	size_t patternlen;
 	enum grep_header_field field;
 	regex_t regexp;
+	pcre *pcre_regexp;
+	pcre_extra *pcre_extra_info;
+	kwset_t kws;
 	unsigned fixed:1;
 	unsigned ignore_case:1;
 	unsigned word_regexp:1;
@@ -83,12 +93,14 @@ struct grep_opt {
 #define GREP_BINARY_TEXT	2
 	int binary;
 	int extended;
+	int pcre;
 	int relative;
 	int pathname;
 	int null_following_name;
 	int color;
 	int max_depth;
 	int funcname;
+	int funcbody;
 	char color_context[COLOR_MAXLEN];
 	char color_filename[COLOR_MAXLEN];
 	char color_function[COLOR_MAXLEN];
@@ -101,6 +113,8 @@ struct grep_opt {
 	unsigned post_context;
 	unsigned last_shown;
 	int show_hunk_mark;
+	int file_break;
+	int heading;
 	void *priv;
 
 	void (*output)(struct grep_opt *opt, const void *data, size_t size);