[PATCH v2] complete: add var and device param complete support
Sascha Hauer
s.hauer at pengutronix.de
Fri Jun 10 02:53:49 EDT 2011
On Fri, Jun 10, 2011 at 03:29:27AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> with $xx or xx= or if device $xx.yy or xx.yy=
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
> v2:
>
> make the call device_param_complete safe
>
> Best Regards,
> J.
> common/complete.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 111 insertions(+), 1 deletions(-)
>
> diff --git a/common/complete.c b/common/complete.c
> index 46ba871..5f1df74 100644
> --- a/common/complete.c
> +++ b/common/complete.c
> @@ -27,6 +27,7 @@
> #include <libgen.h>
> #include <command.h>
> #include <stringlist.h>
> +#include <environment.h>
>
> static int file_complete(struct string_list *sl, char *instr)
> {
> @@ -84,6 +85,111 @@ static int command_complete(struct string_list *sl, char *instr)
> return 0;
> }
>
> +static int device_param_complete(char begin, struct device_d *dev,
> + struct string_list *sl, char *instr)
> +{
> + struct param_d *param;
> + char cmd[128];
> + char *tmp = cmd;
> + int len, len2;
> +
> + len = strlen(instr);
> + if (begin) {
> + tmp[0] = begin;
> + tmp++;
> + }
> + strcpy(tmp, dev_name(dev));
> + len2 = strlen(dev_name(dev));
> + tmp += len2;
> + tmp[0] = '.';
> + tmp++;
> +
> + list_for_each_entry(param, &dev->parameters, list) {
> + memset(tmp, 0x0, 128 - (int)(tmp - cmd));
> + if (!strncmp(instr, param->name, len)) {
> + strcpy(tmp, param->name);
> + len2 = strlen(param->name);
> + if (begin)
> + tmp[len2] = ' ';
> + else
> + tmp[len2] = '=';
> + tmp[len2 + 1] = 0;
> + string_list_add(sl, cmd);
> + }
> + }
The fixed length arrays might overflow. Maybe not in this function, but
when this becomes a template maybe in other functions. Looking at it
this code could really improve with sprintf, more specifically
string_list_asprintf. I'll post a patch in a minute.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list