wok-6.x rev 15485
libzip: race condition
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Nov 11 07:22:44 2013 +0000 (2013-11-11) |
parents | 9a64a856eee1 |
children | 6531dff139b3 |
files | ipxe/stuff/lkrnprefix.S libzip/receipt memtest/stuff/bootloader.S |
line diff
1.1 --- a/ipxe/stuff/lkrnprefix.S Sun Nov 10 17:35:50 2013 +0000 1.2 +++ b/ipxe/stuff/lkrnprefix.S Mon Nov 11 07:22:44 2013 +0000 1.3 @@ -203,9 +203,8 @@ 1.4 pushfw // = 286 : flags[12..15] are forced 0 1.5 popw %cx // > 286 : only flags[15] is forced 0 1.6 popfw // restore flags 1.7 - addb %ah, %ch // test F0 and 00 cases 1.8 - cmpb %ah, %ch 1.9 - jbe puts // C=8086/80186, Z=80286 1.10 + cmpb %ah, %ch // test Fx and 0x cases 1.11 + js puts // S= not 386+ 1.12 // smsww %ax 1.13 // andb $1, %al 1.14 // jne puts
2.1 --- a/libzip/receipt Sun Nov 10 17:35:50 2013 +0000 2.2 +++ b/libzip/receipt Mon Nov 11 07:22:44 2013 +0000 2.3 @@ -18,7 +18,7 @@ 2.4 { 2.5 cd $src 2.6 ./configure --prefix=/usr && 2.7 - make && make install 2.8 + make && make -j 1 install 2.9 } 2.10 2.11 # Rules to gen a SliTaz package suitable for Tazpkg.
3.1 --- a/memtest/stuff/bootloader.S Sun Nov 10 17:35:50 2013 +0000 3.2 +++ b/memtest/stuff/bootloader.S Mon Nov 11 07:22:44 2013 +0000 3.3 @@ -69,11 +69,11 @@ 3.4 # ifdef HELP 3.5 # define PUTS 3.6 movw $EXEADRS(helpmsg), %si 3.7 - cmpb $'/', %al 3.8 + cmpb $'/'+1, %al 3.9 # ifdef CHECK_REALMODE 3.10 - je jeputs 3.11 + js jsputs 3.12 # else 3.13 - je puts 3.14 + js puts 3.15 # endif 3.16 # endif 3.17 nocmdline: 3.18 @@ -91,10 +91,9 @@ 3.19 pushfw // = 286 : flags[12..15] are forced 0 3.20 popw %dx // > 286 : only flags[15] is forced 0 3.21 popfw // restore flags 3.22 - addb %ah, %dh // test F0 and 00 cases 3.23 - cmpb %ah, %dh 3.24 -jeputs: 3.25 - jbe puts // C=8086/80186, Z=80286 3.26 + cmpb %ah, %dh // test Fx and 0x cases 3.27 +jsputs: 3.28 + js puts // S= not 386+ 3.29 smsww %dx 3.30 shrw $1, %dx 3.31 jc puts