[PATCH 1/2 v2] complete: add device name complete support

[PATCH 1/2 v2] complete: add device name complete support

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/complete.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/common/complete.c b/common/complete.c
index 46ba871..40f2e15 100644
--- a/common/complete.c
+++ b/common/complete.c
@@ -84,6 +84,28 @@ static int command_complete(struct string_list *sl, char *instr)
 	return 0;
 }
 
+static int device_complete(struct string_list *sl, char *instr)
+{
+	struct device_d *dev;
+	char *instr_param;
+	char cmd[128];
+	int len, len2;
+
+	len = strlen(instr);
+
+	for_each_device(dev) {
+		if (!strncmp(instr, dev_name(dev), len)) {
+			len2 = strlen(dev_name(dev));
+			strcpy(cmd, dev_name(dev));
+			cmd[len2] = ' ';
+			cmd[len2 + 1] = 0;
+			string_list_add(sl, cmd);
+		}
+	}
+
+	return 0;
+}
+
 static int tab_pressed = 0;
 
 void complete_reset(void)
@@ -124,6 +146,8 @@ int complete(char *instr, char **outstr)
 	} else
 		command_complete(&sl, instr);
 
+	device_complete(&sl, instr);
+
 	pos = strlen(instr);
 
 	*outstr = "";
-- 
1.7.4.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] complete: add var and device param complete support

[Jean-Christophe PLAGNIOL-VILLARD]

with $xx or xx= or if device $xx.yy or xx.yy=

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/complete.c |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 109 insertions(+), 1 deletions(-)

diff --git a/common/complete.c b/common/complete.c
index 40f2e15..56cefcf 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,10 +85,45 @@ 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 device_complete(struct string_list *sl, char *instr)
 {
 	struct device_d *dev;
-	char *instr_param;
 	char cmd[128];
 	int len, len2;
 
@@ -106,6 +142,77 @@ static int device_complete(struct string_list *sl, char *instr)
 	return 0;
 }
 
+static int env_param_complete(struct string_list *sl, char *instr)
+{
+	struct device_d *dev;
+	struct variable_d *var;
+	struct env_context *c, *current_c;
+	char cmd[128];
+	char *instr_param;
+	char *instr_name = instr;
+	char *tmp = cmd;
+	int len, len2;
+	char end = '=';
+
+	if (*instr == '$') {
+		instr_name++;
+		cmd[0] = '$';
+		tmp++;
+		end = ' ';
+	}
+
+	instr_param = strrchr(instr_name, '.');
+	len = strlen(instr_name);
+
+	current_c = get_current_context();
+	var = current_c->local->next;
+	while (var) {
+		if (!strncmp(instr_name, 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_name, 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_name);
+		instr_param++;
+	} else {
+		len = strlen(instr_name);
+	}
+
+	for_each_device(dev) {
+		if (!strncmp(instr_name, dev_name(dev), len)) {
+			if (*instr == '$')
+				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)
@@ -147,6 +254,7 @@ int complete(char *instr, char **outstr)
 		command_complete(&sl, instr);
 
 	device_complete(&sl, instr);
+	env_param_complete(&sl, instr);
 
 	pos = strlen(instr);
 
-- 
1.7.4.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2 v2] complete: add device name complete support

[Sascha Hauer]

On Mon, Jun 06, 2011 at 11:11:23AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  common/complete.c |   24 ++++++++++++++++++++++++
>  1 files changed, 24 insertions(+), 0 deletions(-)

Sorry, this does not work. Pressing eth<TAB> on an empty command
line expands to

ethact (correct, this is a command)
eth0   (almost correct, it misses the '=')

'ls <TAB>' expands to

ls env/ (correct, this is a directory)
ls eth0 (incorrect, no valid expansion)

'ls n<TAB> expands to

ls nand0     (incorrect, this is a device name and can't be used here=
ls nfsroot=  (incorrect, no valid expansion)

Please check the context in which you are calling the different complete
functions like I suggested in my comment to the last patch.

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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2 v2] complete: add device name complete support

[Jean-Christophe PLAGNIOL-VILLARD]

On 11:58 Mon 06 Jun     , Sascha Hauer wrote:
> On Mon, Jun 06, 2011 at 11:11:23AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> >  common/complete.c |   24 ++++++++++++++++++++++++
> >  1 files changed, 24 insertions(+), 0 deletions(-)
> 
> Sorry, this does not work. Pressing eth<TAB> on an empty command
> line expands to
> 
> ethact (correct, this is a command)
> eth0   (almost correct, it misses the '=')
> 
> 'ls <TAB>' expands to
> 
> ls env/ (correct, this is a directory)
> ls eth0 (incorrect, no valid expansion)
> 
> 'ls n<TAB> expands to
> 
> ls nand0     (incorrect, this is a device name and can't be used here=
> ls nfsroot=  (incorrect, no valid expansion)
> 
> Please check the context in which you are calling the different complete
> functions like I suggested in my comment to the last patch.
if devinfo it's valid

for the var evaluation we can use them when we want

ok I check

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox