@@ -12,6 +12,11 @@ static int grep_source_is_binary(struct grep_source *gs);
12
12
13
13
static struct grep_opt grep_defaults ;
14
14
15
+ static void std_output (struct grep_opt * opt , const void * buf , size_t size )
16
+ {
17
+ fwrite (buf , size , 1 , stdout );
18
+ }
19
+
15
20
/*
16
21
* Initialize the grep_defaults template with hardcoded defaults.
17
22
* We could let the compiler do this, but without C99 initializers
@@ -42,6 +47,7 @@ void init_grep_defaults(void)
42
47
color_set (opt -> color_selected , "" );
43
48
color_set (opt -> color_sep , GIT_COLOR_CYAN );
44
49
opt -> color = -1 ;
50
+ opt -> output = std_output ;
45
51
}
46
52
47
53
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)
152
158
opt -> pathname = def -> pathname ;
153
159
opt -> regflags = def -> regflags ;
154
160
opt -> relative = def -> relative ;
161
+ opt -> output = def -> output ;
155
162
156
163
color_set (opt -> color_context , def -> color_context );
157
164
color_set (opt -> color_filename , def -> color_filename );
@@ -1379,11 +1386,6 @@ static int look_ahead(struct grep_opt *opt,
1379
1386
return 0 ;
1380
1387
}
1381
1388
1382
- static void std_output (struct grep_opt * opt , const void * buf , size_t size )
1383
- {
1384
- fwrite (buf , size , 1 , stdout );
1385
- }
1386
-
1387
1389
static int fill_textconv_grep (struct userdiff_driver * driver ,
1388
1390
struct grep_source * gs )
1389
1391
{
0 commit comments