aboutsummaryrefslogtreecommitdiff
path: root/gdb/utils.c
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2010-07-27 19:11:51 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2010-07-27 19:11:51 +0000
commitc63a1f8688b64b454605a10755e7a4c4c780dbfe (patch)
treeeff957c5be97e1cff110f2fd3bebbce0c6c45127 /gdb/utils.c
parent872e696d08b5fd0002af3cf1d131cbf024802e95 (diff)
downloadfsf-binutils-gdb-c63a1f8688b64b454605a10755e7a4c4c780dbfe.zip
fsf-binutils-gdb-c63a1f8688b64b454605a10755e7a4c4c780dbfe.tar.gz
fsf-binutils-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.
Diffstat (limited to 'gdb/utils.c')
-rw-r--r--gdb/utils.c5
1 files changed, 3 insertions, 2 deletions
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 ())))