diff options
| author | Martin Willi <martin@revosec.ch> | 2013-03-04 15:07:03 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-03-04 15:07:03 +0100 |
| commit | 8b24863b1fefcf4ed2cfa4c541fe4438a6c51237 (patch) | |
| tree | e63d437adf3272d8a7f4f586b5fae57e492a5431 /src/libstrongswan | |
| parent | 4d17427205e550780d5d4c58c2ed992c18171e4b (diff) | |
| download | strongswan-8b24863b1fefcf4ed2cfa4c541fe4438a6c51237.tar.bz2 strongswan-8b24863b1fefcf4ed2cfa4c541fe4438a6c51237.tar.xz | |
Don't use color escapes when printing backtraces to a non-TTY file
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/utils/backtrace.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c index 0b6683233..226237362 100644 --- a/src/libstrongswan/utils/backtrace.c +++ b/src/libstrongswan/utils/backtrace.c @@ -178,13 +178,18 @@ static void find_addr(bfd *abfd, asection *section, bfd_find_data_t *data) fprintf(data->file, " -> "); if (function) { - fprintf(data->file, "\e[34m%s() ", function); + fprintf(data->file, "%s%s() ", + tty_escape_get(fileno(data->file), TTY_FG_BLUE), + function); } if (source) { - fprintf(data->file, "\e[32m@ %s:%d", source, line); + fprintf(data->file, "%s@ %s:%d", + tty_escape_get(fileno(data->file), TTY_FG_GREEN), + source, line); } - fprintf(data->file, "\e[0m\n"); + fprintf(data->file, "%s\n", + tty_escape_get(fileno(data->file), TTY_FG_DEF)); } } } @@ -304,7 +309,7 @@ static void print_sourceline(FILE *file, char *filename, void *ptr) output = popen(cmd, "r"); if (output) { - fprintf(file, " -> \e[32m"); + fprintf(file, " -> %s", tty_escape_get(fileno(file), TTY_FG_GREEN)); while (TRUE) { c = getc(output); @@ -315,7 +320,7 @@ static void print_sourceline(FILE *file, char *filename, void *ptr) fputc(c, file); } pclose(output); - fprintf(file, "\e[0m\n"); + fprintf(file, "%s\n", tty_escape_get(fileno(file), TTY_FG_DEF)); } } @@ -353,14 +358,19 @@ METHOD(backtrace_t, log_, void, } if (info.dli_sname) { - fprintf(file, " \e[33m%s\e[0m @ %p (\e[31m%s\e[0m+0x%tx) [%p]\n", - info.dli_fname, info.dli_fbase, info.dli_sname, - this->frames[i] - info.dli_saddr, this->frames[i]); + fprintf(file, " %s%s%s @ %p (%s%s%s+0x%tx) [%p]\n", + tty_escape_get(fileno(file), TTY_FG_YELLOW), info.dli_fname, + tty_escape_get(fileno(file), TTY_FG_DEF), info.dli_fbase, + tty_escape_get(fileno(file), TTY_FG_RED), info.dli_sname, + tty_escape_get(fileno(file), TTY_FG_DEF), + this->frames[i] - info.dli_saddr, this->frames[i]); } else { - fprintf(file, " \e[33m%s\e[0m @ %p [%p]\n", info.dli_fname, - info.dli_fbase, this->frames[i]); + fprintf(file, " %s%s%s @ %p [%p]\n", + tty_escape_get(fileno(file), TTY_FG_YELLOW), info.dli_fname, + tty_escape_get(fileno(file), TTY_FG_DEF), info.dli_fbase, + this->frames[i]); } if (detailed) { @@ -516,4 +526,3 @@ void backtrace_dump(char *label, FILE *file, bool detailed) backtrace->log(backtrace, file, detailed); backtrace->destroy(backtrace); } - |