From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 13.97.mail-out.ovh.net ([87.98.173.128] helo=97.mail-out.ovh.net) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QUqkL-0008Kt-VC for barebox@lists.infradead.org; Fri, 10 Jun 2011 01:42:51 +0000 Received: from mail185.ha.ovh.net (b9.ovh.net [213.186.33.59]) by 97.mail-out.ovh.net (Postfix) with SMTP id 4AB7D4A7675 for ; Fri, 10 Jun 2011 03:43:25 +0200 (CEST) From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 10 Jun 2011 03:29:27 +0200 Message-Id: <1307669367-3129-1-git-send-email-plagnioj@jcrosoft.com> In-Reply-To: <1307631354-5553-1-git-send-email-plagnioj@jcrosoft.com> References: <1307631354-5553-1-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH v2] complete: add var and device param complete support To: barebox@lists.infradead.org with $xx or xx= or if device $xx.yy or xx.yy= Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- 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 #include #include +#include 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); + } + } + + return 0; +} + +static int env_param_complete(struct string_list *sl, char *instr, int eval) +{ + struct device_d *dev; + struct variable_d *var; + struct env_context *c, *current_c; + char cmd[128]; + char *instr_param; + char *tmp = cmd; + int len, len2; + char end = '='; + + if (eval) { + cmd[0] = '$'; + tmp++; + end = ' '; + } + + instr_param = strrchr(instr, '.'); + len = strlen(instr); + + current_c = get_current_context(); + var = current_c->local->next; + while (var) { + if (!strncmp(instr, var_name(var), len)) { + len2 = strlen(var_name(var)); + strcpy(tmp, var_name(var)); + tmp[len2] = end; + tmp[len2 + 1] = 0; + string_list_add(sl, cmd); + } + var = var->next; + } + + c = get_current_context(); + while(c) { + var = c->global->next; + while (var) { + if (!strncmp(instr, var_name(var), len)) { + len2 = strlen(var_name(var)); + strcpy(tmp, var_name(var)); + tmp[len2] = end; + tmp[len2 + 1] = 0; + string_list_add(sl, cmd); + } + var = var->next; + } + c = c->parent; + } + + if (instr_param) { + len = (instr_param - instr); + instr_param++; + } else { + len = strlen(instr); + instr_param = ""; + } + + for_each_device(dev) { + if (!strncmp(instr, dev_name(dev), len)) { + if (eval) + device_param_complete('$', dev, sl, instr_param); + else + device_param_complete(0, dev, sl, instr_param); + } + } + + return 0; +} + static int tab_pressed = 0; void complete_reset(void) @@ -121,8 +227,12 @@ int complete(char *instr, char **outstr) t++; file_complete(&sl, t); instr = t; - } else + } else { command_complete(&sl, instr); + env_param_complete(&sl, instr, 0); + } + if (*instr == '$') + env_param_complete(&sl, instr + 1, 1); pos = strlen(instr); -- 1.7.4.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox