1 files changed, 67 insertions, 1 deletions

diff --git a/git.h b/git.h
index 922a167..b1e4828 100644
--- a/git.h
+++ b/git.h
@@ -10,49 +10,49 @@
 #ifndef FLEX_ARRAY
 #if defined(__GNUC__) && (__GNUC__ < 3)
 #define FLEX_ARRAY 0
 #else
 #define FLEX_ARRAY /* empty */
 #endif
 #endif
 
 
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <time.h>
-
+#include <regex.h>
 
 /* On most systems <limits.h> would have given us this, but
  * not on some systems (e.g. GNU/Hurd).
  */
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
 
 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #else
 #define NORETURN
 #ifndef __attribute__
 #define __attribute__(x)
 #endif
 #endif
 
 
 extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
 
 
 static inline char* xstrdup(const char *str)
 {
         char *ret = strdup(str);
@@ -135,48 +135,114 @@ extern int sha1_object_info(const unsigned char *, char *, unsigned long *);
 extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
 
 extern int get_sha1(const char *str, unsigned char *sha1);
 extern int get_sha1_hex(const char *hex, unsigned char *sha1);
         extern char *sha1_to_hex(const unsigned char *sha1);/* static buffer result! */
 
 static inline int is_null_sha1(const unsigned char *sha1)
 {
         return !memcmp(sha1, null_sha1, 20);
 }
 static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
 {
         return memcmp(sha1, sha2, 20);
 }
 static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
 {
         memcpy(sha_dst, sha_src, 20);
 }
 static inline void hashclr(unsigned char *hash)
 {
         memset(hash, 0, 20);
 }
 
 
+/*
+ * from git:grep.h
+ */
+
+enum grep_pat_token {
+        GREP_PATTERN,
+        GREP_PATTERN_HEAD,
+        GREP_PATTERN_BODY,
+        GREP_AND,
+        GREP_OPEN_PAREN,
+        GREP_CLOSE_PAREN,
+        GREP_NOT,
+        GREP_OR,
+};
+
+enum grep_context {
+        GREP_CONTEXT_HEAD,
+        GREP_CONTEXT_BODY,
+};
+
+struct grep_pat {
+        struct grep_pat *next;
+        const char *origin;
+        int no;
+        enum grep_pat_token token;
+        const char *pattern;
+        regex_t regexp;
+};
+
+enum grep_expr_node {
+        GREP_NODE_ATOM,
+        GREP_NODE_NOT,
+        GREP_NODE_AND,
+        GREP_NODE_OR,
+};
+
+struct grep_opt {
+        struct grep_pat *pattern_list;
+        struct grep_pat **pattern_tail;
+        struct grep_expr *pattern_expression;
+        int prefix_length;
+        regex_t regexp;
+        unsigned linenum:1;
+        unsigned invert:1;
+        unsigned status_only:1;
+        unsigned name_only:1;
+        unsigned unmatch_name_only:1;
+        unsigned count:1;
+        unsigned word_regexp:1;
+        unsigned fixed:1;
+        unsigned all_match:1;
+#define GREP_BINARY_DEFAULT     0
+#define GREP_BINARY_NOMATCH     1
+#define GREP_BINARY_TEXT        2
+        unsigned binary:2;
+        unsigned extended:1;
+        unsigned relative:1;
+        unsigned pathname:1;
+        int regflags;
+        unsigned pre_context;
+        unsigned post_context;
+};
+
+
+extern void compile_grep_patterns(struct grep_opt *opt);
+extern void free_grep_patterns(struct grep_opt *opt);
 
 
 /*
  * from git:object.h 
  */
 
 struct object_list {
         struct object *item;
         struct object_list *next;
 };
 
 struct object_refs {
         unsigned count;
         struct object *base;
         struct object *ref[FLEX_ARRAY]; /* more */
 };
 
 struct object_array {
         unsigned int nr;
         unsigned int alloc;
         struct object_array_entry {
                 struct object *item;
                 const char *name;
         } *objects;