summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-03-17 18:41:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-17 19:18:41 (GMT)
commit379642bcd8d89db52feba88a651e4e56d6ac5767 (patch)
treef5be3dadc81d917494309cb9da7c946e6580de72
parente6fac7f3d3e313a93fe9b1243917669267b33153 (diff)
downloadgit-379642bcd8d89db52feba88a651e4e56d6ac5767.zip
git-379642bcd8d89db52feba88a651e4e56d6ac5767.tar.gz
git-379642bcd8d89db52feba88a651e4e56d6ac5767.tar.bz2
grep: set default output method
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--grep.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/grep.c b/grep.c
index 0dbdc1d..56ef0ec 100644
--- a/grep.c
+++ b/grep.c
@@ -12,6 +12,11 @@ static int grep_source_is_binary(struct grep_source *gs);
static struct grep_opt grep_defaults;
+static void std_output(struct grep_opt *opt, const void *buf, size_t size)
+{
+ fwrite(buf, size, 1, stdout);
+}
+
/*
* Initialize the grep_defaults template with hardcoded defaults.
* We could let the compiler do this, but without C99 initializers
@@ -42,6 +47,7 @@ void init_grep_defaults(void)
color_set(opt->color_selected, "");
color_set(opt->color_sep, GIT_COLOR_CYAN);
opt->color = -1;
+ opt->output = std_output;
}
static int parse_pattern_type_arg(const char *opt, const char *arg)
@@ -152,6 +158,7 @@ void grep_init(struct grep_opt *opt, const char *prefix)
opt->pathname = def->pathname;
opt->regflags = def->regflags;
opt->relative = def->relative;
+ opt->output = def->output;
color_set(opt->color_context, def->color_context);
color_set(opt->color_filename, def->color_filename);
@@ -1379,11 +1386,6 @@ static int look_ahead(struct grep_opt *opt,
return 0;
}
-static void std_output(struct grep_opt *opt, const void *buf, size_t size)
-{
- fwrite(buf, size, 1, stdout);
-}
-
static int fill_textconv_grep(struct userdiff_driver *driver,
struct grep_source *gs)
{