aboutsummaryrefslogtreecommitdiffstats
path: root/com32/menu
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-06-28 15:07:50 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-06-28 15:30:12 +0100
commitd44ea657666e3a34d3859fc7262185e24c0b40fe (patch)
treece274c90f71c9b11ee83c3c9e30681c1af77c414 /com32/menu
parenta17fdfb873bebc135a73580a493913cdec066f28 (diff)
parent00d0f3add99de6d9c83ff2492bac175a5e1b8a11 (diff)
downloadsyslinux-d44ea657666e3a34d3859fc7262185e24c0b40fe.tar.gz
syslinux-d44ea657666e3a34d3859fc7262185e24c0b40fe.tar.xz
syslinux-d44ea657666e3a34d3859fc7262185e24c0b40fe.zip
Merge tag 'syslinux-5.11-pre3' into firmwaresyslinux-6.01-pre5
syslinux-5.11-pre3 Conflicts: core/Makefile
Diffstat (limited to 'com32/menu')
-rw-r--r--com32/menu/readconfig.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index 7eaea280..b7814be2 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -1044,11 +1044,13 @@ do_include:
m->ontimeout = refstrdup(skipspace(p + 9));
} else if (looking_at(p, "allowoptions")) {
m->allowedit = !!atoi(skipspace(p + 12));
- } else if (looking_at(p, "ipappend") || looking_at(p, "sysappend")) {
+ } else if ((ep = looking_at(p, "ipappend")) ||
+ (ep = looking_at(p, "sysappend"))) {
+ uint32_t s = strtoul(skipspace(ep), NULL, 0);
if (ld.label)
- ld.ipappend = atoi(skipspace(p + 8));
+ ld.ipappend = s;
else
- ipappend = atoi(skipspace(p + 8));
+ ipappend = s;
} else if (looking_at(p, "default")) {
refstr_put(globaldefault);
globaldefault = refstrdup(skipspace(p + 7));