# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1384082372 0
# Node ID bd4321dee983afd1881062dd5ca32ab5cc3ed6f9
# Parent  da9d337802a63ff971cf885880a3a647e4da79f1
memtest: default setup size = 4

diff -r da9d337802a6 -r bd4321dee983 memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Sun Nov 10 10:36:42 2013 +0000
+++ b/memtest/stuff/bootloader.S	Sun Nov 10 11:19:32 2013 +0000
@@ -66,9 +66,6 @@
 	decw	%si
 	rep
 	  movsb
-# if defined(HELP) || defined(CHECK_REALMODE)
-	pushw	%cx		// dos exit (int $0x20)
-# endif
 # ifdef HELP
 # define PUTS
 	movw	$EXEADRS(helpmsg), %si
@@ -206,7 +203,7 @@
 	lodsb
 	orb	%al, %al
 	jne	putslp	
-	ret
+	int	$0x20			// dos exit
 #endif
 #ifdef EXE_SUPPORT
 movesys:
diff -r da9d337802a6 -r bd4321dee983 memtest/stuff/pack
--- a/memtest/stuff/pack	Sun Nov 10 10:36:42 2013 +0000
+++ b/memtest/stuff/pack	Sun Nov 10 11:19:32 2013 +0000
@@ -37,10 +37,11 @@
 	uudecode | gunzip >$2
 	dd if=$1 bs=1 skip=497 seek=497 count=15 of=$2 conv=notrunc
 	setup="$(echo $(od -j 497 -N 1 -dAn $1))"
+	[ $setup -eq 0 ] && setup=4
 	syssize="$(echo $(od -j 500 -N 2 -dAn $1))"
+	[ $syssize -eq 0 ] && syssize=$((($(stat -c %s $1) + 15 - 512*($setup + 1))/16))
 	store $syssize $2 XXXO
 	store $setup $2 XXXS 1
-	[ $syssize -eq 0 ] && syssize=$((($(stat -c %s $1) + 15 - 512*($setup + 1))/16))
 	dd if=$1 bs=512 count=$setup skip=1 | compress >>$2
 	dd if=$1 bs=16 count=$syssize skip=$((32*(1+$setup))) | compress >>$2
 	size=$(stat -c %s $2)
@@ -49,14 +50,13 @@
 	store 4 $2 497 1
 	store $((($size+511)/512)) $2 4
 	store $((($size+15)/16)) $2 14
-	echo -en "$3" | dd conv=notrunc bs=1 seek=YYY of=$2 count=ZZZ
+	echo -e "$3" | dd conv=notrunc bs=1 seek=YYY of=$2 count=ZZZ
 }
 
 HELP="$(unix2dos <<EOT
 Memtest86+ is an endless advanced memory diagnostic tool released under the
 terms of the Gnu Public License (GPL).
 
-
 EOT
 )"
 main $1 ${2:-$1.packed} "${3:-$HELP}" 2>/dev/null <<EOT