diff options
| author | Daniel Jacobowitz <drow@false.org> | 2004-02-01 05:49:28 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2004-02-01 05:49:28 +0000 |
| commit | d9b526553b332fb941b0376d3389f5c776402582 (patch) | |
| tree | 792c590138029de9f52e8a559a1531c20064a319 /gdb | |
| parent | ce22a4f1dbbfe3318420263ee1f605f286aac464 (diff) | |
| download | gdb-d9b526553b332fb941b0376d3389f5c776402582.zip gdb-d9b526553b332fb941b0376d3389f5c776402582.tar.gz gdb-d9b526553b332fb941b0376d3389f5c776402582.tar.bz2 | |
* cli/cli-cmds.c: Include readline.h.
(complete_command): Pass the start of the last word to
complete_line.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 25 |
2 files changed, 27 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c6610fb..e77cb3f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2004-02-01 Daniel Jacobowitz <drow@mvista.com> + + * cli/cli-cmds.c: Include readline.h. + (complete_command): Pass the start of the last word to + complete_line. + 2004-01-31 Daniel Jacobowitz <drow@mvista.com> * breakpoint.c (bpstat_stop_status): Remove not_a_sw_breakpoint diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 4f255c3..8f2e5e3 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1,6 +1,6 @@ /* GDB CLI commands. - Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" +#include <readline/readline.h> #include <readline/tilde.h> #include "completer.h" #include "target.h" /* For baud_rate, remote_debug and remote_timeout */ @@ -222,7 +223,7 @@ complete_command (char *arg, int from_tty) { int i; int argpoint; - char **completions; + char **completions, *point, *arg_prefix; dont_repeat (); @@ -230,7 +231,23 @@ complete_command (char *arg, int from_tty) arg = ""; argpoint = strlen (arg); - completions = complete_line (arg, arg, argpoint); + /* complete_line assumes that its first argument is somewhere within, + and except for filenames at the beginning of, the word to be completed. + The following crude imitation of readline's word-breaking tries to + accomodate this. */ + point = arg + argpoint; + while (point > arg) + { + if (strchr (rl_completer_word_break_characters, point[-1]) != 0) + break; + point--; + } + + arg_prefix = alloca (point - arg + 1); + memcpy (arg_prefix, arg, point - arg); + arg_prefix[point - arg] = 0; + + completions = complete_line (point, arg, argpoint); if (completions) { @@ -246,7 +263,7 @@ complete_command (char *arg, int from_tty) while (item < size) { int next_item; - printf_unfiltered ("%s\n", completions[item]); + printf_unfiltered ("%s%s\n", arg_prefix, completions[item]); next_item = item + 1; while (next_item < size && ! strcmp (completions[item], completions[next_item])) |