diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-18 14:36:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-18 22:45:32 +0200 |
| commit | eca7871bced78837154ad52c42864ba3c87a9904 (patch) | |
| tree | d6ad489173bde58cef1c41c8f01f2698fa661343 | |
| parent | 57aac5f1ff63b4997d3dc665c4c05f5470a1e681 (diff) | |
| download | barebox-eca7871bced78837154ad52c42864ba3c87a9904.tar.gz barebox-eca7871bced78837154ad52c42864ba3c87a9904.tar.xz | |
complete: Add completion for nv and globalvar commands
The 'nv' command is often used to create a nv variable
for an existing global variable, so add a command completion
function for this.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | commands/global.c | 2 | ||||
| -rw-r--r-- | commands/nv.c | 2 | ||||
| -rw-r--r-- | common/globalvar.c | 28 | ||||
| -rw-r--r-- | include/globalvar.h | 2 |
4 files changed, 34 insertions, 0 deletions
diff --git a/commands/global.c b/commands/global.c index d21b82951c..fc687169a7 100644 --- a/commands/global.c +++ b/commands/global.c @@ -22,6 +22,7 @@ #include <globalvar.h> #include <environment.h> #include <getopt.h> +#include <complete.h> static int do_global(int argc, char *argv[]) { @@ -77,4 +78,5 @@ BAREBOX_CMD_START(global) BAREBOX_CMD_OPTS("[-r] VAR[=VALUE] ...") BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_global_help) + BAREBOX_CMD_COMPLETE(nv_global_complete) BAREBOX_CMD_END diff --git a/commands/nv.c b/commands/nv.c index a1fb095a16..37cdb96647 100644 --- a/commands/nv.c +++ b/commands/nv.c @@ -22,6 +22,7 @@ #include <globalvar.h> #include <environment.h> #include <getopt.h> +#include <complete.h> static int do_nv(int argc, char *argv[]) { @@ -90,4 +91,5 @@ BAREBOX_CMD_START(nv) BAREBOX_CMD_OPTS("[-r] VAR[=VALUE] ...") BAREBOX_CMD_GROUP(CMD_GRP_ENV) BAREBOX_CMD_HELP(cmd_nv_help) + BAREBOX_CMD_COMPLETE(nv_global_complete) BAREBOX_CMD_END diff --git a/common/globalvar.c b/common/globalvar.c index fb69db973a..e75cac96d7 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -626,3 +626,31 @@ static void nv_exit(void) nvvar_save(); } predevshutdown_exitcall(nv_exit); + +static int nv_global_param_complete(struct device_d *dev, struct string_list *sl, + char *instr, int eval) +{ + struct param_d *param; + int len; + + len = strlen(instr); + + list_for_each_entry(param, &dev->parameters, list) { + if (strncmp(instr, param->name, len)) + continue; + + string_list_add_asprintf(sl, "%s%c", + param->name, + eval ? ' ' : '='); + } + + return 0; +} + +int nv_global_complete(struct string_list *sl, char *instr) +{ + nv_global_param_complete(&global_device, sl, instr, 0); + nv_global_param_complete(&nv_device, sl, instr, 0); + + return 0; +} diff --git a/include/globalvar.h b/include/globalvar.h index 2a5d8a1a1a..ecd9f1d186 100644 --- a/include/globalvar.h +++ b/include/globalvar.h @@ -4,6 +4,7 @@ #include <param.h> #include <driver.h> #include <linux/err.h> +#include <stringlist.h> extern struct device_d global_device; @@ -123,5 +124,6 @@ static inline void dev_param_init_from_nv(struct device_d *dev, const char *name void nv_var_set_clean(void); int nvvar_save(void); +int nv_global_complete(struct string_list *sl, char *instr); #endif /* __GLOBALVAR_H */ |