sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sascha Hauer 2016-10-18 14:36:49 +02:00
parent 57aac5f1ff
commit eca7871bce
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/global.c
View File

@ -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

2
commands/nv.c
View File

@ -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

28
common/globalvar.c
View File

@ -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;
}

2
include/globalvar.h
View File

@ -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 */