diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-09-14 17:27:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-15 14:42:49 +0200 |
| commit | a49cf5c14d050bc37f0d12f2623c86a2d383e9b7 (patch) | |
| tree | c0a2f52e49c5010981bcc4b96a2581c3ba90b088 /commands | |
| parent | a1f6b4dbcdfd85c82e7ccd1e6be82264d16019ee (diff) | |
| download | barebox-a49cf5c14d050bc37f0d12f2623c86a2d383e9b7.tar.gz barebox-a49cf5c14d050bc37f0d12f2623c86a2d383e9b7.tar.xz | |
boot: ignore all spaces between boot targets
Boot targets are split by space. strsep unlike strtok(_r) returns an
empty string for each pair of consecutive delimiters. Ignore this case.
Note that this changes behavior: previously both
boot ''
global.boot.default= boot
were identical to
boot /env/boot
With this change, this is no longer the case.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/boot.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/commands/boot.c b/commands/boot.c index ad2d83a179..d7795bde72 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -76,6 +76,8 @@ static int do_boot(int argc, char *argv[]) entries = bootentries_alloc(); while ((name = next(&handle)) != NULL) { + if (!*name) + continue; ret = bootentry_create_from_name(entries, name); if (ret <= 0) printf("Nothing bootable found on '%s'\n", name); |