[PATCH 1/2 v3] complete: add device name complete support for devinfo

[PATCH 1/2 v3] complete: add device name complete support for devinfo

[Jean-Christophe PLAGNIOL-VILLARD]

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

v3:

	just complete the device name for devinfo

	the evaluation and param device setting will be add later

Best Regards,
J.

diff --git a/common/complete.c b/common/complete.c
index 46ba871..c3a05f1 100644
--- a/common/complete.c
+++ b/common/complete.c
@@ -84,6 +84,27 @@ 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 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)
@@ -117,12 +138,19 @@ int complete(char *instr, char **outstr)
 	instr = t;
 
 	/* get the completion possibilities */
-	if ((t = strrchr(t, ' '))) {
-		t++;
-		file_complete(&sl, t);
-		instr = t;
-	} else
-		command_complete(&sl, instr);
+	if (!strcmp(instr, "devinfo ")) {
+		device_complete(&sl, instr + 8);
+	} else {
+		if ((t = strrchr(t, ' '))) {
+			t++;
+			file_complete(&sl, t);
+			instr = t;
+		} else {
+			command_complete(&sl, instr);
+		}
+	}
+
+	device_complete(&sl, instr);
 
 	pos = strlen(instr);
 
-- 
1.7.4.1


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

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

[Jean-Christophe PLAGNIOL-VILLARD]

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

the evaluation completion is onle display if you put '$' at least

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


diff --git a/common/complete.c b/common/complete.c
index c3a05f1..c79a0d6 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,42 @@ 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;
@@ -105,6 +142,75 @@ static int device_complete(struct string_list *sl, char *instr)
 	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);
+	}
+
+	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)
@@ -141,17 +247,20 @@ int complete(char *instr, char **outstr)
 	if (!strcmp(instr, "devinfo ")) {
 		device_complete(&sl, instr + 8);
 	} else {
-		if ((t = strrchr(t, ' '))) {
+		t = strrchr(t, ' ');
+		if (t) {
 			t++;
-			file_complete(&sl, t);
+			if (*t == '$')
+				env_param_complete(&sl, t + 1, 1);
+			else
+				file_complete(&sl, t);
 			instr = t;
 		} else {
 			command_complete(&sl, instr);
+			env_param_complete(&sl, instr, 0);
 		}
 	}
 
-	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

Re: [PATCH 1/2 v3] complete: add device name complete support for devinfo

[Jean-Christophe PLAGNIOL-VILLARD]

On 13:01 Mon 06 Jun     , Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
ignore wrong version

>  common/complete.c |   40 ++++++++++++++++++++++++++++++++++------
>  1 files changed, 34 insertions(+), 6 deletions(-)
> 
> v3:
> 
> 	just complete the device name for devinfo
> 
> 	the evaluation and param device setting will be add later
> 
> Best Regards,
> J.
> 
> diff --git a/common/complete.c b/common/complete.c
> index 46ba871..c3a05f1 100644
> --- a/common/complete.c
> +++ b/common/complete.c
> @@ -84,6 +84,27 @@ 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 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)
> @@ -117,12 +138,19 @@ int complete(char *instr, char **outstr)
>  	instr = t;
>  
>  	/* get the completion possibilities */
> -	if ((t = strrchr(t, ' '))) {
> -		t++;
> -		file_complete(&sl, t);
> -		instr = t;
> -	} else
> -		command_complete(&sl, instr);
> +	if (!strcmp(instr, "devinfo ")) {
> +		device_complete(&sl, instr + 8);
here should be
	if (!strncmp(instr, "devinfo ", 8)) {
		instr += 8;
		device_complete(&sl, instr);
Best Regards,
J.

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