From e5c59c386784d9c52505823ee293c94f633a8744 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 19 May 2014 13:43:19 +0200 Subject: complete: Fix completion after options the command specific complete callbacks only work when no option is typed already. For example "devinfo " correctly completes the devices, but "devinfo -x " does nothing. That is because the options are passed to the input string of the completion handlers. Skip the option string by finding the last space in the input string. This is not perfect since "devinfo -f" still does not work, but it's better than what we have now. Signed-off-by: Sascha Hauer --- common/complete.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'common/complete.c') diff --git a/common/complete.c b/common/complete.c index 9206ef02a5..368321f921 100644 --- a/common/complete.c +++ b/common/complete.c @@ -277,11 +277,16 @@ static char* cmd_complete_lookup(struct string_list *sl, char *instr) int len; int ret = COMPLETE_END; char *res = NULL; + char *t; for_each_command(cmdtp) { len = strlen(cmdtp->name); if (!strncmp(instr, cmdtp->name, len) && instr[len] == ' ') { instr += len + 1; + t = strrchr(instr, ' '); + if (t) + instr = t + 1; + if (cmdtp->complete) { ret = cmdtp->complete(sl, instr); res = instr; -- cgit v1.2.3