mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rolf Evers-Fischer <embedded24@evers-fischer.de>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org,
	Rolf Evers-Fischer <embedded24@evers-fischer.de>
Subject: Re: [PATCH] boot: show all boot sources
Date: Tue, 1 Jul 2014 14:10:07 +0200 (CEST)	[thread overview]
Message-ID: <alpine.DEB.2.10.1407011407550.7233@9VTHT2J-D520> (raw)
In-Reply-To: <20140701065409.GO14257@pengutronix.de>

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2114 bytes --]



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@evers-fischer.de>
>> ---
>>  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

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

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

  reply	other threads:[~2014-07-01 12:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-30 12:21 Rolf Evers-Fischer
2014-07-01  6:54 ` Sascha Hauer
2014-07-01 12:10   ` Rolf Evers-Fischer [this message]
2014-07-02  6:30     ` Sascha Hauer
2014-07-02 10:01       ` Rolf Evers-Fischer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.10.1407011407550.7233@9VTHT2J-D520 \
    --to=embedded24@evers-fischer.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox