# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1590256944 0
# Node ID 56ee356284c69df91bc0d74d00b97a9e9726db2d
# Parent  ae9776c2d2b435f0b6f8611b484e6ab254a08ad2
linld: fix argstr

diff -r ae9776c2d2b4 -r 56ee356284c6 icu-dev/receipt
--- a/icu-dev/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/icu-dev/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 WANTED="icu"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.icu-project.org/"
+WEB_SITE="https://www.icu-project.org/"
 
 DEPENDS="icu pkg-config gcc-lib-base"
 
diff -r ae9776c2d2b4 -r 56ee356284c6 icu/receipt
--- a/icu/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/icu/receipt	Sat May 23 18:02:24 2020 +0000
@@ -8,7 +8,7 @@
 LICENSE="MIT"
 SOURCE="icu4c"
 TARBALL="$SOURCE-${VERSION//./_}-src.tgz"
-WEB_SITE="http://www.icu-project.org/"
+WEB_SITE="https://www.icu-project.org/"
 WGET_URL="http://download.icu-project.org/files/$SOURCE/$VERSION/$TARBALL"
 #WGET_URL="http://www.sfr-fresh.com/unix/misc/$TARBALL"
 
diff -r ae9776c2d2b4 -r 56ee356284c6 libopusenc-dev/receipt
--- a/libopusenc-dev/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/libopusenc-dev/receipt	Sat May 23 18:02:24 2020 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="High-level Opus encoding library, development files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 WANTED="libopusenc"
 
 DEPENDS="libopusenc pkg-config"
diff -r ae9776c2d2b4 -r 56ee356284c6 libopusenc/receipt
--- a/libopusenc/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/libopusenc/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 WGET_URL="https://archive.mozilla.org/pub/opus/$TARBALL"
 
 DEPENDS="opus"
diff -r ae9776c2d2b4 -r 56ee356284c6 linld/stuff/src/!COMPILE.BAT
--- a/linld/stuff/src/!COMPILE.BAT	Fri May 22 13:54:45 2020 +0100
+++ b/linld/stuff/src/!COMPILE.BAT	Sat May 23 18:02:24 2020 +0000
@@ -10,5 +10,5 @@
 mawk -f pipehole.awk LINLD.ASO > LINLD.ASM
 mawk -f pipehole.awk LOAD.ASO > LOAD.ASM
 mawk -f pipehole.awk HIMEM.ASO > HIMEM.ASM
-tasm /la /m /dMOVE_SETUP /dUSE_ARGSTR /dNO386 /dLARGE_IMAGES /dLONG_FILENAME *.asm > asm.log
+tasm /la /m /dISOHOOK /dMOVE_SETUP /dUSE_ARGSTR /dNO386 /dLARGE_IMAGES /dLONG_FILENAME *.asm > asm.log
 tlink /m /s /t @link.cmd > lnk.log
diff -r ae9776c2d2b4 -r 56ee356284c6 linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Fri May 22 13:54:45 2020 +0100
+++ b/linld/stuff/src/CRTL.ASM	Sat May 23 18:02:24 2020 +0000
@@ -31,26 +31,7 @@
         segment _BSS byte public use16 'BSS'
 
 		ifdef EXTRA
-;typedef unsigned dirsizetype;
-struc		isostate		; struct isostate {
-curpos		dw	?		; 0	unsigned curpos;
-filename2open	dw	?		; 2	char *filename2open;
-fd		dw	?		; 4	int fd;
-filemod		dw	?		; 6	unsigned short filemod;
-fileofs		dd	?		; 8	unsigned long fileofs;
-filesize	dd	?		;12	unsigned long filesize;
-filename	dw	?		;16	char *filename;
-curdirsize	dw	?		;18	dirsizetype curdirsize;
-dirsize		dw	?		;20	dirsizetype dirsize;
-curdirofs	dd	?		;22	unsigned long curdirofs;
-dirofs		dd	?		;26	unsigned long dirofs;
-;overlap
-entrysize	dw	?		;30	int entrysize;
-tmp		dw	?		;32	const char *tmp;
-c		db	?		;34	char c;
-_64bits		db	?		;35	char _64bits;
-buffer		db	?		;36	char buffer[2048+512];
-ends		isostate		; } isostate;
+		include	"isostate.inc"
 		public	_isostate
 _isostate	isostate	<?>
 		org	$-7
@@ -59,7 +40,7 @@
 filecnt		db	?		; in fact 0 minus file count...
 nextfilename	dw	?
 	ifdef	EXTRA
-ultoabuf	db	12	dup (?)
+utoabuf		db	6	dup (?)
 	endif
 
         ends    _BSS
@@ -111,6 +92,8 @@
 		xchg	ax,dx
 strend:
                 pop	si
+	global	@ret:near
+@ret:
 		ret
 
         endp	@strcatb$qpxzct1
@@ -185,6 +168,10 @@
         proc    @open$qpxzc near
 
 open:						; open(bx)
+	ifdef	ISOHOOK
+		extrn	iso_open_hack:word
+		call	[iso_open_hack]		; or ret
+	endif
 	ifdef	LONG_FILENAME
 		mov	ax,716Ch
 		push	bx si
@@ -221,6 +208,10 @@
 
         global  close:near			; close(ax)
 close:
+	ifdef	ISOHOOK
+		extrn	iso_close_hack:word
+		call	[iso_close_hack]	; or ret
+	endif
 		mov	bh,3Eh
 dosbx:
 		xchg	ax,bx
@@ -263,6 +254,10 @@
 @read$cxdxbx:
                 mov	ah,3Fh
 		endif
+	ifdef	ISOHOOK
+		extrn	iso_read_hack:word
+		call	[iso_read_hack]		; or ret
+	endif
                 jcxz	fail
 dos:
                 int	21h
@@ -302,6 +297,10 @@
 lseekword:
 		sbb	cx,cx
 lseekset:
+	ifdef	ISOHOOK
+		extrn	iso_lseek_hack:word
+		call	[iso_lseek_hack]	; or ret
+	endif
 		mov	bh,42h			; bx=fd cx:dx=offset al=whence
 		jmp	dosbx
 
@@ -394,13 +393,8 @@
 		xchg	ax,di			; vars => di
 		dec	bx
 @@testalt:
-		mov	al,-1
 		sub	di,dx
-@@test:
-		cmp	al,'='
-		je	@@found
-		cmp	al,0			; eos, si=next argv
-		je	@@found
+@@loop:
 		mov	si,cx			; s
 		add	di,dx
 @@match:
@@ -416,15 +410,29 @@
 @@notopt:
 		ifdef	EXTRA
 		cmp	[byte bx],'/'
-		je	@@testalt
+		jne	@@notalt
+		or	al,al			; 1st loop ?
+		js	@@testalt
+@@notalt:
 		endif
 		cmp	[byte bx],'|'
 		je	@@test
+		cmp	[byte bx],0
+		je	@@test
+		mov	al,-1
 		inc	bx
-		cmp	[byte bx-1],0
-		jne	@@notopt
+		jmp	@@notopt
+@@test:
+		or	al,al			; 1st loop ?
+		jns	@@testal
+		cmp	[byte bx],0
+		jne	@@loop
+@@testal:
+		cmp	al,'='
+		;je	@@found
+		;cmp	al,0			; eos, si=next argv
 		stc
-		jmp	@@nokeyword
+		jne	@@nokeyword
 @@found:
 		mov	[di],si
 		dec	dx
@@ -573,7 +581,7 @@
 		jz	@@eos
 		or	al,al
 		jnz	@@scan
-		dec	cx
+		dec	cx			; blocked to eos
 @@eos:
 		mov	[(image_himem di).state],cx
 		dec	si
@@ -1300,34 +1308,25 @@
 		ifdef	EXTRA
                 p8086
 ;***************************************************************
-;_fastcall char *ultoa(axdx:unsigned long n);
+;_fastcall char *utoa(ax:unsigned n);
 ;***************************************************************
-        global  @ultoa$qul:near
-        proc    @ultoa$qul near
+        global  @utoa$qui:near
+        proc    @utoa$qui near
 
-		xchg	ax,cx
-		xchg	ax,dx		; AX:CX = n
-		push	si
-		mov	si,10
-		mov	bx,offset ultoabuf+11
+		mov	cx,10
+		mov	bx,offset utoabuf+5
 @@loop:
 		dec	bx
 		xor	dx,dx
-		div	si		; DX:AX = 0000:hi(n)
-		xchg	ax,cx		; CX = hi(n)/10
-		div	si		; DX:AX = hi(n)%10:lo(n)
-		xchg	ax,cx		; CX = lo(n/10)
-					; AX = hi(n)/10 = hi(n/10)
+		div	cx		; DX:AX = n%10:n/10
 		mov	[byte bx],'0'
 		add	[bx],dl		; DL = n%10
-		mov	dx,ax
-		or	dx,cx
+		or	ax,ax
 		jnz	@@loop
 		xchg	ax,bx
-		pop	si
 		ret
 
-        endp    @ultoa$qul
+        endp    @utoa$qui
 
 
 ;***************************************************************
diff -r ae9776c2d2b4 -r 56ee356284c6 linld/stuff/src/ISOSTATE.INC
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linld/stuff/src/ISOSTATE.INC	Sat May 23 18:02:24 2020 +0000
@@ -0,0 +1,21 @@
+
+;typedef unsigned dirsizetype;
+struc		isostate		; struct isostate {
+curpos		dw	?		; 0	unsigned curpos;
+filename2open	dw	?		; 2	char *filename2open;
+fd		dw	?		; 4	int fd;
+filemod		dw	?		; 6	unsigned short filemod;
+fileofs		dd	?		; 8	unsigned long fileofs;
+filesize	dd	?		;12	unsigned long filesize;
+filename	dw	?		;16	char *filename;
+curdirsize	dw	?		;18	dirsizetype curdirsize;
+dirsize		dw	?		;20	dirsizetype dirsize;
+curdirofs	dd	?		;22	unsigned long curdirofs;
+dirofs		dd	?		;26	unsigned long dirofs;
+;overlap
+entrysize	dw	?		;30	int entrysize;
+tmp		dw	?		;32	const char *tmp;
+c		db	?		;34	char c;
+_64bits		db	?		;35	char _64bits;
+buffer		db	?		;36	char buffer[2048+512];
+ends		isostate		; } isostate;
diff -r ae9776c2d2b4 -r 56ee356284c6 linld/stuff/src/LINLD.CPP
--- a/linld/stuff/src/LINLD.CPP	Fri May 22 13:54:45 2020 +0100
+++ b/linld/stuff/src/LINLD.CPP	Sat May 23 18:02:24 2020 +0000
@@ -71,7 +71,7 @@
 	else if (argnum(*argv,"root|vga|mem|-b",&root_dev) != -1);
 	else {
 	    *clp = (const char *) buf_cmdline + 1;
-	    strcatb((const char *) buf_cmdline,*argv);
+	    do strcatb((const char *) buf_cmdline,*argv++); while (*argv);
 	boot:
             puts(*clp);
 	    set_cmdline(*clp);
diff -r ae9776c2d2b4 -r 56ee356284c6 linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Fri May 22 13:54:45 2020 +0100
+++ b/linld/stuff/src/_BEG.ASM	Sat May 23 18:02:24 2020 +0000
@@ -60,6 +60,9 @@
 clearbss:
 		mov	[si],bl		; clear bss + heap
 		inc	si
+	ifdef	ISOHOOK
+		cmp	si,bx
+	endif
 		jne	clearbss
 
 ;***************************************************************
@@ -100,6 +103,21 @@
 		jmp	endcpu86
 		endif
 
+	ifdef	ISOHOOK
+		extrn	@ret:near
+		global	iso_open_hack
+iso_open_hack	dw	@ret
+		global	iso_read_hack
+iso_read_hack	dw	@ret
+		global	iso_lseek_hack
+iso_lseek_hack	dw	@ret
+		global	iso_close_hack
+iso_close_hack	dw	@ret
+		global	iso_cleanup_hack
+iso_cleanup_hack	dw	@ret
+		dw	_cpu_features+3
+	endif
+
 ;***************************************************************
 ; checks for vcpi
 ;***************************************************************
diff -r ae9776c2d2b4 -r 56ee356284c6 opus-dev/receipt
--- a/opus-dev/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/opus-dev/receipt	Sat May 23 18:02:24 2020 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="Totally open, royalty-free, highly versatile audio codec, development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 
 WANTED="opus"
 DEPENDS="opus pkg-config"
diff -r ae9776c2d2b4 -r 56ee356284c6 opus-tools/receipt
--- a/opus-tools/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/opus-tools/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 WGET_URL="https://archive.mozilla.org/pub/opus/$TARBALL"
 
 DEPENDS="libogg flac opusfile libopusenc"
diff -r ae9776c2d2b4 -r 56ee356284c6 opus/receipt
--- a/opus/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/opus/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 WGET_URL="https://archive.mozilla.org/pub/$PACKAGE/$TARBALL"
 
 DEPENDS=""
diff -r ae9776c2d2b4 -r 56ee356284c6 opusfile-dev/receipt
--- a/opusfile-dev/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/opusfile-dev/receipt	Sat May 23 18:02:24 2020 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="Opus streams in the Ogg container I/O, development files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 WANTED="opusfile"
 
 DEPENDS="opusfile openssl-dev opus-dev pkg-config"
diff -r ae9776c2d2b4 -r 56ee356284c6 opusfile/receipt
--- a/opusfile/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/opusfile/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://opus-codec.org/"
+WEB_SITE="https://opus-codec.org/"
 WGET_URL="https://downloads.xiph.org/releases/opus/$TARBALL"
 
 DEPENDS="libssl libogg opus"
diff -r ae9776c2d2b4 -r 56ee356284c6 unzip/receipt
--- a/unzip/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/unzip/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
 TARBALL="$PACKAGE${VERSION//./}.tar.gz"
-WEB_SITE="http://www.info-zip.org/"
+WEB_SITE="http://infozip.sourceforge.net/"
 WGET_URL="$SF_MIRROR/infozip/$TARBALL"
 TAGS="archive compression"
 
diff -r ae9776c2d2b4 -r 56ee356284c6 zip/receipt
--- a/zip/receipt	Fri May 22 13:54:45 2020 +0100
+++ b/zip/receipt	Sat May 23 18:02:24 2020 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 TARBALL="$PACKAGE${VERSION//./}.tgz"
-WEB_SITE="http://www.info-zip.org/"
+WEB_SITE="http://infozip.sourceforge.net/"
 WGET_URL="ftp://ftp.info-zip.org/pub/infozip/src/$TARBALL"
 TAGS="archive compression"