diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-07-27 19:11:51 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-07-27 19:11:51 +0000 |
| commit | c63a1f8688b64b454605a10755e7a4c4c780dbfe (patch) | |
| tree | eff957c5be97e1cff110f2fd3bebbce0c6c45127 | |
| parent | 872e696d08b5fd0002af3cf1d131cbf024802e95 (diff) | |
| download | gdb-c63a1f8688b64b454605a10755e7a4c4c780dbfe.zip gdb-c63a1f8688b64b454605a10755e7a4c4c780dbfe.tar.gz gdb-c63a1f8688b64b454605a10755e7a4c4c780dbfe.tar.bz2 | |
gdb/
* top.c (input_from_terminal_p): Return 0 on BATCH_FLAG.
* utils.c (defaulted_query): Do not explicitly check for BATCH_FLAG.
(fputs_maybe_filtered): Do not do filtering also on
! INPUT_FROM_TERMINAL_P.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/top.c | 3 | ||||
| -rw-r--r-- | gdb/utils.c | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2bac588..1907943 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2010-07-27 Jan Kratochvil <jan.kratochvil@redhat.com> + + * top.c (input_from_terminal_p): Return 0 on BATCH_FLAG. + * utils.c (defaulted_query): Do not explicitly check for BATCH_FLAG. + (fputs_maybe_filtered): Do not do filtering also on + ! INPUT_FROM_TERMINAL_P. + 2010-07-27 Joel Brobecker <brobecker@adacore.com> * dwarf2read.c (dw2_find_pc_sect_symtab): Remove trailing newline @@ -1242,6 +1242,9 @@ input_from_terminal_p (void) if (interactive_mode != AUTO_BOOLEAN_AUTO) return interactive_mode == AUTO_BOOLEAN_TRUE; + if (batch_flag) + return 0; + if (gdb_has_a_terminal () && instream == stdin) return 1; diff --git a/gdb/utils.c b/gdb/utils.c index 0eaa050..0c51dbc 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1634,7 +1634,7 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) question we're asking, and then answer the default automatically. This way, important error messages don't get lost when talking to GDB over a pipe. */ - if (batch_flag || ! input_from_terminal_p ()) + if (! input_from_terminal_p ()) { wrap_here (""); vfprintf_filtered (gdb_stdout, ctlstr, args); @@ -2352,7 +2352,8 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream, /* Don't do any filtering if it is disabled. */ if (stream != gdb_stdout - || !pagination_enabled + || ! pagination_enabled + || ! input_from_terminal_p () || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX) || top_level_interpreter () == NULL || ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ()))) |