X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-grep.c;h=ed87a5550c7dab6de56327b8acc0e3e2c897e39e;hb=26d0a976e88cf2e1ccb0b4d8172e9ce24d144d1f;hp=a561612e7efd31f92a8becd8f94516877146ad7f;hpb=c1e4572b7d3447949ed2da1ab290217a70cf3933;p=git.git

diff --git a/builtin-grep.c b/builtin-grep.c
index a561612e7..ed87a5550 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -138,6 +138,7 @@ struct grep_opt {
 	unsigned binary:2;
 	unsigned extended:1;
 	unsigned relative:1;
+	unsigned pathname:1;
 	int regflags;
 	unsigned pre_context;
 	unsigned post_context;
@@ -175,61 +176,12 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 	}
 }
 
-#if DEBUG
-static inline void indent(int in)
-{
-	int i;
-	for (i = 0; i < in; i++) putchar(' ');
-}
-
-static void dump_pattern_exp(struct grep_expr *x, int in)
-{
-	switch (x->node) {
-	case GREP_NODE_ATOM:
-		indent(in);
-		puts(x->u.atom->pattern);
-		break;
-	case GREP_NODE_NOT:
-		indent(in);
-		puts("--not");
-		dump_pattern_exp(x->u.unary, in+1);
-		break;
-	case GREP_NODE_AND:
-		dump_pattern_exp(x->u.binary.left, in+1);
-		indent(in);
-		puts("--and");
-		dump_pattern_exp(x->u.binary.right, in+1);
-		break;
-	case GREP_NODE_OR:
-		dump_pattern_exp(x->u.binary.left, in+1);
-		indent(in);
-		puts("--or");
-		dump_pattern_exp(x->u.binary.right, in+1);
-		break;
-	}
-}
-
-static void looking_at(const char *msg, struct grep_pat **list)
-{
-	struct grep_pat *p = *list;
-	fprintf(stderr, "%s: looking at ", msg);
-	if (!p)
-		fprintf(stderr, "empty\n");
-	else
-		fprintf(stderr, "<%s>\n", p->pattern);
-}
-#else
-#define looking_at(a,b) do {} while(0)
-#endif
-
 static struct grep_expr *compile_pattern_expr(struct grep_pat **);
 static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
 {
 	struct grep_pat *p;
 	struct grep_expr *x;
 
-	looking_at("atom", list);
-
 	p = *list;
 	switch (p->token) {
 	case GREP_PATTERN: /* atom */
@@ -257,8 +209,6 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
 	struct grep_pat *p;
 	struct grep_expr *x;
 
-	looking_at("not", list);
-
 	p = *list;
 	switch (p->token) {
 	case GREP_NOT:
@@ -281,8 +231,6 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
 	struct grep_pat *p;
 	struct grep_expr *x, *y, *z;
 
-	looking_at("and", list);
-
 	x = compile_pattern_not(list);
 	p = *list;
 	if (p && p->token == GREP_AND) {
@@ -306,8 +254,6 @@ static struct grep_expr *compile_pattern_or(struct grep_pat **list)
 	struct grep_pat *p;
 	struct grep_expr *x, *y, *z;
 
-	looking_at("or", list);
-
 	x = compile_pattern_and(list);
 	p = *list;
 	if (x && p && p->token != GREP_CLOSE_PAREN) {
@@ -325,8 +271,6 @@ static struct grep_expr *compile_pattern_or(struct grep_pat **list)
 
 static struct grep_expr *compile_pattern_expr(struct grep_pat **list)
 {
-	looking_at("expr", list);
-
 	return compile_pattern_or(list);
 }
 
@@ -350,9 +294,6 @@ static void compile_patterns(struct grep_opt *opt)
 	 */
 	p = opt->pattern_list;
 	opt->pattern_expression = compile_pattern_expr(&p);
-#if DEBUG
-	dump_pattern_exp(opt->pattern_expression, 0);
-#endif
 	if (p)
 		die("incomplete pattern expression: %s", p->pattern);
 }
@@ -376,7 +317,8 @@ static int word_char(char ch)
 static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
 		      const char *name, unsigned lno, char sign)
 {
-	printf("%s%c", name, sign);
+	if (opt->pathname)
+		printf("%s%c", name, sign);
 	if (opt->linenum)
 		printf("%d%c", lno, sign);
 	printf("%.*s\n", (int)(eol-bol), bol);
@@ -390,9 +332,7 @@ 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;
+	return !!memchr(ptr, 0, size);
 }
 
 static int fixmatch(const char *pattern, char *line, regmatch_t *match)
@@ -753,6 +693,8 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
 		push_arg("-F");
 	if (opt->linenum)
 		push_arg("-n");
+	if (!opt->pathname)
+		push_arg("-h");
 	if (opt->regflags & REG_EXTENDED)
 		push_arg("-E");
 	if (opt->regflags & REG_ICASE)
@@ -973,6 +915,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	memset(&opt, 0, sizeof(opt));
 	opt.prefix_length = (prefix && *prefix) ? strlen(prefix) : 0;
 	opt.relative = 1;
+	opt.pathname = 1;
 	opt.pattern_tail = &opt.pattern_list;
 	opt.regflags = REG_NEWLINE;
 
@@ -1032,10 +975,12 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			opt.linenum = 1;
 			continue;
 		}
+		if (!strcmp("-h", arg)) {
+			opt.pathname = 0;
+			continue;
+		}
 		if (!strcmp("-H", arg)) {
-			/* We always show the pathname, so this
-			 * is a noop.
-			 */
+			opt.pathname = 1;
 			continue;
 		}
 		if (!strcmp("-l", arg) ||
@@ -1110,7 +1055,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 				/* ignore empty line like grep does */
 				if (!buf[0])
 					continue;
-				add_pattern(&opt, strdup(buf), argv[1], ++lno,
+				add_pattern(&opt, xstrdup(buf), argv[1], ++lno,
 					    GREP_PATTERN);
 			}
 			fclose(patterns);