aboutsummaryrefslogtreecommitdiffstats
path: root/com32/menu/readconfig.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-06-24 12:03:05 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-06-24 12:03:05 +0100
commit4ff8fcac8e7b5046987dee15592ab510ab343aa8 (patch)
tree79bdc0aad642b35afe715b4201b0103ed29f0a44 /com32/menu/readconfig.c
parentc9c90411958eb6c68da05de745d0ffa7f322fe20 (diff)
parent98d7a252247750eccea9cf32df37afbad3e4c7b1 (diff)
downloadsyslinux-4ff8fcac8e7b5046987dee15592ab510ab343aa8.tar.gz
syslinux-4ff8fcac8e7b5046987dee15592ab510ab343aa8.tar.xz
syslinux-4ff8fcac8e7b5046987dee15592ab510ab343aa8.zip
Merge branch 'menu-ipappend-1-for-mfleming' of git://github.com/geneC/syslinux into elflink
Pull a fix for the SYSAPPEND directive from Gene Cumm, * 'menu-ipappend-1-for-mfleming' of git://github.com/geneC/syslinux: menu.c32: Fix SYSAPPEND
Diffstat (limited to 'com32/menu/readconfig.c')
-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..adec8a7d 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 = atoi(skipspace(ep));
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));