diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-06-13 14:22:26 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-06-13 14:22:26 +0100 |
commit | e396f093c0c9130c4112d5395142a66c50aab551 (patch) | |
tree | 78b6497321b077ab6548beb30bd75f342c8dbdea | |
parent | 19455794d144c2c38f483890e0d384bc43b5fd63 (diff) | |
download | syslinux-e396f093c0c9130c4112d5395142a66c50aab551.tar.gz syslinux-e396f093c0c9130c4112d5395142a66c50aab551.tar.xz syslinux-e396f093c0c9130c4112d5395142a66c50aab551.zip |
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@intel.com>
-rw-r--r-- | com32/elflink/ldlinux/readconfig.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c index ab8e240d..d6e34bda 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); } /* |