[syslinux:elflink] core & menu: fix IPAPPEND/SYSAPPEND conversion

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Wed Jun 26 13:00:05 PDT 2013


Commit-ID:  bd464f0a54e847489190d9e859f6755832eb12fb
Gitweb:     http://www.syslinux.org/commit/bd464f0a54e847489190d9e859f6755832eb12fb
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Wed, 26 Jun 2013 11:55:24 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Wed, 26 Jun 2013 11:55:24 -0400

core & menu: fix IPAPPEND/SYSAPPEND conversion

Make both use the same functions.

Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

---
 com32/elflink/ldlinux/readconfig.c | 2 +-
 com32/menu/readconfig.c            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index d6e34bd..3ee825d 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 adec8a7..b7814be 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


More information about the Syslinux-commits mailing list