OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Jan Kratochvil 2010-07-27 19:11:51 +00:00
parent 872e696d08
commit c63a1f8688
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -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> 2010-07-27 Joel Brobecker <brobecker@adacore.com>
* dwarf2read.c (dw2_find_pc_sect_symtab): Remove trailing newline * dwarf2read.c (dw2_find_pc_sect_symtab): Remove trailing newline

3
gdb/top.c
View File

@ -1242,6 +1242,9 @@ input_from_terminal_p (void)
if (interactive_mode != AUTO_BOOLEAN_AUTO) if (interactive_mode != AUTO_BOOLEAN_AUTO)
return interactive_mode == AUTO_BOOLEAN_TRUE; return interactive_mode == AUTO_BOOLEAN_TRUE;
if (batch_flag)
return 0;
if (gdb_has_a_terminal () && instream == stdin) if (gdb_has_a_terminal () && instream == stdin)
return 1; return 1;

5
gdb/utils.c
View File

@ -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 question we're asking, and then answer the default automatically. This
way, important error messages don't get lost when talking to GDB way, important error messages don't get lost when talking to GDB
over a pipe. */ over a pipe. */
if (batch_flag || ! input_from_terminal_p ()) if (! input_from_terminal_p ())
{ {
wrap_here (""); wrap_here ("");
vfprintf_filtered (gdb_stdout, ctlstr, args); 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. */ /* Don't do any filtering if it is disabled. */
if (stream != gdb_stdout if (stream != gdb_stdout
|| !pagination_enabled || ! pagination_enabled
|| ! input_from_terminal_p ()
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX) || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)
|| top_level_interpreter () == NULL || top_level_interpreter () == NULL
|| ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ()))) || ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ())))