Re: Decouple "set confirm" from `from_tty'.

[Pedro Alves <palves at redhat dot com>]

On 01/23/2012 04:25 PM, Jan Kratochvil wrote:
> On Fri, 20 Jan 2012 12:13:51 +0100, Pedro Alves wrote:
>> Comments?
> 
> Just that I would prefer renaming to be a separate commit, otherwise it
> somehow complicates later regressions analysis etc.  Sure very minor note.
> 
> The real change here is negligible in size compared to the renaming.

Sure.  I've now committed the patch below, which is the same, but
without the renaming.

gdb/
2012-01-23  Pedro Alves  <palves@redhat.com>

	* top.c (caution): Update comment.
	(execute_command): Don't consider the current value of `caution'.

gdb/testsuite/
2012-01-23  Pedro Alves  <palves@redhat.com>

	* gdb.base/call-signal-resume.exp: Allow output after "return".

---
 gdb/testsuite/gdb.base/call-signal-resume.exp |    4 ++--
 gdb/top.c                                     |   12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 1c4517d..d383f5c 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -99,7 +99,7 @@ if { "$frame_number" == "" } {
 # Pop the dummy frame.
 gdb_test "frame $frame_number" ".*"
 gdb_test_no_output "set confirm off"
-gdb_test_no_output "return"
+gdb_test "return" ""

 # Resume execution, the program should continue without any signal.

@@ -132,7 +132,7 @@ if { "$frame_number" == "" } {
 # Pop the dummy frame.
 gdb_test "frame $frame_number" ".*"
 gdb_test_no_output "set confirm off"
-gdb_test_no_output "return"
+gdb_test "return" ""

 # Continue again, this time we should get to the signal handler.

diff --git a/gdb/top.c b/gdb/top.c
index c4e913d..346d73b 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -98,9 +98,11 @@ int use_windows = 0;

 extern char lang_frame_mismatch_warn[];		/* language.c */

-/* Flag for whether we want all the "from_tty" gubbish printed.  */
+/* Flag for whether we want to confirm potentially dangerous
+   operations.  Default is yes.  */
+
+int caution = 1;

-int caution = 1;		/* Default is yes, sigh.  */
 static void
 show_caution (struct ui_file *file, int from_tty,
 	      struct cmd_list_element *c, const char *value)
@@ -471,13 +473,13 @@ execute_command (char *p, int from_tty)
       if (c->class == class_user)
 	execute_user_command (c, arg);
       else if (c->type == set_cmd || c->type == show_cmd)
-	do_setshow_command (arg, from_tty & caution, c);
+	do_setshow_command (arg, from_tty, c);
       else if (!cmd_func_p (c))
 	error (_("That is not a command, just a help topic."));
       else if (deprecated_call_command_hook)
-	deprecated_call_command_hook (c, arg, from_tty & caution);
+	deprecated_call_command_hook (c, arg, from_tty);
       else
-	cmd_func (c, arg, from_tty & caution);
+	cmd_func (c, arg, from_tty);

       /* If the interpreter is in sync mode (we're running a user
 	 command's list, running command hooks or similars), and we