diff options
| author | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:47 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:47 +0100 |
| commit | 694ec099d2fca9e7d47848e8a7fc40ea3aa47a32 (patch) | |
| tree | 7818be8d17e00932989d674657bf65e0f5817098 /gdb/main.c | |
| parent | 41fd2b0f5d958fe3056da5c7af4032b1b99d726f (diff) | |
Make out and error streams be per UI
stderr_fileopen () references stderr directly, which doesn't work when
we have a separate UI with its own stderr-like stream. So this also
adds a "errstream" to "struct ui", and plumbs stderr_fileopen to take
a stream parameter.
gdb/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* event-top.c (gdb_setup_readline): Pass the UI's outstream and
errstream to stdout_fileopen and stderr_fileopen.
* exceptions.c: Include top.h.
(print_flush): Open the current UI's outstream file descriptor,
instead of hardcoding file descriptor 1.
* main.c (captured_main): Save the main UI's out and error
streams. Adjust stderr_fileopen call.
* top.h (struct ui) <outstream, errstream>: New fields.
* ui-file.c (stderr_fileopen): Add stream parameter. Use it
instead of stderr.
* ui-file.h (stderr_fileopen): Add stream parameter and update
comment.
Diffstat (limited to 'gdb/main.c')
| -rw-r--r-- | gdb/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/main.c b/gdb/main.c index 87bf05af70..dd700dfdf8 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -507,7 +507,11 @@ captured_main (void *data) ndir = 0; saved_command_line = (char *) xstrdup (""); + ui->instream = stdin; + ui->outstream = stdout; + ui->errstream = stderr; + ui->input_fd = fileno (stdin); #ifdef __MINGW32__ @@ -517,7 +521,7 @@ captured_main (void *data) #endif gdb_stdout = stdio_fileopen (stdout); - gdb_stderr = stderr_fileopen (); + gdb_stderr = stderr_fileopen (stderr); gdb_stdlog = gdb_stderr; /* for moment */ gdb_stdtarg = gdb_stderr; /* for moment */ |