windows-nat: Trim a trailing '\n' from OutputDebugString before echoing it

For cosmetic purposes, trim a trailing '\n' from OutputDebugString before
echoing it, as warning() will add a '\n', anyhow.

gdb/ChangeLog:

2015-06-03  Jon Turney  <jon.turney@dronecode.org.uk>

	* windows-nat.c (handle_output_debug_string): Trim trailing '\n'
	from OutputDebugString.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c8249550b4e9f72bf431f6a3369c2630378fff2b..bfc6a0ebf270433d2a46295087f25bf6c9d0107a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-03  Jon Turney  <jon.turney@dronecode.org.uk>
+
+       * windows-nat.c (handle_output_debug_string): Trim trailing '\n'
+       from OutputDebugString.
+
 2015-06-10  Walfred Tedeschi  <walfred.tedeschi@intel.com>
                        Mircea Gherzan  <mircea.gherzan@intel.com>
 

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 701d2c52e80b39b0a9337f53ef4247ccb9bfbb5b..851eb5192d646f5b6a9354d31c4baf44da1a5cc2 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -818,7 +818,13 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
 #ifdef __CYGWIN__
       if (!startswith (s, "cYg"))
 #endif
-       warning (("%s"), s);
+       {
+         char *p = strchr (s, '\0');
+
+         if (p > s && *--p == '\n')
+           *p = '\0';
+         warning (("%s"), s);
+       }
     }
 #ifdef __COPY_CONTEXT_SIZE
   else