From a0def019aaf79adf3add2a0559ab75bb84d72085 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 16 Nov 2015 09:33:32 +0000 Subject: gdb: 'list' command, tweak handling of +/- arguments. There is an inconsistency with the handling of the special +/- arguments to the list command. For the very first time that list is used (after the inferior has changed locations) then only the first character of the argument string is checked, so 'list +BLAH' will operate as 'list +' and 'list -----FOO' will operate as 'list -'. This compares to each subsequent use of list, where the whole argument string is checked, so 'list +BLAH' will try to list lines of code around the function '+BLAH'. This commit unifies the behaviour so that the whole argument string is checked, in order to list the next 10, or previous 10 lines from a file only 'list +' and 'list -' are now valid. gdb/ChangeLog: * cli/cli-cmds.c (list_command): Check that the argument string is a single character, either '+' or '-'. gdb/testsuite/ChangeLog: * gdb.base/list.exp (test_list_invalid_args): New function, defined, and called. --- gdb/cli/cli-cmds.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/cli/cli-cmds.c') diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 872c844..4557bfd 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -907,7 +907,7 @@ list_command (char *arg, int from_tty) cleanup = make_cleanup (null_cleanup, NULL); /* Pull in the current default source line if necessary. */ - if (arg == NULL || arg[0] == '+' || arg[0] == '-') + if (arg == NULL || ((arg[0] == '+' || arg[0] == '-') && arg[1] == '\0')) { set_default_source_symtab_and_line (); cursal = get_current_source_symtab_and_line (); @@ -933,13 +933,13 @@ list_command (char *arg, int from_tty) } /* "l" or "l +" lists next ten lines. */ - else if (arg == NULL || strcmp (arg, "+") == 0) + else if (arg == NULL || arg[0] == '+') print_source_lines (cursal.symtab, cursal.line, cursal.line + get_lines_to_list (), 0); /* "l -" lists previous ten lines, the ones before the ten just listed. */ - else if (strcmp (arg, "-") == 0) + else if (arg[0] == '-') print_source_lines (cursal.symtab, max (get_first_line_listed () - get_lines_to_list (), 1), -- cgit v1.1