Merge branch 'master' into dir

4 files changed, 22 insertions, 28 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] :
diff --git a/utils/keytab-lilo b/utils/keytab-lilo
index 7dbcf94b..9e341605 100755
--- a/utils/keytab-lilo
+++ b/utils/keytab-lilo
@@ -1,32 +1,17 @@
 #!/usr/bin/perl
-# --------------------------------------------------------------------------
-# This program was taken from the LILO-20 distribution; only this header
-# was added.
-#
-# LILO program code, documentation and auxiliary programs are
-# Copyright 1992-1997 Werner Almesberger.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms of parts of or the
-# whole original or derived work are permitted provided that the
-# original work is properly attributed to the author. The name of the
-# author may not be used to endorse or promote products derived from
-# this software without specific prior written permission. This work
-# is provided "as is" and without any express or implied warranties.
-# --------------------------------------------------------------------------
 
-eval { use bytes; }; eval { binmode STDOUT; };
+eval { use bytes; };
+eval { binmode STDOUT; };
 
-$DEFAULT_PATH = "/lib/kbd/keymaps";
 $DEFAULT_MAP = "us";
-$DEFAULT_EXT = ".map";
+$DEFAULT_EXT = ".kmap";
 
 sub usage
 {
     print STDERR
       "usage: $0 [ -p old_code=new_code ] ...\n".
-      (" "x(8+length $0))."[path]default_layout[.map] ] ".
-      "[path]kbd_layout[.map]\n";
+      (" "x(8+length $0))."[path]default_layout[.kmap] ] ".
+      "[path]kbd_layout[.kmap]\n";
     exit 1;
 }
 
@@ -54,8 +39,7 @@ sub load_map
     local ($empty,$current);
 
     $map = $DEFAULT_MAP unless defined $map;
-    # $map = $DEFAULT_PATH."/".$map unless $map =~ m|/|;
-    # $map .= $DEFAULT_EXT unless $map =~ m|/[^/]+\.[^/]+$|;
+    $map .= $DEFAULT_EXT unless $map =~ m|/[^/]+\.[^/]+$|;
     if (!open(FILE,"loadkeys -m $map |")) {
 	print STDERR "loadkeys -m $map: $!\n";
 	exit 1;
@@ -64,9 +48,9 @@ sub load_map
     $empty = 1;
     while (<FILE>) {
 	chop;
-	if (/^u_short\s+(\S+)_map\[\S+\]\s+=\s+{\s*$/) {
+	if (/^(static\s+)?u_short\s+(\S+)_map\[\S*\]\s+=\s+{\s*$/) {
 	    die "active at beginning of map" if defined $current;
-	    $current = $pfx.":".$1;
+	    $current = $pfx.":".$2;
 	    next;
 	}
 	undef $current if /^};\s*$/;
diff --git a/win32/find-mingw.sh b/win32/find-mingw.sh
index 59c5d31a..7a4491cd 100755
--- a/win32/find-mingw.sh
+++ b/win32/find-mingw.sh
@@ -4,6 +4,14 @@ cc="$1"
 
 for prefix in \
     mingw- \
+    i386-pc-mingw32- \
+    i486-pc-mingw32- \
+    i586-pc-mingw32- \
+    i686-pc-mingw32- \
+    i386-pc-mingw32msvc- \
+    i486-pc-mingw32msvc- \
+    i586-pc-mingw32msvc- \
+    i686-pc-mingw32msvc- \
     i386-mingw32- \
     i486-mingw32- \
     i586-mingw32- \