mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: fix builds with with no thread support

Browse Source 
Commit 0281e487fd ("grep: optionally recurse into submodules")
added functions grep_submodule() and grep_submodule_launch() which
use "struct work_item" which is defined only when thread support
is available.

The original implementation of grep_submodule() used the "struct
work_item" in order to gain access to a strbuf to store its output which
was to be printed at a later point in time.  This differs from how both
grep_file() and grep_sha1() handle their output.  This patch eliminates
the reliance on the "struct work_item" and instead opts to use the
output function stored in the output field of the "struct grep_opt"
object directly, making it behave similarly to both grep_file() and
grep_sha1().

Reported-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
Signed-off-by: Brandon Williams <bmwill@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-03-17 11:41:55 -07:00
committed by Junio C Hamano
parent 379642bcd8
commit 2225e1ea20
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin/grep.c
View File

@ -538,7 +538,7 @@ static int grep_submodule_launch(struct grep_opt *opt,
int status, i; int status, i;
const char *end_of_base; const char *end_of_base;
const char *name; const char *name;
struct work_item *w = opt->output_priv; struct strbuf child_output = STRBUF_INIT;
end_of_base = strchr(gs->name, ':'); end_of_base = strchr(gs->name, ':');
if (gs->identifier && end_of_base) if (gs->identifier && end_of_base)
@ -593,14 +593,16 @@ static int grep_submodule_launch(struct grep_opt *opt,
* child process. A '0' indicates a hit, a '1' indicates no hit and * child process. A '0' indicates a hit, a '1' indicates no hit and
* anything else is an error. * anything else is an error.
*/ */
status = capture_command(&cp, &w->out, 0); status = capture_command(&cp, &child_output, 0);
if (status && (status != 1)) { if (status && (status != 1)) {
/* flush the buffer */ /* flush the buffer */
write_or_die(1, w->out.buf, w->out.len); write_or_die(1, child_output.buf, child_output.len);
die("process for submodule '%s' failed with exit code: %d", die("process for submodule '%s' failed with exit code: %d",
gs->name, status); gs->name, status);
} }
opt->output(opt, child_output.buf, child_output.len);
strbuf_release(&child_output);
/* invert the return code to make a hit equal to 1 */ /* invert the return code to make a hit equal to 1 */
return !status; return !status;
} }
@ -641,19 +643,14 @@ static int grep_submodule(struct grep_opt *opt, const unsigned char *sha1,
} else } else
#endif #endif
{ {
struct work_item w; struct grep_source gs;
int hit; int hit;
grep_source_init(&w.source, GREP_SOURCE_SUBMODULE, grep_source_init(&gs, GREP_SOURCE_SUBMODULE,
filename, path, sha1); filename, path, sha1);
strbuf_init(&w.out, 0); hit = grep_submodule_launch(opt, &gs);
opt->output_priv = &w;
hit = grep_submodule_launch(opt, &w.source);
write_or_die(1, w.out.buf, w.out.len); grep_source_clear(&gs);
grep_source_clear(&w.source);
strbuf_release(&w.out);
return hit; return hit;
} }
} }