[syslinux] boot... round 2

poma pomidorabelisima at gmail.com
Wed Jul 1 01:35:51 PDT 2015


To remind you once again.
ISOLINUX >= 6.00 built with GCC >= 5.0.0 causes a broken boot.
This relates specifically to the use of the vesamenu.c32,
menu.c32 works without problemos.

This "code" is already in 6.03, therefore this is not a fix for it!

Revert "SYSAPPEND: Fix space stripping"
This reverts commit 3106dcd
http://repo.or.cz/w/syslinux.git/commit/3106dcd

Fixes broken boot via vesamenu.c32 for the current git - 5186539 2015-06-27
version 6.04 2015 built with gcc version 5.1.1

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

diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 381b43f..dcdf91b 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -330,7 +330,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
     char c;
 
     while ((c = *src++)) {
-	if (c <= ' ' || c == '\x7f') {
+	if (c <= ' ' && c == '\x7f') {
 	    if (!was_space)
 		*dst++ = '_';
 	    was_space = true;
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index 257b042..b7814be 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
     char c;
 
     while ((c = *src++)) {
-	if (c <= ' ' || c == '\x7f') {
+	if (c <= ' ' && c == '\x7f') {
 	    if (!was_space)
 		*dst++ = '_';
 	    was_space = true;
diff --git a/core/sysappend.c b/core/sysappend.c
index 758703e..5c3f650 100644
--- a/core/sysappend.c
+++ b/core/sysappend.c
@@ -35,7 +35,7 @@ static char *copy_and_mangle(char *dst, const char *src)
     char c;
 
     while ((c = *src++)) {
-	if (c <= ' ' || c == '\x7f') {
+	if (c <= ' ' && c == '\x7f') {
 	    if (!was_space)
 		*dst++ = '_';
 	    was_space = true;
-- 
2.4.5




More information about the Syslinux mailing list