[PATCH] blspec: Allow the "options" key to be given multiple times

[PATCH] blspec: Allow the "options" key to be given multiple times

[Robert Karszniewicz]

The Boot Loader Spec says:
"This key is optional and may appear more than once in which case all
specified parameters are used in the order they are listed."

Signed-off-by: Robert Karszniewicz <r.karszniewicz@phytec.de>
---
 common/blspec.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/common/blspec.c b/common/blspec.c
index 1a6d581..3be26d0 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -298,6 +298,18 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries,
 
 		val = end;
 
+		if (!strcmp(name, "options")) {
+			/* If there was a previous "options" key given, prepend its value
+			 * (as per spec). */
+			char *prev_val = blspec_entry_var_get(entry, name);
+			if (prev_val) {
+				char *opts = xasprintf("%s %s", prev_val, val);
+				blspec_entry_var_set(entry, name, opts);
+				free(opts);
+				continue;
+			}
+		}
+
 		blspec_entry_var_set(entry, name, val);
 	}
 
-- 
2.7.4


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

Re: [PATCH] blspec: Allow the "options" key to be given multiple times

[Sascha Hauer]

On Mon, May 18, 2020 at 12:37:35PM +0200, Robert Karszniewicz wrote:
> The Boot Loader Spec says:
> "This key is optional and may appear more than once in which case all
> specified parameters are used in the order they are listed."
> 
> Signed-off-by: Robert Karszniewicz <r.karszniewicz@phytec.de>
> ---
>  common/blspec.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/common/blspec.c b/common/blspec.c
> index 1a6d581..3be26d0 100644
> --- a/common/blspec.c
> +++ b/common/blspec.c
> @@ -298,6 +298,18 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries,
>  
>  		val = end;
>  
> +		if (!strcmp(name, "options")) {
> +			/* If there was a previous "options" key given, prepend its value
> +			 * (as per spec). */
> +			char *prev_val = blspec_entry_var_get(entry, name);
> +			if (prev_val) {
> +				char *opts = xasprintf("%s %s", prev_val, val);
> +				blspec_entry_var_set(entry, name, opts);
> +				free(opts);
> +				continue;
> +			}
> +		}
> +
>  		blspec_entry_var_set(entry, name, val);
>  	}
>  
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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