aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-02-15 16:35:11 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-02-15 16:35:11 -0800
commit3eee66c2495c524007a1aff64d5b4813a0f159cf (patch)
tree9a23fd91529b28e31cbe219f5068a2c96f2329b8 /com32
parent6174d35033800faa87c208683d26d3a2e1ae5156 (diff)
parenta34a0f89fc0b6f06e5958d3b3a2a0f09ced81a81 (diff)
downloadsyslinux-3eee66c2495c524007a1aff64d5b4813a0f159cf.tar.gz
syslinux-3eee66c2495c524007a1aff64d5b4813a0f159cf.tar.xz
syslinux-3eee66c2495c524007a1aff64d5b4813a0f159cf.zip
Merge branch 'master' into dir
Diffstat (limited to 'com32')
-rw-r--r--com32/libutil/ansiline.c2
-rw-r--r--com32/modules/ifcpu64.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/com32/libutil/ansiline.c b/com32/libutil/ansiline.c
index 6ec1e182..4cdac024 100644
--- a/com32/libutil/ansiline.c
+++ b/com32/libutil/ansiline.c
@@ -82,7 +82,7 @@ void console_ansi_std(void)
tcgetattr(0, &tio);
tio.c_iflag &= ~ICRNL;
tio.c_iflag |= IGNCR;
- tio.c_cflag |= ICANON|ECHO;
+ tio.c_lflag |= ICANON|ECHO;
tcsetattr(0, TCSANOW, &tio);
fputs("\033[0m\033[20h", stdout);
}
diff --git a/com32/modules/ifcpu64.c b/com32/modules/ifcpu64.c
index 7d4581dd..c5979191 100644
--- a/com32/modules/ifcpu64.c
+++ b/com32/modules/ifcpu64.c
@@ -101,9 +101,7 @@ int main(int argc, char *argv[])
int i;
int n;
- for (i = 0; i < 3; i++)
- args[i] = &argv[1];
-
+ args[0] = &argv[1];
n = 1;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "--")) {
@@ -113,6 +111,10 @@ int main(int argc, char *argv[])
if (n >= 3)
break;
}
+ while (n < 3) {
+ args[n] = args[n-1];
+ n++;
+ }
boot_args(cpu_has_feature(X86_FEATURE_LM) ? args[0] :
cpu_has_feature(X86_FEATURE_PAE) ? args[1] :