diff options
author | Andrew Stubbs <andrew.stubbs@st.com> | 2006-07-21 14:46:56 +0000 |
---|---|---|
committer | Andrew Stubbs <andrew.stubbs@st.com> | 2006-07-21 14:46:56 +0000 |
commit | 16026cd75d6c4515b5c854a7b4726678bb6ec31f (patch) | |
tree | 9f8ddfb74128d1425aef25f5cf5dcf29747a4347 /gdb/cli/cli-cmds.c | |
parent | 3e4cf9243a5580b9b7766d6da9f0d5257705bf2a (diff) | |
download | gdb-16026cd75d6c4515b5c854a7b4726678bb6ec31f.zip gdb-16026cd75d6c4515b5c854a7b4726678bb6ec31f.tar.gz gdb-16026cd75d6c4515b5c854a7b4726678bb6ec31f.tar.bz2 |
2006-07-21 Andrew Stubbs <andrew.stubbs@st.com>
* cli/cli-cmds.c (source_verbose, trace_commands): New variables.
(source_script): New function.
(source_verbose_cleanup): New function.
(source_command): Move old contents to source_script.
Make function static. Parse -v option and call source_script.
(init_cli_cmds): Update source command help.
Add 'set trace-commands' command.
* cli/cli-script.c (command_next_depth): New static variable.
(suppress_next_print_command_trace): New static variable.
(reset_command_nest_depth): New function.
(print_command_trace): New function.
(execute_control_command): Split the continue_control and break_control
cases, add calls to print_command_trace and count the nest depth.
(while_command): Set suppress_next_print_command_trace.
(if_command): Likewise.
* top.c (execute_command): Call print_command_trace.
* cli/cli-cmds.h (source_verbose, trace_commands): New extern variables.
(source_command): Change to source_script.
* main.c (captued_main): Use source_script instead of source_command.
* top.h (source_command): Change to source_script.
* event-top.c (display_gdb_prompt): Call reset_command_nest_depth.
* cli/cli-script.h (print_command_trace): Export.
(reset_command_nest_depth): Likewise.
docs/
* gdb.texinfo (Optional warnings and messages): Add
'set/show trace-commands'.
(Command files): Add '-v' to source command.
testsuite/
* gdb.base/default.exp: Update source command error message.
* gdb.base/help.exp: Update 'help source' message.
Diffstat (limited to 'gdb/cli/cli-cmds.c')
-rw-r--r-- | gdb/cli/cli-cmds.c | 69 |
1 files changed, 64 insertions, 5 deletions
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index f66abde..fdff394 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -173,6 +173,11 @@ struct cmd_list_element *showdebuglist; struct cmd_list_element *setchecklist; struct cmd_list_element *showchecklist; + +/* Command tracing state. */ + +int source_verbose = 0; +int trace_commands = 0; /* Utility used everywhere when at least one argument is needed and none is supplied. */ @@ -424,17 +429,16 @@ cd_command (char *dir, int from_tty) } void -source_command (char *args, int from_tty) +source_script (char *file, int from_tty) { FILE *stream; struct cleanup *old_cleanups; - char *file = args; char *full_pathname = NULL; int fd; - if (file == NULL) + if (file == NULL || *file == 0) { - error (_("source command requires pathname of file to source.")); + error (_("source command requires file name of file to source.")); } file = tilde_expand (file); @@ -465,6 +469,51 @@ source_command (char *args, int from_tty) do_cleanups (old_cleanups); } +/* Return the source_verbose global variable to its previous state + on exit from the source command, by whatever means. */ +static void +source_verbose_cleanup (void *old_value) +{ + source_verbose = *(int *)old_value; + xfree (old_value); +} + +static void +source_command (char *args, int from_tty) +{ + struct cleanup *old_cleanups; + char *file = args; + int *old_source_verbose = xmalloc (sizeof(int)); + + *old_source_verbose = source_verbose; + old_cleanups = make_cleanup (source_verbose_cleanup, old_source_verbose); + + /* -v causes the source command to run in verbose mode. + We still have to be able to handle filenames with spaces in a + backward compatible way, so buildargv is not appropriate. */ + + if (args) + { + /* Make sure leading white space does not break the comparisons. */ + while (isspace(args[0])) + args++; + + /* Is -v the first thing in the string? */ + if (args[0] == '-' && args[1] == 'v' && isspace (args[2])) + { + source_verbose = 1; + + /* Trim -v and whitespace from the filename. */ + file = &args[3]; + while (isspace (file[0])) + file++; + } + } + + return source_script (file, from_tty); +} + + static void echo_command (char *text, int from_tty) { @@ -1182,8 +1231,10 @@ Commands defined in this way may have up to ten arguments.")); source_help_text = xstrprintf (_("\ Read commands from a file named FILE.\n\ +Optional -v switch (before the filename) causes each command in\n\ +FILE to be echoed as it is executed.\n\ Note that the file \"%s\" is read automatically in this way\n\ -when gdb is started."), gdbinit); +when GDB is started."), gdbinit); c = add_cmd ("source", class_support, source_command, source_help_text, &cmdlist); set_cmd_completer (c, filename_completer); @@ -1364,4 +1415,12 @@ Show the max call depth for user-defined commands."), NULL, NULL, show_max_user_call_depth, &setlist, &showlist); + + add_setshow_boolean_cmd ("trace-commands", no_class, &trace_commands, _("\ +Set tracing of GDB CLI commands."), _("\ +Show state of GDB CLI command tracing."), _("\ +When 'on', each command is displayed as it is executed."), + NULL, + NULL, + &setlist, &showlist); } |