# HG changeset patch # User Pascal Bellard # Date 1579864502 -3600 # Node ID 72e35f3c7aa1358b2cc0e546826e66ca717fa38b # Parent a129a22d1733c1f9f4c554946f8b88fbf2cba2c5 Up libcomerr (1.44.5) diff -r a129a22d1733 -r 72e35f3c7aa1 jp2a/receipt --- a/jp2a/receipt Fri Jan 24 11:07:01 2020 +0100 +++ b/jp2a/receipt Fri Jan 24 12:15:02 2020 +0100 @@ -7,7 +7,7 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="https://csl.name/jp2a/" +WEB_SITE="https://github.com/cslarsen/jp2a" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" DEPENDS="jpeg libcurl" diff -r a129a22d1733 -r 72e35f3c7aa1 libcomerr-dev/receipt --- a/libcomerr-dev/receipt Fri Jan 24 11:07:01 2020 +0100 +++ b/libcomerr-dev/receipt Fri Jan 24 12:15:02 2020 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libcomerr-dev" -VERSION="1.44.5" +VERSION="1.45.5" CATEGORY="development" SHORT_DESC="The libcomerr devel files." MAINTAINER="pankso@slitaz.org" diff -r a129a22d1733 -r 72e35f3c7aa1 libcomerr/receipt --- a/libcomerr/receipt Fri Jan 24 11:07:01 2020 +0100 +++ b/libcomerr/receipt Fri Jan 24 12:15:02 2020 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libcomerr" -VERSION="1.44.5" +VERSION="1.45.5" CATEGORY="base-system" SHORT_DESC="The libcomerr library files." MAINTAINER="pankso@slitaz.org" diff -r a129a22d1733 -r 72e35f3c7aa1 linld/stuff/src/CRTL.ASM --- a/linld/stuff/src/CRTL.ASM Fri Jan 24 11:07:01 2020 +0100 +++ b/linld/stuff/src/CRTL.ASM Fri Jan 24 12:15:02 2020 +0100 @@ -221,8 +221,9 @@ global close:near ; close(ax) close: + mov bh,3Eh +dosbx: xchg ax,bx - mov ah,3Eh or bx,bx jnz dos ret @@ -265,7 +266,6 @@ jcxz fail dos: int 21h -chkc: jnc doret fail: stc @@ -302,16 +302,14 @@ lseekword: sbb cx,cx lseekset: - xchg ax,bx -lseek: - mov ah,42h ; bx=fd cx:dx=offset al=whence - jmp dos + mov bh,42h ; bx=fd cx:dx=offset al=whence + jmp dosbx endp @rewind$qi ifdef EXTRA ;*************************************************************** -;_fastcall long isolseek(bx:const unsigned long *offset); +;_fastcall void isolseek(bx:const unsigned long *offset); ;_fastcall long lseekset2(ax:int fd, bx:unsigned long* offset); ;*************************************************************** global @isolseek$qpxul:near @@ -335,7 +333,7 @@ proc @isoreadsector$qpxul near call isolseek - jc doret + jc fail mov dx,2560 mov bx,offset _isostate.buffer mov ax,[_isostate.fd] diff -r a129a22d1733 -r 72e35f3c7aa1 linld/stuff/src/ISO9660.H --- a/linld/stuff/src/ISO9660.H Fri Jan 24 11:07:01 2020 +0100 +++ b/linld/stuff/src/ISO9660.H Fri Jan 24 12:15:02 2020 +0100 @@ -29,7 +29,7 @@ #define isofilesize isostate.filesize #define isofilemod isostate.filemod #define isofilename isostate.filename -extern _fastcall long isolseek(const unsigned long *offset); +extern _fastcall void isolseek(const unsigned long *offset); extern _fastcall int isoreadsector(const unsigned long *offset); extern _fastcall int isoreset(char *name); extern _fastcall int isoopen(const char *name); diff -r a129a22d1733 -r 72e35f3c7aa1 linld/stuff/src/TAZBOOT.CPP --- a/linld/stuff/src/TAZBOOT.CPP Fri Jan 24 11:07:01 2020 +0100 +++ b/linld/stuff/src/TAZBOOT.CPP Fri Jan 24 12:15:02 2020 +0100 @@ -115,7 +115,8 @@ isoopen(rootfs[0] ? rootfs : fallback) != -1) { addinitrd(); } - if (*init && isolseek(&initrddesc) != 0) { + if (*init) { + isolseek(&initrddesc); read(x->fd, &x->filemod, 10); // + x->fileofs & x->filesize magic = x->filemod; x->fileofs = 0x7FF0 - (x->filesize &= 0xFFFF);