Commit 91ff2bc1 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar

perf tools: Fix backslash processing on trace print formats

The handling of backslashes was broken. It would stop parsing
when encountering one. Also, '\n', '\t', '\r' and '\\' were not
converted.
Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <20091014194357.521974680@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 924a79af
...@@ -522,7 +522,10 @@ static enum event_type __read_token(char **tok) ...@@ -522,7 +522,10 @@ static enum event_type __read_token(char **tok)
last_ch = ch; last_ch = ch;
ch = __read_char(); ch = __read_char();
buf[i++] = ch; buf[i++] = ch;
} while (ch != quote_ch && last_ch != '\\'); /* the '\' '\' will cancel itself */
if (ch == '\\' && last_ch == '\\')
last_ch = 0;
} while (ch != quote_ch || last_ch == '\\');
/* remove the last quote */ /* remove the last quote */
i--; i--;
goto out; goto out;
...@@ -2325,7 +2328,27 @@ static void pretty_print(void *data, int size, struct event *event) ...@@ -2325,7 +2328,27 @@ static void pretty_print(void *data, int size, struct event *event)
for (; *ptr; ptr++) { for (; *ptr; ptr++) {
ls = 0; ls = 0;
if (*ptr == '%') { if (*ptr == '\\') {
ptr++;
switch (*ptr) {
case 'n':
printf("\n");
break;
case 't':
printf("\t");
break;
case 'r':
printf("\r");
break;
case '\\':
printf("\\");
break;
default:
printf("%c", *ptr);
break;
}
} else if (*ptr == '%') {
saveptr = ptr; saveptr = ptr;
show_func = 0; show_func = 0;
cont_process: cont_process:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment