aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2013-06-26 11:55:24 -0400
committerGene Cumm <gene.cumm@gmail.com>2013-06-26 11:55:24 -0400
commitbd464f0a54e847489190d9e859f6755832eb12fb (patch)
tree2df349494b5af4d34bbdaf6fa6a06cc3925d5224
parent4ff8fcac8e7b5046987dee15592ab510ab343aa8 (diff)
downloadsyslinux-bd464f0a54e847489190d9e859f6755832eb12fb.tar.gz
syslinux-bd464f0a54e847489190d9e859f6755832eb12fb.tar.xz
syslinux-bd464f0a54e847489190d9e859f6755832eb12fb.zip
core & menu: fix IPAPPEND/SYSAPPEND conversion
Make both use the same functions. Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
-rw-r--r--com32/elflink/ldlinux/readconfig.c2
-rw-r--r--com32/menu/readconfig.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index d6e34bda..3ee825d7 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1164,7 +1164,7 @@ do_include:
allowoptions = !!atoi(skipspace(p + 12));
} else if ((ep = looking_at(p, "ipappend")) ||
(ep = looking_at(p, "sysappend"))) {
- uint32_t s = strtoul(skipspace(ep), NULL, 16);
+ uint32_t s = strtoul(skipspace(ep), NULL, 0);
if (ld.label)
ld.ipappend = s;
else
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index adec8a7d..b7814be2 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -1046,7 +1046,7 @@ do_include:
m->allowedit = !!atoi(skipspace(p + 12));
} else if ((ep = looking_at(p, "ipappend")) ||
(ep = looking_at(p, "sysappend"))) {
- uint32_t s = atoi(skipspace(ep));
+ uint32_t s = strtoul(skipspace(ep), NULL, 0);
if (ld.label)
ld.ipappend = s;
else