SliTaz Repositories

     1.1 --- a/linld/stuff/src/CRTL.ASM	Thu Jun 13 13:39:28 2019 +0100
     1.2 +++ b/linld/stuff/src/CRTL.ASM	Thu Jun 13 15:52:10 2019 +0200
     1.3 @@ -335,7 +335,9 @@
     1.4  dirofs		dd	?		;22	unsigned long dirofs;
     1.5  curpos		dw	?		;26	unsigned curpos;
     1.6  filename2open	dw	?		;28	char *filename2open;
     1.7 -buffer		db	2560	dup(?)	;30	char buffer[2048+512];
     1.8 +entrysize	dw	?		;30	int entrysize;
     1.9 +tmp		dw	?		;32	const char *tmp;
    1.10 +buffer		db	2560	dup(?)	;34	char buffer[2048+512];
    1.11  ends					; } isostate;
    1.12  ;***************************************************************
    1.13  ;_fastcall long isolseek(bx:const unsigned long *offset);
    1.14 @@ -954,7 +956,7 @@
    1.15  @@next:
    1.16  		push	di
    1.17                  call	[(image_himem di).next_chunk]	; m->next_chunk()
    1.18 -                pop	di
    1.19 +		pop	di
    1.20  		else
    1.21  @@next:
    1.22  		call	next_chunk
    1.23 @@ -977,7 +979,7 @@
    1.24  		ifdef	EXTRA
    1.25  		push	di
    1.26                  call	[(image_himem di).next_chunk]	; m->next_chunk()
    1.27 -                pop	di
    1.28 +		pop	di
    1.29  		else
    1.30  		call	next_chunk
    1.31  		endif

     2.1 --- a/linld/stuff/src/HIMEM.CPP	Thu Jun 13 13:39:28 2019 +0100
     2.2 +++ b/linld/stuff/src/HIMEM.CPP	Thu Jun 13 15:52:10 2019 +0200
     2.3 @@ -25,7 +25,7 @@
     2.4      buf = m->buf;
     2.5      do {
     2.6          u16 size;
     2.7 -	if(s16(size = read_image(m)) <= 0) break;
     2.8 +	if(s16(size = read_image(m)) -1 < 0) break;
     2.9          storepage(bufv);
    2.10  	if (bufv != &buf) next(bufv);
    2.11          buf += size;

     3.1 --- a/linld/stuff/src/ISO9660.CPP	Thu Jun 13 13:39:28 2019 +0100
     3.2 +++ b/linld/stuff/src/ISO9660.CPP	Thu Jun 13 15:52:10 2019 +0200
     3.3 @@ -28,7 +28,6 @@
     3.4  
     3.5  int isoreaddir(void)
     3.6  {
     3.7 -	int size;
     3.8  	char *p;
     3.9  #ifdef __ROCKRIDGE
    3.10  	char *endname;
    3.11 @@ -50,7 +49,7 @@
    3.12  		x->curpos = 0;
    3.13  	}
    3.14  	p = x->buffer; p += x->curpos;
    3.15 -	if ((size = * (short *) p) == 0) {
    3.16 +	if ((x->entrysize = * (short *) p) == 0) {
    3.17  		return -1;
    3.18  	}
    3.19  	x->fileofs = (* (unsigned long *) (p + 2)) << SECTORBITS;
    3.20 @@ -77,7 +76,7 @@
    3.21  			endname = p + len;
    3.22  		}
    3.23  		p += len;
    3.24 -	} while (x->buffer + x->curpos + size - 2 > p);
    3.25 +	} while (x->buffer + x->curpos + x->entrysize - 2 > p);
    3.26  	if (endname)
    3.27  		*endname = 0;
    3.28  	else
    3.29 @@ -99,7 +98,7 @@
    3.30  			*p = 0;
    3.31  		}
    3.32  	}
    3.33 -	x->curpos += size;
    3.34 +	x->curpos += x->entrysize;
    3.35  	return 0;
    3.36  }
    3.37  
    3.38 @@ -109,10 +108,15 @@
    3.39  #define IS_DIR(x)( (*((char*) &x + 1) & (char)0676) == (char)0)
    3.40  int _isoopen(void)
    3.41  {
    3.42 -	char *name, *s, c;
    3.43 -	char _64bits = cpuhaslm();
    3.44 +//	char *name, *s, c;
    3.45 +//	char _64bits = cpuhaslm();
    3.46  	struct isostate *x=&isostate;
    3.47 +#define name (x->filename2open)
    3.48 +#define c (((char *)&x->entrysize)[0])
    3.49 +#define _64bits (((char *)&x->entrysize)[1])
    3.50 +	char *s;
    3.51  
    3.52 +	_64bits = cpuhaslm();
    3.53      do {
    3.54  	for (s = (char *) x->filename2open; *s == '/' ; s++) {
    3.55  		isoroot();
    3.56 @@ -123,7 +127,9 @@
    3.57  	c = *s;
    3.58  	*s = 0;
    3.59  	for (x->curdirsize = 0xFFFF; isoreaddir() != -1;) {
    3.60 -		const char *n = name, *i = x->filename;
    3.61 +		const char *n = name;
    3.62 +#define i (x->tmp)
    3.63 +		i = x->filename;
    3.64  		if (_64bits) {
    3.65  			if (strhead(i, n) == -1) continue;
    3.66  			n = "64";

     4.1 --- a/linld/stuff/src/ISO9660.H	Thu Jun 13 13:39:28 2019 +0100
     4.2 +++ b/linld/stuff/src/ISO9660.H	Thu Jun 13 15:52:10 2019 +0200
     4.3 @@ -17,6 +17,8 @@
     4.4  	unsigned long curdirofs, dirofs;
     4.5  	unsigned curpos;
     4.6  	char *filename2open;
     4.7 +	int entrysize;
     4.8 +	const char *tmp;
     4.9  #define SECTORSZ 2048
    4.10  #define SECTORBITS 11
    4.11  	char buffer[SECTORSZ+512];	// RR overflow

     5.1 --- a/linld/stuff/src/pipehole.awk	Thu Jun 13 13:39:28 2019 +0100
     5.2 +++ b/linld/stuff/src/pipehole.awk	Thu Jun 13 15:52:10 2019 +0200
     5.3 @@ -1,4 +1,4 @@
     5.4 -BEGIN { hold=0; is386=0; isload=0; wascall=0 }
     5.5 +BEGIN { hold=0; is386=0; isload=0; isiso=0; wascall=0 }
     5.6  function isnum(n) { return match(n,/^[0-9+-]/) }
     5.7  {
     5.8  	sub(/segment word public/,"segment byte public")
     5.9 @@ -14,16 +14,42 @@
    5.10  		if (/ax,word ptr/) next
    5.11  		if (/^	call/) isload=0
    5.12  	}
    5.13 -	if (/const char \*n = name, \*i = x->filename;/) isiso=1
    5.14 -	if (isiso) { # ISO9660.LST
    5.15 -		if ((/mov	word ptr \[bp-6\],ax/ ) ||
    5.16 -		    (/mov	ax,word ptr \[bp-2\]/) ||
    5.17 -		    (/bx,word ptr \[bp-6\]/) || (/ax,dx/)) next
    5.18 +	if (/x->curdirsize == 0xFFFF/) isiso=4
    5.19 +	if (isiso == 4) { # ISO9660.LST
    5.20 +		if (/DGROUP:_isostate\+14,-1/) {
    5.21 +			sub(/DGROUP:_isostate\+14/,"[si+14]")
    5.22 +			isiso=0
    5.23 +		}
    5.24 +	}
    5.25 +	if (/c = \*s;/) isiso=3
    5.26 +	if (isiso == 3) { # ISO9660.LST
    5.27 +		if (/al,byte ptr/) {
    5.28 +			print "	mov	al,0"
    5.29 +			sub(/mov/,"xchg")
    5.30 +		}
    5.31 +		if (/byte ptr \[di\],0/) {
    5.32 +			isiso=0
    5.33 +			next
    5.34 +		}
    5.35 +	}
    5.36 +	if (/endname = NULL/) isiso=2
    5.37 +	if (isiso == 2) { # ISO9660.LST
    5.38 +		if (/mov	bx,cx/) next
    5.39 +		gsub(/cx/,"bx")
    5.40 +	}
    5.41 +	if (/const char \*n = name/) isiso=1
    5.42 +	if (isiso == 1) { # ISO9660.LST
    5.43 +		if ((/mov	word ptr \[si\+32\],ax/ ) ||
    5.44 +		    (/mov	ax,word ptr \[si\+28\]/) ||
    5.45 +		    (/bx,word ptr \[si\+32\]/) || (/ax,dx/)) next
    5.46  		if (/dx,/) sub(/dx/,"ax")
    5.47 -		if ((/sub	ax,word ptr \[bp-2\]/) ||
    5.48 -		    (/\[di\+12\]/) || (/ax,si/)) sub(/ax/,"bx")
    5.49 -		if (/add	word ptr \[bp-6\],ax/) $0="	add	bx,word ptr [di+12]"
    5.50 -		if (/@strcmp\$qpxzct1/) isiso=0
    5.51 +		if ((/sub	ax,word ptr \[si\+28\]/) ||
    5.52 +		    (/\[si\+12\]/) || (/ax,di/)) sub(/ax/,"bx")
    5.53 +		if (/add	word ptr \[si\+32\],ax/) $0="	add	bx,word ptr [si+12]"
    5.54 +		if (/al,/ || /,al/) sub(/al/,"cl")
    5.55 +		if (/cmp	byte ptr \[si\+30\],0/) $0="	or	cl,cl"
    5.56 +		if (/jne	@@0$/) next
    5.57 +		if (/jmp	@3@58$/) $0="	je	@3@58"
    5.58  	}
    5.59  	if (wascall) {
    5.60  		if (rcall != "") {

     6.1 --- a/vlgothic-fonts/receipt	Thu Jun 13 13:39:28 2019 +0100
     6.2 +++ b/vlgothic-fonts/receipt	Thu Jun 13 15:52:10 2019 +0200
     6.3 @@ -7,7 +7,7 @@
     6.4  SHORT_DESC="VL Gothic Font Family: Japanese TrueType fonts from Vine Linux"
     6.5  MAINTAINER="al.bobylev@gmail.com"
     6.6  LICENSE="custom"
     6.7 -WEB_SITE="http://vlgothic.dicey.org/"
     6.8 +WEB_SITE="https://web.archive.org/web/20190403102704/http://vlgothic.dicey.org/"
     6.9  
    6.10  TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.11  WGET_URL="http://dl.osdn.jp/vlgothic/$RELEASE/VLGothic-$VERSION.tar.xz"
    6.12 @@ -15,8 +15,6 @@
    6.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.14  genpkg_rules()
    6.15  {
    6.16 -	cd $src
    6.17 -
    6.18  	mkdir -p $fs/usr/share/fonts/TTF/vlgothic
    6.19  	cp *.ttf $fs/usr/share/fonts/TTF/vlgothic
    6.20