X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-grep.c;h=6973c66704326804def00a22bfdcdb487dcad4c2;hb=088b084bbbb7c076a85db941ad60edce582017b4;hp=d09ddf04850baa17842975ff54063f5acfce8cfe;hpb=93872e07008510340eec951f0d037f7b3a0b8567;p=git.git

diff --git a/builtin-grep.c b/builtin-grep.c
index d09ddf048..6973c6670 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -29,10 +29,11 @@ static int pathspec_matches(const char **paths, const char *name)
 		int matchlen = strlen(match);
 		const char *cp, *meta;
 
-		if ((matchlen <= namelen) &&
-		    !strncmp(name, match, matchlen) &&
-		    (match[matchlen-1] == '/' ||
-		     name[matchlen] == '\0' || name[matchlen] == '/'))
+		if (!matchlen ||
+		    ((matchlen <= namelen) &&
+		     !strncmp(name, match, matchlen) &&
+		     (match[matchlen-1] == '/' ||
+		      name[matchlen] == '\0' || name[matchlen] == '/')))
 			return 1;
 		if (!fnmatch(match, name, 0))
 			return 1;
@@ -445,7 +446,7 @@ static int exec_grep(int argc, const char **argv)
 
 static int external_grep(struct grep_opt *opt, const char **paths, int cached)
 {
-	int i, nr, argc, hit, len;
+	int i, nr, argc, hit, len, status;
 	const char *argv[MAXARGS+1];
 	char randarg[ARGBUF];
 	char *argptr = randarg;
@@ -459,6 +460,8 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
 		push_arg("-n");
 	if (opt->regflags & REG_EXTENDED)
 		push_arg("-E");
+	if (opt->regflags & REG_ICASE)
+		push_arg("-i");
 	if (opt->word_regexp)
 		push_arg("-w");
 	if (opt->name_only)
@@ -518,7 +521,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
 	argc = nr;
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
-		const char *name;
+		char *name;
 		if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode)))
 			continue;
 		if (!pathspec_matches(paths, ce->name))
@@ -533,12 +536,17 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
 		argv[argc++] = name;
 		if (argc < MAXARGS)
 			continue;
-		hit += exec_grep(argc, argv);
+		status = exec_grep(argc, argv);
+		if (0 < status)
+			hit = 1;
 		argc = nr;
 	}
-	if (argc > nr)
-		hit += exec_grep(argc, argv);
-	return 0;
+	if (argc > nr) {
+		status = exec_grep(argc, argv);
+		if (0 < status)
+			hit = 1;
+	}
+	return hit;
 }
 
 static int grep_cache(struct grep_opt *opt, const char **paths, int cached)
@@ -578,11 +586,9 @@ static int grep_tree(struct grep_opt *opt, const char **paths,
 		     struct tree_desc *tree,
 		     const char *tree_name, const char *base)
 {
-	unsigned mode;
 	int len;
 	int hit = 0;
-	const char *path;
-	const unsigned char *sha1;
+	struct name_entry entry;
 	char *down;
 	char *path_buf = xmalloc(PATH_MAX + strlen(tree_name) + 100);
 
@@ -597,36 +603,32 @@ static int grep_tree(struct grep_opt *opt, const char **paths,
 	}
 	len = strlen(path_buf);
 
-	while (tree->size) {
-		int pathlen;
-		sha1 = tree_entry_extract(tree, &path, &mode);
-		pathlen = strlen(path);
-		strcpy(path_buf + len, path);
+	while (tree_entry(tree, &entry)) {
+		strcpy(path_buf + len, entry.path);
 
-		if (S_ISDIR(mode))
+		if (S_ISDIR(entry.mode))
 			/* Match "abc/" against pathspec to
 			 * decide if we want to descend into "abc"
 			 * directory.
 			 */
-			strcpy(path_buf + len + pathlen, "/");
+			strcpy(path_buf + len + entry.pathlen, "/");
 
 		if (!pathspec_matches(paths, down))
 			;
-		else if (S_ISREG(mode))
-			hit |= grep_sha1(opt, sha1, path_buf);
-		else if (S_ISDIR(mode)) {
+		else if (S_ISREG(entry.mode))
+			hit |= grep_sha1(opt, entry.sha1, path_buf);
+		else if (S_ISDIR(entry.mode)) {
 			char type[20];
 			struct tree_desc sub;
 			void *data;
-			data = read_sha1_file(sha1, type, &sub.size);
+			data = read_sha1_file(entry.sha1, type, &sub.size);
 			if (!data)
 				die("unable to read tree (%s)",
-				    sha1_to_hex(sha1));
+				    sha1_to_hex(entry.sha1));
 			sub.buf = data;
 			hit |= grep_tree(opt, paths, &sub, tree_name, down);
 			free(data);
 		}
-		update_tree_entry(tree);
 	}
 	return hit;
 }
@@ -634,10 +636,9 @@ static int grep_tree(struct grep_opt *opt, const char **paths,
 static int grep_object(struct grep_opt *opt, const char **paths,
 		       struct object *obj, const char *name)
 {
-	if (!strcmp(obj->type, blob_type))
+	if (obj->type == TYPE_BLOB)
 		return grep_sha1(opt, obj->sha1, name);
-	if (!strcmp(obj->type, commit_type) ||
-	    !strcmp(obj->type, tree_type)) {
+	if (obj->type == TYPE_COMMIT || obj->type == TYPE_TREE) {
 		struct tree_desc tree;
 		void *data;
 		int hit;
@@ -650,19 +651,26 @@ static int grep_object(struct grep_opt *opt, const char **paths,
 		free(data);
 		return hit;
 	}
-	die("unable to grep from object of type %s", obj->type);
+	die("unable to grep from object of type %s", typename(obj->type));
 }
 
 static const char builtin_grep_usage[] =
 "git-grep <option>* <rev>* [-e] <pattern> [<path>...]";
 
+static const char emsg_invalid_context_len[] =
+"%s: invalid context length argument";
+static const char emsg_missing_context_len[] =
+"missing context length argument";
+static const char emsg_missing_argument[] =
+"option requires an argument -%s";
+
 int cmd_grep(int argc, const char **argv, char **envp)
 {
 	int hit = 0;
 	int cached = 0;
 	int seen_dashdash = 0;
 	struct grep_opt opt;
-	struct object_list *list, **tail, *object_list = NULL;
+	struct object_array list = { 0, 0, NULL };
 	const char *prefix = setup_git_directory();
 	const char **paths = NULL;
 	int i;
@@ -682,7 +690,6 @@ int cmd_grep(int argc, const char **argv, char **envp)
 	 * that continues up to the -- (if exists), and then paths.
 	 */
 
-	tail = &object_list;
 	while (1 < argc) {
 		const char *arg = argv[1];
 		argc--; argv++;
@@ -764,7 +771,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
 			case 'A': case 'B': case 'C':
 				if (!arg[2]) {
 					if (argc <= 1)
-						usage(builtin_grep_usage);
+						die(emsg_missing_context_len);
 					scan = *++argv;
 					argc--;
 				}
@@ -776,7 +783,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
 				break;
 			}
 			if (sscanf(scan, "%u", &num) != 1)
-				usage(builtin_grep_usage);
+				die(emsg_invalid_context_len, scan);
 			switch (arg[1]) {
 			case 'A':
 				opt.post_context = num;
@@ -795,7 +802,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
 			int lno = 0;
 			char buf[1024];
 			if (argc <= 1)
-				usage(builtin_grep_usage);
+				die(emsg_missing_argument, arg);
 			patterns = fopen(argv[1], "r");
 			if (!patterns)
 				die("'%s': %s", argv[1], strerror(errno));
@@ -820,10 +827,14 @@ int cmd_grep(int argc, const char **argv, char **envp)
 				argc--;
 				continue;
 			}
-			usage(builtin_grep_usage);
+			die(emsg_missing_argument, arg);
 		}
-		if (!strcmp("--", arg))
+		if (!strcmp("--", arg)) {
+			/* later processing wants to have this at argv[1] */
+			argv--;
+			argc++;
 			break;
+		}
 		if (*arg == '-')
 			usage(builtin_grep_usage);
 
@@ -856,12 +867,9 @@ int cmd_grep(int argc, const char **argv, char **envp)
 		/* Is it a rev? */
 		if (!get_sha1(arg, sha1)) {
 			struct object *object = parse_object(sha1);
-			struct object_list *elem;
 			if (!object)
 				die("bad object %s", arg);
-			elem = object_list_insert(object, tail);
-			elem->name = arg;
-			tail = &elem->next;
+			add_object_array(object, arg, &list);
 			continue;
 		}
 		if (!strcmp(arg, "--")) {
@@ -886,16 +894,16 @@ int cmd_grep(int argc, const char **argv, char **envp)
 		paths[1] = NULL;
 	}
 
-	if (!object_list)
+	if (!list.nr)
 		return !grep_cache(&opt, paths, cached);
 
 	if (cached)
 		die("both --cached and trees are given.");
 
-	for (list = object_list; list; list = list->next) {
+	for (i = 0; i < list.nr; i++) {
 		struct object *real_obj;
-		real_obj = deref_tag(list->item, NULL, 0);
-		if (grep_object(&opt, paths, real_obj, list->name))
+		real_obj = deref_tag(list.objects[i].item, NULL, 0);
+		if (grep_object(&opt, paths, real_obj, list.objects[i].name))
 			hit = 1;
 	}
 	return !hit;