mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
41b59bfcb1
There is currently no way for users to tell git-grep that a particular path is or is not a binary file; instead, grep always relies on its auto-detection (or the user specifying "-a" to treat all binary-looking files like text). This patch teaches git-grep to use the same attribute lookup that is used by git-diff. We could add a new "grep" flag, but that is unnecessarily complex and unlikely to be useful. Despite the name, the "-diff" attribute (or "diff=foo" and the associated diff.foo.binary config option) are really about describing the contents of the path. It's simply historical that diff was the only thing that cared about these attributes in the past. And if this simple approach turns out to be insufficient, we still have a backwards-compatible path forward: we can add a separate "grep" attribute, and fall back to respecting "diff" if it is unset. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
188 lines
4.1 KiB
C
188 lines
4.1 KiB
C
#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"
|
|
#include "thread-utils.h"
|
|
#include "userdiff.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
|
|
};
|
|
|
|
enum grep_header_field {
|
|
GREP_HEADER_AUTHOR = 0,
|
|
GREP_HEADER_COMMITTER
|
|
};
|
|
#define GREP_HEADER_FIELD_MAX (GREP_HEADER_COMMITTER + 1)
|
|
|
|
struct grep_pat {
|
|
struct grep_pat *next;
|
|
const char *origin;
|
|
int no;
|
|
enum grep_pat_token token;
|
|
const char *pattern;
|
|
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;
|
|
};
|
|
|
|
enum grep_expr_node {
|
|
GREP_NODE_ATOM,
|
|
GREP_NODE_NOT,
|
|
GREP_NODE_AND,
|
|
GREP_NODE_TRUE,
|
|
GREP_NODE_OR
|
|
};
|
|
|
|
struct grep_expr {
|
|
enum grep_expr_node node;
|
|
unsigned hit;
|
|
union {
|
|
struct grep_pat *atom;
|
|
struct grep_expr *unary;
|
|
struct {
|
|
struct grep_expr *left;
|
|
struct grep_expr *right;
|
|
} binary;
|
|
} u;
|
|
};
|
|
|
|
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;
|
|
int count;
|
|
int word_regexp;
|
|
int fixed;
|
|
int all_match;
|
|
#define GREP_BINARY_DEFAULT 0
|
|
#define GREP_BINARY_NOMATCH 1
|
|
#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];
|
|
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;
|
|
int file_break;
|
|
int heading;
|
|
void *priv;
|
|
|
|
void (*output)(struct grep_opt *opt, const void *data, size_t size);
|
|
void *output_priv;
|
|
};
|
|
|
|
extern void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
|
|
extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
|
|
extern void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
|
|
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, char *buf, unsigned long size);
|
|
|
|
struct grep_source {
|
|
char *name;
|
|
|
|
enum grep_source_type {
|
|
GREP_SOURCE_SHA1,
|
|
GREP_SOURCE_FILE,
|
|
GREP_SOURCE_BUF,
|
|
} type;
|
|
void *identifier;
|
|
|
|
char *buf;
|
|
unsigned long size;
|
|
|
|
struct userdiff_driver *driver;
|
|
};
|
|
|
|
void grep_source_init(struct grep_source *gs, enum grep_source_type type,
|
|
const char *name, const void *identifier);
|
|
int grep_source_load(struct grep_source *gs);
|
|
void grep_source_clear_data(struct grep_source *gs);
|
|
void grep_source_clear(struct grep_source *gs);
|
|
void grep_source_load_driver(struct grep_source *gs);
|
|
int grep_source_is_binary(struct grep_source *gs);
|
|
|
|
int grep_source(struct grep_opt *opt, struct grep_source *gs);
|
|
|
|
extern struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
|
|
extern int grep_threads_ok(const struct grep_opt *opt);
|
|
|
|
#ifndef NO_PTHREADS
|
|
/*
|
|
* Mutex used around access to the attributes machinery if
|
|
* opt->use_threads. Must be initialized/destroyed by callers!
|
|
*/
|
|
extern int grep_use_locks;
|
|
extern pthread_mutex_t grep_attr_mutex;
|
|
extern pthread_mutex_t grep_read_mutex;
|
|
|
|
static inline void grep_read_lock(void)
|
|
{
|
|
if (grep_use_locks)
|
|
pthread_mutex_lock(&grep_read_mutex);
|
|
}
|
|
|
|
static inline void grep_read_unlock(void)
|
|
{
|
|
if (grep_use_locks)
|
|
pthread_mutex_unlock(&grep_read_mutex);
|
|
}
|
|
|
|
#else
|
|
#define grep_read_lock()
|
|
#define grep_read_unlock()
|
|
#endif
|
|
|
|
#endif
|