[syslinux:elflink] ldlinux: fix loading of kbdmap files

[syslinux-bot for Matt Fleming]

Commit-ID:  e396f093c0c9130c4112d5395142a66c50aab551
Gitweb:     http://www.syslinux.org/commit/e396f093c0c9130c4112d5395142a66c50aab551
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 13 Jun 2013 14:22:26 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 13 Jun 2013 14:22:26 +0100

ldlinux: fix loading of kbdmap files

Use the canonical code sequence for opening the kbdmap file instead of
referencing KernelName, which presumably is a remanent of the old
assembly code.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/elflink/ldlinux/readconfig.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index ab8e240..d6e34bd 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1224,16 +1224,9 @@ do_include:
 		refstr_put(filename);
 	} else if (looking_at(p, "kbdmap")) {
 		const char *filename;
-		char *dst = KernelName;
-		size_t len = FILENAME_MAX - 1;
-
-		filename = refstrdup(skipspace(p + 4));
-
-		while (len-- && not_whitespace(*filename))
-			*dst++ = *filename++;
-		*dst = '\0';
 
-		loadkeys(KernelName);
+		filename = refstrdup(skipspace(p + 6));
+		loadkeys(filename);
 		refstr_put(filename);
 	}
 	/*