Prevent program output from mix with "^running".

	gdb/
	* mi/mi-interp.c (mi_on_resume): Output token
	and "^running" together, so that nothing else gets
	in between.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b62d220cab6c45c9471f3287beb4ade1e5a5bc5a..7ee0dd9a514db2f5b240394fb11556662ec552d8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-06  Vladimir Prus  <vladimir@codesourcery.com>
+
+        Prevent program output from mix with "^running".
+
+       gdb/
+       * mi/mi-interp.c (mi_on_resume): Output token
+       and "^running" together, so that nothing else gets
+       in between.
+
 2009-11-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * dwarf2read.c (struct dwarf2_cu): Remove ranges_offset and

diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 6fdf292dba73c5566dd3a1bac13d177433e4f37c..248cd66e427a5e214c940cd0ea07ae22f19571ff 100644 (file)
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -438,9 +438,8 @@ mi_on_resume (ptid_t ptid)
      In future (MI3), we'll be outputting "^done" here.  */
   if (!running_result_record_printed && mi_proceeded)
     {
-      if (current_token)
-       fputs_unfiltered (current_token, raw_stdout);
-      fputs_unfiltered ("^running\n", raw_stdout);
+      fprintf_unfiltered (raw_stdout, "%s^running\n",
+                         current_token ? current_token : "");
     }
 
   if (PIDGET (ptid) == -1)