From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3NdA-0007Tf-BI for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3Nd4-0000nX-BF for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3Nd4-0000nK-18 for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:22 -0500 From: Kevin Wolf Date: Wed, 15 Jan 2014 11:22:30 +0100 Message-Id: <1389781375-11774-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1389781375-11774-1-git-send-email-kwolf@redhat.com> References: <1389781375-11774-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 17/42] qemu-io: add command completion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi Autocomplete qemu-io commands at the interactive prompt. Note this only completes command names and not their options. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- include/qemu-io.h | 3 +++ qemu-io-cmds.c | 15 +++++++++++++++ qemu-io.c | 8 +++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/qemu-io.h b/include/qemu-io.h index a418b46..7e7c07c 100644 --- a/include/qemu-io.h +++ b/include/qemu-io.h @@ -42,5 +42,8 @@ bool qemuio_command(BlockDriverState *bs, const char *cmd); void qemuio_add_command(const cmdinfo_t *ci); int qemuio_command_usage(const cmdinfo_t *ci); +void qemuio_complete_command(const char *input, + void (*fn)(const char *cmd, void *opaque), + void *opaque); #endif /* QEMU_IO_H */ diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 85e4982..6dfb4a5 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -94,6 +94,21 @@ static const cmdinfo_t *find_command(const char *cmd) return NULL; } +/* Invoke fn() for commands with a matching prefix */ +void qemuio_complete_command(const char *input, + void (*fn)(const char *cmd, void *opaque), + void *opaque) +{ + cmdinfo_t *ct; + size_t input_len = strlen(input); + + for (ct = cmdtab; ct < &cmdtab[ncmds]; ct++) { + if (strncmp(input, ct->name, input_len) == 0) { + fn(ct->name, opaque); + } + } +} + static char **breakline(char *input, int *count) { int c = 0; diff --git a/qemu-io.c b/qemu-io.c index d7c26d3..fdc46a9 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -236,9 +236,15 @@ static void readline_func(void *opaque, const char *str, void *readline_opaque) *line = g_strdup(str); } +static void completion_match(const char *cmd, void *opaque) +{ + readline_add_completion(readline_state, cmd); +} + static void readline_completion_func(void *opaque, const char *str) { - /* No command or argument completion implemented yet */ + readline_set_completion_index(readline_state, strlen(str)); + qemuio_complete_command(str, completion_match, NULL); } static char *fetchline_readline(void) -- 1.8.1.4