diff options
| author | Pedro Alves <pedro@codesourcery.com> | 2012-01-23 17:11:41 +0000 |
|---|---|---|
| committer | Pedro Alves <pedro@codesourcery.com> | 2012-01-23 17:11:41 +0000 |
| commit | 1ace069643a34f84b1c555c01e728b9d0865c748 (patch) | |
| tree | 014388550b9cfa76840f115d4e726b9064c129cd /gdb | |
| parent | c7ace98603ceb642c66e03595c79089b35674d3f (diff) | |
| download | gdb-1ace069643a34f84b1c555c01e728b9d0865c748.tar.gz | |
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".
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/call-signal-resume.exp | 4 | ||||
| -rw-r--r-- | gdb/top.c | 12 |
4 files changed, 18 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b73d98f694b..9c4f933ec0e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-01-23 Pedro Alves <palves@redhat.com> + + * top.c (caution): Update comment. + (execute_command): Don't consider the current value of `caution'. + 2012-01-23 Jan Kratochvil <jan.kratochvil@redhat.com> * cli/cli-cmds.c (find_and_open_script): Handle failure of fdopen. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b6a7a2c2759..d92493db546 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-01-23 Pedro Alves <palves@redhat.com> + + * gdb.base/call-signal-resume.exp: Allow output after "return". + 2012-01-20 Pedro Alves <palves@redhat.com> * gdb.python/py-finish-breakpoint.py: Fix typo. diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index 1c4517def35..d383f5cda63 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 c4e913de71a..346d73b4e02 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 |