[PATCH] parameter: strip leading and trailing whitespaces

[PATCH] parameter: strip leading and trailing whitespaces

[Marco Felsch]

My initial bug was the following: I set the
global.boot.default="boot1 boot2 " and executed the 'boot' command. If
both targets are not bootable barebox starts to execute the boot scripts
found under /env/boot. This is because of the command/boot.c
implementation and the leading whitespace. Without the whitespace only
the two desired boot targets are tried.

IMHO leading and trailing whitespaces are error-prone in many cases. If
someone wants to concatenate strings he/she should add spaces on
purpose. So I fixed the bug above globally by always stripping leading
and trailing whitespaces.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 lib/parameter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/parameter.c b/lib/parameter.c
index 00e9a9ff4e..fdbb2e71d1 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -253,11 +253,14 @@ static int param_string_set(struct device_d *dev, struct param_d *p, const char
 	struct param_string *ps = to_param_string(p);
 	int ret;
 	char *value_save = *ps->value;
+	char *value_new;
 
 	if (!val)
 		val = "";
 
-	*ps->value = xstrdup(val);
+	value_new = xstrdup(val);
+	value_new = strim(value_new);
+	*ps->value = value_new;
 
 	if (!ps->set)
 		return 0;
-- 
2.20.1


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

Re: [PATCH] parameter: strip leading and trailing whitespaces

[Sascha Hauer]

On Wed, Oct 30, 2019 at 06:03:39PM +0100, Marco Felsch wrote:
> My initial bug was the following: I set the
> global.boot.default="boot1 boot2 " and executed the 'boot' command. If
> both targets are not bootable barebox starts to execute the boot scripts
> found under /env/boot. This is because of the command/boot.c
> implementation and the leading whitespace. Without the whitespace only
> the two desired boot targets are tried.
> 
> IMHO leading and trailing whitespaces are error-prone in many cases. If
> someone wants to concatenate strings he/she should add spaces on
> purpose. So I fixed the bug above globally by always stripping leading
> and trailing whitespaces.
> 
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  lib/parameter.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Applied, thanks

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