On Tue, 1 Jul 2014, Sascha Hauer wrote:
On Mon, Jun 30, 2014 at 02:21:39PM +0200, Rolf Evers-Fischer wrote:
This patch fixes the presentation of all bootsources with 'boot -m' and
'boot -l' command.
Signed-off-by: Rolf Evers-Fischer <embedded24@xxxxxxxxxxxxxxxx>
---
commands/boot.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/commands/boot.c b/commands/boot.c
index c8eae10..1a1856d 100644
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -433,12 +433,12 @@ static int do_boot(int argc, char *argv[])
}
if (do_list) {
- bootsources_list(sources, num_sources);
+ bootsources_list(&argv[optind], argc - optind);
goto out;
}
if (do_menu) {
- bootsources_menu(sources, num_sources);
+ bootsources_menu(&argv[optind], argc - optind);
goto out;
}
What exactly fixes this? Looking at the code we have:
if (optind < argc) {
num_sources = argc - optind;
sources = xmemdup(&argv[optind], sizeof(char *) *num_sources);
} else {
...
}
Which should do what you want.
Unfortunately it doesn't do what I want. If I invoke "boot -l" on the bb
shell, I get optind=argc=2. Therefore barebox executes the "else" clause,
which lists only the default bootsource.
But now I understand that replacing the "<" with "<=" might be a better
fix for this problem:
diff --git a/commands/boot.c b/commands/boot.c
index ba26cac..9823538 100644
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -395,7 +395,7 @@ static int do_boot(int argc, char *argv[])
}
}
- if (optind < argc) {
+ if (optind <= argc) {
num_sources = argc - optind;
sources = xmemdup(&argv[optind], sizeof(char *) *
num_sources);
} else {
What is your opinion?
On which barebox version are you?
I'm using barebox-2014.06.0.
Best regards,
Rolf
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
