From 303a33faef8fca9b26b18a02550541c5f61ace9e Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 26 Apr 2014 18:10:40 -0400 Subject: [PATCH] mi: Use the value in mi_console_file->quote as the quoting character In mi_interpreter_init, multiple MI consoles/channels are created and a quoting character is given. In mi_console_raw_packet, we check if the value is not 0 to decide if we should quote the string, but we don't use the value. It is hardcoded to ". We might never use another quoting character than an actual quote, but I suggest we change it, for correctness. There is not visible behavior change. I changed the latest fputs_unfiltered changed to fputc_unfiltered just to stay consistent. gdb/ChangeLog: 2014-05-12 Simon Marchi * mi/mi-console.c (mi_console_raw_packet): Use the value from mi_console->quote as the quoting character. --- gdb/ChangeLog | 5 +++++ gdb/mi/mi-console.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 075348d..a622eb8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2014-05-12 Simon Marchi + * mi/mi-console.c (mi_console_raw_packet): Use the value from + mi_console->quote as the quoting character. + +2014-05-12 Simon Marchi + * MAINTAINERS (Write After Approval): Add "Simon Marchi". 2014-04-29 Tom Tromey diff --git a/gdb/mi/mi-console.c b/gdb/mi/mi-console.c index dbad199..0880bd3 100644 --- a/gdb/mi/mi-console.c +++ b/gdb/mi/mi-console.c @@ -110,15 +110,16 @@ mi_console_raw_packet (void *data, const char *buf, long length_buf) fputs_unfiltered (mi_console->prefix, mi_console->raw); if (mi_console->quote) { - fputs_unfiltered ("\"", mi_console->raw); + fputc_unfiltered (mi_console->quote, mi_console->raw); fputstrn_unfiltered (buf, length_buf, mi_console->quote, mi_console->raw); - fputs_unfiltered ("\"\n", mi_console->raw); + fputc_unfiltered (mi_console->quote, mi_console->raw); + fputc_unfiltered ('\n', mi_console->raw); } else { fputstrn_unfiltered (buf, length_buf, 0, mi_console->raw); - fputs_unfiltered ("\n", mi_console->raw); + fputc_unfiltered ('\n', mi_console->raw); } gdb_flush (mi_console->raw); } -- 2.7.4