From: Rob Clark <robdclark@gmail.com>
Date: Mon, 24 Jul 2017 11:59:09 +0000 (-0400)
Subject: efi_loader: EFI file paths should be DOS style
X-Git-Tag: v2017.09-rc1~13^2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e433e960887a480f520d4b82ff8d3df3e037ffb;p=oweals%2Fu-boot.git

efi_loader: EFI file paths should be DOS style

shim.efi, for example, actually tries to parse this, but is expecting
backslashes.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index e9f14d54af..954245740b 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -339,7 +339,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
 {
 	__maybe_unused struct blk_desc *desc;
 	char devname[32] = { 0 }; /* dp->str is u16[32] long */
-	char *colon;
+	char *colon, *s;
 
 #if defined(CONFIG_BLK) || CONFIG_IS_ENABLED(ISO_PARTITION)
 	desc = blk_get_dev(dev, simple_strtol(devnr, NULL, 10));
@@ -384,5 +384,9 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
 	} else {
 		snprintf(devname, sizeof(devname), "%s", path);
 	}
+	/* DOS style file path: */
+	s = devname;
+	while ((s = strchr(s, '/')))
+		*s++ = '\\';
 	ascii2unicode(bootefi_image_path[0].str, devname);
 }