# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1538773352 -7200
# Node ID 46b511e941a720c1f31b6920d7418cacb171c90a
# Parent  570dc794f84792c9d994294ad1c0d4151cf98278
Up lz4 (1.8.3)

diff -r 570dc794f847 -r 46b511e941a7 linld/receipt
--- a/linld/receipt	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/receipt	Fri Oct 05 23:02:32 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Boot loader for DOS/Win9x."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
-SUFFIX="$(echo $VERSION | sed 's/[^0-9]//')"
+SUFFIX="${VERSION/./}"
 TARBALL="${PACKAGE}${SUFFIX}devel.tar.bz2"
 BASE_SITE="http://busybox.net/~vda/$PACKAGE"
 WEB_SITE="$BASE_SITE/README.txt"
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/ISO9660.CPP
--- a/linld/stuff/src/ISO9660.CPP	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/ISO9660.CPP	Fri Oct 05 23:02:32 2018 +0200
@@ -32,7 +32,6 @@
 
 int isoreaddir(int restart)
 {
-	static char dots[] = "..";
 	int size;
 	char *p;
 #ifdef __ROCKRIDGE
@@ -49,9 +48,10 @@
 		if (x->curdirsize < DIRSECTORSZ) return -1;
 	restarted:
 		readsector(&x->curdirofs);
-		x->curdirofs += SECTORSZ;
+		//x->curdirofs += SECTORSZ;
+		*(int *)((char *) &x->curdirofs+1) += SECTORSZ/256;
 		x->curdirsize -= DIRSECTORSZ;
-		x->curpos = 0;
+		x->curpos &= 0;
 	}
 	p = buffer + x->curpos;
 	if ((size = * (short *) p) == 0)
@@ -59,6 +59,7 @@
 	x->fileofs = (* (unsigned long *) (p + 2)) << SECTORBITS;
 	x->filesize = * (unsigned long *) (p + 10);
 	x->filemod = (p[25] & 2) ? 0040755 : 0100755;
+	//x->filemod = 0100755 - ((p[25] & (char)2) << 13);
 #ifdef __ROCKRIDGE
 	endname = NULL;
 	// p += 34 + (p[32] & -2); ?
@@ -75,8 +76,7 @@
 			break;
 		}
 		p += len;
-	}
-	while (buffer + x->curpos + size > p + 2);
+	} while (buffer + x->curpos + size - p > 2);
 	if (endname)
 		*endname = 0;
 	else
@@ -84,14 +84,12 @@
 	{
 		p = x->filename = buffer + x->curpos + 33;
 		p--;
-		switch (* (short *) p) {
-		case 0x0101:
-			x->filename = dots;
-			break;
-		case 0x0001:
-			x->filename = dots + 1;
-			break;
-		default:
+		if (((* (short *) p) & 0xFEFF) -1 == 0) {
+			x->filename = "..";
+			if ((* (short *) p) == 1)
+				x->filename++;
+		}
+		else {
 			p += *p; p--;
 			if (* (short *) (p) != 0x313B) {
 				p++; p++; // no ;1 to remove
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/LINLD.CPP
--- a/linld/stuff/src/LINLD.CPP	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/LINLD.CPP	Fri Oct 05 23:02:32 2018 +0200
@@ -35,7 +35,7 @@
     );
 }
 
-static char _cmdline[128];
+static char buf_cmdline[128];
 int main(int argc, char *argv[]) {
 
     (void) argc;
@@ -112,12 +112,12 @@
             topmem = strtol(s);
 	    goto addincmdline;
         }
-        else if(cmdline == (const char *) _cmdline + 1) {
+        else if(cmdline == (const char *) buf_cmdline + 1) {
 addincmdline:
-	    strcatb(_cmdline,*argv);
+	    strcatb(buf_cmdline,*argv);
         }
 	else if(i == 1 && fileattr(s) != -1) {
-	    cmdline = (const char *) _cmdline + 1;
+	    cmdline = (const char *) buf_cmdline + 1;
 	    goto set_kernel_name;
         }
 	else
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/MEMCPY32.ASM
--- a/linld/stuff/src/MEMCPY32.ASM	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/MEMCPY32.ASM	Fri Oct 05 23:02:32 2018 +0200
@@ -11,12 +11,17 @@
                 p386
 		endif
 
-        group   DGROUP  _TEXT,_DATA
+        group   DGROUP  _TEXT,_DATA,_BSS
         assume  cs:DGROUP,ds:DGROUP
 
         segment _DATA byte public use16 'DATA'
         ends    _DATA
 
+        segment _BSS byte public use16 'BSS'
+		global	sssp:dword
+sssp 		dd	?
+        ends    _BSS
+
         segment _TEXT byte public use16 'CODE'
 
 ;***************************************************************
@@ -35,19 +40,15 @@
 		mov	ds,bx
 		ifndef	NO386
 		push	[dword bx+4]		; save step
-		mov	ax,sp
-		push	ss
-		push	ax
-		pop	[dword cs:sssp]
 		mov	[word bx+4],offset step19
 		else
 		mov	ax,offset step19
 		xchg	ax,[word bx+4]
 		push	[word bx+6]	
 		push	ax			; save step
-		mov	[word cs:sssp],sp
-		mov	[word cs:sssp+2],ss
 		endif
+		mov	[word sssp],sp
+		mov	[word sssp+2],ss
 		;cmp	[byte bx+7],0F0h
 		;jnc	notdos
 		mov	[bx+6],cs
@@ -59,8 +60,6 @@
 		jmp	[dword bx+4*19h]
 doiret:
 		iret
-sssp:
-		dd	0
 step19:
 		push	bx
 		push	ds
@@ -221,7 +220,7 @@
                 jecxz   @@done
 
 		smsw	ax
-		test	al,1
+                and     al,1	;MSW_PE
 		jz	@@real_mode
 ; Note: bp points to std stack frame now. bp will be passed to
 ; pm routine. This allows params to be passed on stack
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/MEMTOP.ASM
--- a/linld/stuff/src/MEMTOP.ASM	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/MEMTOP.ASM	Fri Oct 05 23:02:32 2018 +0200
@@ -40,15 +40,15 @@
                 mov     ax,0E801h
                 int     15h
                 jc      @@err
-		xchg	ax,cx
-                push    ax              ;kludge to handle BIOSes
-                or      ax,dx           ;  which report their extended
-		pop	ax		;  memory in AX/BX rather than
-                jnz     @@use_cxdx      ;  CX/DX.  The spec I have read
+
+		xchg	ax,cx		;kludge to handle BIOSes
+		jcxz	@@use_cxdx	;  which report their extended
+					;  memory in AX/BX rather than
+					;  CX/DX.  The spec I have read
 @@use_axbx:     mov     dx,bx           ;  seems to indicate AX/BX
                 xchg	ax,cx		;  are more reasonable anyway...
-@@use_cxdx:                     ;now: dx=64k units above 16m
-                                ;     ax=1k units above 1m below 16m (max 3c00h)
+@@use_cxdx:				;now: dx=64k units above 16m
+					;     ax=1k units above 1m below 16m (max 3c00h)
                 test    dx,dx
                 jz      tokb            ;dx=0 here, ax=kbs above 1m
                 xor     ax,ax           ;ignore info on low 16M (assume full)
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/TAZBOOT.CPP
--- a/linld/stuff/src/TAZBOOT.CPP	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/TAZBOOT.CPP	Fri Oct 05 23:02:32 2018 +0200
@@ -20,7 +20,7 @@
 static void next_chunk(struct image_himem *m)
 {
 	struct initrd_info *i = &initrd_state.info[m->state];
-	m->chunk_size = 0;
+	m->chunk_size &= 0;
 	if (m->state >= initrd_state.cnt) return;
 	lseekset(m->fd,i->ofs);
 	m->chunk_size = i->size;
@@ -49,7 +49,7 @@
 	if (!m->size) return;
 	m->next_chunk = next_chunk;
 	m->fd = isofd;
-	m->state = 0;
+	m->state &= 0;
 	next_chunk(m);
 	load_initrd();
 }
@@ -76,7 +76,8 @@
 	if (!*iso || isoreset(*iso) < 0) return;
 	skip_alloc++;
 	base_himem = memtop() /2;
-	if (base_himem > _64m) base_himem = _64m;
+	//if (base_himem > _64m) base_himem = _64m;
+	if (* ((char *) &base_himem +3) >= 4) base_himem = _64m;
 	isoopen("boot") >= 0 ||
 	isoopen("live") >= 0 ||	// debian
 	isoopen("casper") >= 0;	// ubuntu
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/VCPI.ASM
--- a/linld/stuff/src/VCPI.ASM	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/VCPI.ASM	Fri Oct 05 23:02:32 2018 +0200
@@ -121,10 +121,6 @@
 
         segment _BSS byte public use16 'BSS'
 
-label   saved_ss_sp dword
-saved_sp        dw      ?
-saved_ss        dw      ?
-
 tss             dd      ?,?     ;enough, we'll never use it anyway
 
         ends    _BSS
@@ -393,8 +389,9 @@
                 push	ax
                 push	si
                 push    ds
-                mov     [saved_ss],ss
-                mov     [saved_sp],sp
+		extrn	sssp:word
+                mov     [sssp],sp
+                mov     [sssp+2],ss
 
 		call	switch_to_pm
 
@@ -413,7 +410,7 @@
                 mov     cr3,eax         ; flush TLB cache
 
 ; Now we are in rm, but not yet: have to restore sregs:
-                lss     sp,[saved_ss_sp]; SS
+                lss     sp,[dword sssp]; SS
                 pop     ds              ; DS
                 pop	si
                 retf                    ; CS
diff -r 570dc794f847 -r 46b511e941a7 linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Sat Sep 29 15:40:14 2018 +0200
+++ b/linld/stuff/src/_BEG.ASM	Fri Oct 05 23:02:32 2018 +0200
@@ -21,7 +21,7 @@
 		endif
         global  _vcpi:byte
 _vcpi		db	0
-msg_badmapping  db      "VCPI: low 640k: need 1:1 mapping"
+msg_badmapping  db      "VCPI: low 640k need 1:1 mapping"
         global  _topmem:dword
 _topmem		dd	10000000h	; max 256m
 
@@ -142,6 +142,7 @@
                 test    ah,ah
 		jnz	no_vcpi
 is386vcpi:
+		inc	[byte _vcpi]
                 extrn   prepare_vcpi:near
 		call	prepare_vcpi
 ;    get_vcpi_interface() || die("VCPI: low 640k: need 1:1 mapping");
@@ -149,7 +150,6 @@
 		;call	_get_vcpi_interface
 		mov	bx,offset msg_badmapping
 		jz	endcpu
-		inc	[byte bx+_vcpi-msg_badmapping]
 no_vcpi:
                 p8086
               ;;pop     dx              ;$ handle
diff -r 570dc794f847 -r 46b511e941a7 lz4-dev/receipt
--- a/lz4-dev/receipt	Sat Sep 29 15:40:14 2018 +0200
+++ b/lz4-dev/receipt	Fri Oct 05 23:02:32 2018 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="lz4-dev"
-VERSION="1.8.2"
+VERSION="1.8.3"
 CATEGORY="development"
 SHORT_DESC="LZ4 development files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 570dc794f847 -r 46b511e941a7 lz4-lib/receipt
--- a/lz4-lib/receipt	Sat Sep 29 15:40:14 2018 +0200
+++ b/lz4-lib/receipt	Fri Oct 05 23:02:32 2018 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="lz4-lib"
-VERSION="1.8.2"
+VERSION="1.8.3"
 CATEGORY="base-system"
 SHORT_DESC="The lz4c compressor shared library"
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 570dc794f847 -r 46b511e941a7 lz4/receipt
--- a/lz4/receipt	Sat Sep 29 15:40:14 2018 +0200
+++ b/lz4/receipt	Fri Oct 05 23:02:32 2018 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="lz4"
-VERSION="1.8.2"
+VERSION="1.8.3"
 CATEGORY="base-system"
 SHORT_DESC="High speed lossless compressor."
 MAINTAINER="pascal.bellard@slitaz.org"