mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Enable wt-status output to a given FILE pointer.
Still defaults to stdout, but you can now override wt_status.fp after calling wt_status_prepare(). Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
6b30852ded
commit
f26a001226
18
color.c
18
color.c
@@ -135,39 +135,39 @@ int git_config_colorbool(const char *var, const char *value)
|
||||
return git_config_bool(var, value);
|
||||
}
|
||||
|
||||
static int color_vprintf(const char *color, const char *fmt,
|
||||
static int color_vfprintf(FILE *fp, const char *color, const char *fmt,
|
||||
va_list args, const char *trail)
|
||||
{
|
||||
int r = 0;
|
||||
|
||||
if (*color)
|
||||
r += printf("%s", color);
|
||||
r += vprintf(fmt, args);
|
||||
r += fprintf(fp, "%s", color);
|
||||
r += vfprintf(fp, fmt, args);
|
||||
if (*color)
|
||||
r += printf("%s", COLOR_RESET);
|
||||
r += fprintf(fp, "%s", COLOR_RESET);
|
||||
if (trail)
|
||||
r += printf("%s", trail);
|
||||
r += fprintf(fp, "%s", trail);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int color_printf(const char *color, const char *fmt, ...)
|
||||
int color_fprintf(FILE *fp, const char *color, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int r;
|
||||
va_start(args, fmt);
|
||||
r = color_vprintf(color, fmt, args, NULL);
|
||||
r = color_vfprintf(fp, color, fmt, args, NULL);
|
||||
va_end(args);
|
||||
return r;
|
||||
}
|
||||
|
||||
int color_printf_ln(const char *color, const char *fmt, ...)
|
||||
int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int r;
|
||||
va_start(args, fmt);
|
||||
r = color_vprintf(color, fmt, args, "\n");
|
||||
r = color_vfprintf(fp, color, fmt, args, "\n");
|
||||
va_end(args);
|
||||
return r;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user