diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-04 15:40:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-04 15:40:25 +0200 |
| commit | 13d0ab5ec29852a6925f612830fa9e822669ece6 (patch) | |
| tree | 614ac0463dd3648bc8079e2ea795752af9cb1272 | |
| parent | 8fc0321f1ad0ffef969056dda91b453bbd7a494d (diff) | |
perf_counter tools: Dont output in color on !tty
Dont emit ASCII color characters if the terminal is not a tty,
such as when perf report gets redirected into a file.
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | Documentation/perf_counter/util/color.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/perf_counter/util/color.c b/Documentation/perf_counter/util/color.c index a77975d6677..9a8c20ccc53 100644 --- a/Documentation/perf_counter/util/color.c +++ b/Documentation/perf_counter/util/color.c @@ -1,7 +1,7 @@ #include "cache.h" #include "color.h" -int perf_use_color_default = 0; +int perf_use_color_default = -1; static int parse_color(const char *name, int len) { @@ -169,10 +169,20 @@ static int color_vfprintf(FILE *fp, const char *color, const char *fmt, { int r = 0; - if (*color) + /* + * Auto-detect: + */ + if (perf_use_color_default < 0) { + if (isatty(1) || pager_in_use()) + perf_use_color_default = 1; + else + perf_use_color_default = 0; + } + + if (perf_use_color_default && *color) r += fprintf(fp, "%s", color); r += vfprintf(fp, fmt, args); - if (*color) + if (perf_use_color_default && *color) r += fprintf(fp, "%s", PERF_COLOR_RESET); if (trail) r += fprintf(fp, "%s", trail); @@ -185,6 +195,7 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...) { va_list args; int r; + va_start(args, fmt); r = color_vfprintf(fp, color, fmt, args, NULL); va_end(args); |