From: Daniel Jacobowitz <dan@debian.org>
Date: Thu, 3 Jul 2003 14:49:26 +0000 (+0000)
Subject: 	* cli/cli-interp.c (cli_interpreter_resume): Update the
X-Git-Tag: carlton_dictionary-20030805-merge~330
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc5200c4a8e10ba1025fba23cd06dbe09d9df3ba;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* cli/cli-interp.c (cli_interpreter_resume): Update the
	cli_uiout's stream to gdb_stdout.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a4b9537fe6..acc0bc1379 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-03  Daniel Jacobowitz  <drow@mvista.com>
+
+	* cli/cli-interp.c (cli_interpreter_resume): Update the
+	cli_uiout's stream to gdb_stdout.
+
 2003-07-03  Andrew Cagney  <cagney@redhat.com>
 
 	* gdbarch.sh (REGISTER_RAW_SIZE, REGISTER_VIRTUAL_SIZE): Add
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 45679f07b9..6abb24ddff 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -53,8 +53,25 @@ cli_interpreter_init (void)
 static int
 cli_interpreter_resume (void *data)
 {
+  struct ui_file *stream;
+
   /*sync_execution = 1; */
+
+  /* gdb_setup_readline will change gdb_stdout.  If the CLI was previously
+     writing to gdb_stdout, then set it to the new gdb_stdout afterwards.  */
+
+  stream = cli_out_set_stream (cli_uiout, gdb_stdout);
+  if (stream != gdb_stdout)
+    {
+      cli_out_set_stream (cli_uiout, stream);
+      stream = NULL;
+    }
+
   gdb_setup_readline ();
+
+  if (stream != NULL)
+    cli_out_set_stream (cli_uiout, gdb_stdout);
+
   return 1;
 }