struct grep_pat {
struct grep_pat *next;
+ const char *origin;
+ int no;
const char *pattern;
regex_t regexp;
};
unsigned linenum:1;
unsigned invert:1;
unsigned name_only:1;
+ unsigned unmatch_name_only:1;
unsigned count:1;
unsigned word_regexp:1;
+#define GREP_BINARY_DEFAULT 0
+#define GREP_BINARY_NOMATCH 1
+#define GREP_BINARY_TEXT 2
+ unsigned binary:2;
int regflags;
unsigned pre_context;
unsigned post_context;
};
-static void add_pattern(struct grep_opt *opt, const char *pat)
+static void add_pattern(struct grep_opt *opt, const char *pat,
+ const char *origin, int no)
{
struct grep_pat *p = xcalloc(1, sizeof(*p));
p->pattern = pat;
+ p->origin = origin;
+ p->no = no;
*opt->pattern_tail = p;
opt->pattern_tail = &p->next;
p->next = NULL;
int err = regcomp(&p->regexp, p->pattern, opt->regflags);
if (err) {
char errbuf[1024];
+ char where[1024];
+ if (p->no)
+ sprintf(where, "In '%s' at %d, ",
+ p->origin, p->no);
+ else if (p->origin)
+ sprintf(where, "%s, ", p->origin);
+ else
+ where[0] = 0;
regerror(err, &p->regexp, errbuf, 1024);
regfree(&p->regexp);
- die("'%s': %s", p->pattern, errbuf);
+ die("%s'%s': %s", where, p->pattern, errbuf);
}
}
}
printf("%.*s\n", (int)(eol-bol), bol);
}
+/*
+ * NEEDSWORK: share code with diff.c
+ */
+#define FIRST_FEW_BYTES 8000
+static int buffer_is_binary(const char *ptr, unsigned long size)
+{
+ if (FIRST_FEW_BYTES < size)
+ size = FIRST_FEW_BYTES;
+ if (memchr(ptr, 0, size))
+ return 1;
+ return 0;
+}
+
static int grep_buffer(struct grep_opt *opt, const char *name,
char *buf, unsigned long size)
{
} *prev = NULL, *pcl;
unsigned last_hit = 0;
unsigned last_shown = 0;
+ int binary_match_only = 0;
const char *hunk_mark = "";
unsigned count = 0;
+ if (buffer_is_binary(buf, size)) {
+ switch (opt->binary) {
+ case GREP_BINARY_DEFAULT:
+ binary_match_only = 1;
+ break;
+ case GREP_BINARY_NOMATCH:
+ return 0; /* Assume unmatch */
+ break;
+ default:
+ break;
+ }
+ }
+
if (opt->pre_context)
prev = xcalloc(opt->pre_context, sizeof(*prev));
if (opt->pre_context || opt->post_context)
*/
if (opt->invert)
hit = !hit;
+ if (opt->unmatch_name_only) {
+ if (hit)
+ return 0;
+ goto next_line;
+ }
if (hit) {
count++;
+ if (binary_match_only) {
+ printf("Binary file %s matches\n", name);
+ return 1;
+ }
if (opt->name_only) {
printf("%s\n", name);
return 1;
prev->bol = bol;
prev->eol = eol;
}
+
+ next_line:
*eol = ch;
bol = eol + 1;
+ if (!left)
+ break;
left--;
lno++;
}
+
+ if (opt->unmatch_name_only) {
+ /* We did not see any hit, so we want to show this */
+ printf("%s\n", name);
+ return 1;
+ }
+
/* NEEDSWORK:
* The real "grep -c foo *.c" gives many "bar.c:0" lines,
* which feels mostly useless but sometimes useful. Maybe
{
int hit = 0;
int no_more_flags = 0;
- int seen_noncommit = 0;
int cached = 0;
struct grep_opt opt;
struct object_list *list, **tail, *object_list = NULL;
cached = 1;
continue;
}
+ if (!strcmp("-a", arg) ||
+ !strcmp("--text", arg)) {
+ opt.binary = GREP_BINARY_TEXT;
+ continue;
+ }
if (!strcmp("-i", arg) ||
!strcmp("--ignore-case", arg)) {
opt.regflags |= REG_ICASE;
continue;
}
+ if (!strcmp("-I", arg)) {
+ opt.binary = GREP_BINARY_NOMATCH;
+ continue;
+ }
if (!strcmp("-v", arg) ||
!strcmp("--invert-match", arg)) {
opt.invert = 1;
opt.name_only = 1;
continue;
}
+ if (!strcmp("-L", arg) ||
+ !strcmp("--files-without-match", arg)) {
+ opt.unmatch_name_only = 1;
+ continue;
+ }
if (!strcmp("-c", arg) ||
!strcmp("--count", arg)) {
opt.count = 1;
}
continue;
}
+ if (!strcmp("-f", arg)) {
+ FILE *patterns;
+ int lno = 0;
+ char buf[1024];
+ if (argc <= 1)
+ usage(builtin_grep_usage);
+ patterns = fopen(argv[1], "r");
+ if (!patterns)
+ die("'%s': %s", strerror(errno));
+ while (fgets(buf, sizeof(buf), patterns)) {
+ int len = strlen(buf);
+ if (buf[len-1] == '\n')
+ buf[len-1] = 0;
+ /* ignore empty line like grep does */
+ if (!buf[0])
+ continue;
+ add_pattern(&opt, strdup(buf), argv[1], ++lno);
+ }
+ fclose(patterns);
+ argv++;
+ argc--;
+ continue;
+ }
if (!strcmp("-e", arg)) {
if (1 < argc) {
- add_pattern(&opt, argv[1]);
+ add_pattern(&opt, argv[1], "-e option", 0);
argv++;
argc--;
continue;
if (!no_more_flags && *arg == '-')
usage(builtin_grep_usage);
if (!opt.pattern_list) {
- add_pattern(&opt, arg);
+ add_pattern(&opt, arg, "command line", 0);
break;
}
else {
if (!object_list)
return !grep_cache(&opt, paths, cached);
- /*
- * Do not walk "grep -e foo master next pu -- Documentation/"
- * but do walk "grep -e foo master..next -- Documentation/".
- * Ranged request mixed with a blob or tree object, like
- * "grep -e foo v1.0.0:Documentation/ master..next"
- * so detect that and complain.
- */
- for (list = object_list; list; list = list->next) {
- struct object *real_obj;
- real_obj = deref_tag(list->item, NULL, 0);
- if (strcmp(real_obj->type, commit_type))
- seen_noncommit = 1;
- }
+
if (cached)
- die("both --cached and revisions given.");
+ die("both --cached and trees are given.");
for (list = object_list; list; list = list->next) {
struct object *real_obj;