[syslinux:elflink] menu.c32: Fix SYSAPPEND

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Mon Jun 24 04:09:03 PDT 2013


Commit-ID:  98d7a252247750eccea9cf32df37afbad3e4c7b1
Gitweb:     http://www.syslinux.org/commit/98d7a252247750eccea9cf32df37afbad3e4c7b1
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Sun, 23 Jun 2013 23:30:51 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Sun, 23 Jun 2013 23:30:51 -0400

menu.c32: Fix SYSAPPEND

Using the SYSAPPEND directive would examine "D" instead of the
value after the directive.  Also allows a 1-step switch to strtol()

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

---
 com32/menu/readconfig.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index 7eaea28..adec8a7 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));


More information about the Syslinux-commits mailing list