# HG changeset patch # User Pascal Bellard # Date 1650467450 0 # Node ID d1f31f5f64019bfb56e738b8426a2711063413fe # Parent e7bde16e8f79e996838d8d700e2c2935752b4647 BootProg: clear cmdline diff -r e7bde16e8f79 -r d1f31f5f6401 BootProg/receipt --- a/BootProg/receipt Sat Apr 16 12:43:33 2022 +0000 +++ b/BootProg/receipt Wed Apr 20 15:10:50 2022 +0000 @@ -8,20 +8,17 @@ LICENSE="MIT" WEB_SITE="https://wiki.osdev.org/BootProg" -BUILD_DEPENDS="nasm" +BUILD_DEPENDS="nasm lzma" # Rules to configure and make the package. compile_rules() { mkdir -p $src && cd $src - for i in bootex boot16 boot32 ; do + sed '1,/^exit 1/!d' $stuff/bootprog.sh > bootprog + for i in boot16 boot32 bootex ; do cp $stuff/$i.asm . - nasm $i.asm -f bin -o $i.bin -l $i.lst - done - sed '1,/^exit 1/!d' $stuff/bootprog.sh > bootprog - tar czf - boot16.bin boot32.bin bootex.bin > set.tar.gz - [ "$(which advdef)" ] && advdef -z4 set.tar.gz - cat set.tar.gz >> bootprog + nasm $i.asm -f bin -o $i.bin -l $i.lst && cat $i.bin + done | lzma -9 >> bootprog chmod +x bootprog } diff -r e7bde16e8f79 -r d1f31f5f6401 BootProg/stuff/boot16.asm --- a/BootProg/stuff/boot16.asm Sat Apr 16 12:43:33 2022 +0000 +++ b/BootProg/stuff/boot16.asm Wed Apr 20 15:10:50 2022 +0000 @@ -213,14 +213,14 @@ mul bx ; dx:ax = 0 = LBA (LBA are relative to FAT) mov cx, word [bx(bpbSectorsPerFAT)] - call ReadCXSectors ; read fat and clear cx + call ReadCXSectors ; read fat and clear ax & cx ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; load the root directory in ;; ;; its entirety (16KB max) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - mov ax, 32 + mov al, 32 mul word [bx(bpbRootEntries)] div word [bx(bpbBytesPerSector)] @@ -230,7 +230,7 @@ mul bp ; [bx(bpbSectorsPerFAT)], set by ReadCXSectors push es - call ReadCXSectors ; read root directory, clear cx and di + call ReadCXSectors ; read root directory; clear ax, cx and di pop es ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -248,15 +248,15 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; FindNameCycle: - cmp byte [es:di], ch - je FindNameFailed ; end of root directory (NULL entry found) push di mov cl, 11 mov si, ProgramName ; ds:si -> program name repe cmpsb pop di je FindNameFound - add di, byte 32 + scasb + je FindNameFailed ; end of root directory (NULL entry found) + add di, byte 31 dec word [bx(bpbRootEntries)] jnz FindNameCycle ; next root entry @@ -298,28 +298,26 @@ jnc First64 mov ah, (1000h+ImageLoadSeg)>>8 ; adjust segment for 2nd part of FAT16 First64: + mov dx, 0FFF8h + cmp [bx(bpbSectorsPerFAT)], cx ; 1..12 = FAT12, 16..256 = FAT16 mov ds, ax - jbe ReadClusterFat12 + ja ReadClusterFat16 - lodsw ; ax = next cluster - cmp ax, 0FFF8h - jmp short ReadClusterDone - -ReadClusterFat12: + mov dh, 0Fh add si, [cs:di] shr si, 1 ; si = cluster * 3 / 2 +ReadClusterFat16: lodsw ; ax = next cluster jnc ReadClusterEven rol ax, cl ReadClusterEven: - and ax, 0FFFh ; mask cluster value - cmp ax, 0FF8h + and ah, dh ; mask cluster value + cmp ax, dx -ReadClusterDone: push cs pop ds inc di @@ -352,7 +350,7 @@ add ax, bp ; LBA for cluster data adc dx, bx ; dx:ax = LBA - call ReadSector ; clear cx + call ReadSector ; clear ax & cx, restore dx jne ReadClusters @@ -365,7 +363,6 @@ mov ds, bp ; bp=ds=seg the file is loaded to add bp, [bx+08h] ; bp = image base - mov ax, [bx+06h] ; ax = reloc items mov di, [bx+18h] ; di = reloc table pointer cmp word [bx], 5A4Dh ; "MZ" signature? @@ -374,19 +371,22 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Setup and run a .COM program ;; ;; Set CS=DS=ES=SS SP=0 IP=100h ;; +;; AX=0ffffh BX=0 CX=0 DX=drive ;; +;; and cmdline=void ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + mov di, 100h ; ip mov bp, ImageLoadSeg-10h ; "org 100h" stuff :) mov ss, bp xor sp, sp push bp ; cs, ds and es - mov bh, 1 ; ip jmp short Run ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Relocate, setup and run a .EXE program ;; ;; Set CS:IP, SS:SP, DS, ES and AX according ;; ;; to wiki.osdev.org/MZ#Initial_Program_State ;; +;; AX=0ffffh BX=0 CX=0 DX=drive cmdline=void ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ReloCycle: @@ -397,8 +397,8 @@ scasw ; point to next entry RelocateEXE: - dec ax ; 32768 max (128KB table) - jns ReloCycle ; leave with ax=0ffffh: both FCB in the + dec word [bx+06h] ; reloc items, 32768 max (128KB table) + jns ReloCycle ; PSP don't have a valid drive identifier les si, [bx+0Eh] add si, bp @@ -409,13 +409,15 @@ push si ; containing the PSP structure add bp, [bx+16h] ; cs for EXE - mov bx, [bx+14h] ; ip for EXE + mov di, [bx+14h] ; ip for EXE Run: pop ds push bp - push bx + push di push ds pop es + mov [80h], ax ; clear cmdline + dec ax ; both FCB in the PSP don't have a valid drive identifier ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Set the magic numbers so the program knows that it ;; @@ -539,10 +541,17 @@ dec di ; keep C loopne ReadSectorNext ; until cluster sector count or file sector count is reached pop si + mov ax, bx ; clear ax mov dx, [bx] ; pass the BIOS boot drive to Run or Error ret +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Fill free space with zeroes ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + times (512-13-20-($-$$)) db 0 + ;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Error Messaging Code ;; ;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -566,12 +575,6 @@ hlt jmp short Stop -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Fill free space with zeroes ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - times (512-13-($-$$)) db 0 - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Name of the file to load and run ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff -r e7bde16e8f79 -r d1f31f5f6401 BootProg/stuff/boot32.asm --- a/BootProg/stuff/boot32.asm Sat Apr 16 12:43:33 2022 +0000 +++ b/BootProg/stuff/boot32.asm Wed Apr 20 15:10:50 2022 +0000 @@ -265,7 +265,6 @@ mov ds, bp ; bp=ds=seg the file is loaded to add bp, [bx+08h] ; bp = image base - mov ax, [bx+06h] ; ax = reloc items mov di, [bx+18h] ; di = reloc table pointer cmp word [bx], 5A4Dh ; "MZ" signature? @@ -275,9 +274,9 @@ ;; Setup and run a .COM program ;; ;; Set CS=DS=ES=SS SP=0 IP=100h ;; ;; AX=0ffffh BX=0 CX=0 DX=drive ;; +;; and cmdline=void ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - mov ax, 0ffffh ; both FCB in the PSP don't have a valid drive identifier mov di, 100h ; ip mov bp, ImageLoadSeg-10h ; "org 100h" stuff :) mov ss, bp @@ -289,7 +288,7 @@ ;; Relocate, setup and run a .EXE program ;; ;; Set CS:IP, SS:SP, DS, ES and AX according ;; ;; to wiki.osdev.org/MZ#Initial_Program_State ;; -;; AX=0ffffh BX=0 CX=0 DX=drive ;; +;; AX=0ffffh BX=0 CX=0 DX=drive cmdline=void ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ReloCycle: @@ -300,13 +299,11 @@ scasw ; point to next entry RelocateEXE: - dec ax ; 32768 max (128KB table) - jns ReloCycle ; leave with ax=0ffffh: both FCB in the - ; PSP don't have a valid drive identifier - les si, [bx+0Eh] - add si, bp - mov ss, si ; ss for EXE - mov sp, es ; sp for EXE + dec word [bx+06h] ; reloc items, 32768 max (128KB table) + jns ReloCycle + + add [bx+0Eh], bp + lss sp, [bx+0Eh] ; ss:sp for EXE lea si, [bp-10h] ; ds and es both point to the segment push si ; containing the PSP structure @@ -319,6 +316,9 @@ push di push ds pop es + xor ax, ax + mov [80h], ax ; clear cmdline + dec ax ; both FCB in the PSP don't have a valid drive identifier ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Set the magic numbers so the program knows that it ;; @@ -431,6 +431,12 @@ ReadSectorNext: ret +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Fill free space with zeroes ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + times (512-13-20-($-$$)) db 0 + ;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Error Messaging Code ;; ;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -452,12 +458,6 @@ hlt jmp short Stop -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Fill free space with zeroes ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - times (512-13-($-$$)) db 0 - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Name of the file to load and run ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff -r e7bde16e8f79 -r d1f31f5f6401 BootProg/stuff/bootex.asm --- a/BootProg/stuff/bootex.asm Sat Apr 16 12:43:33 2022 +0000 +++ b/BootProg/stuff/bootex.asm Wed Apr 20 15:10:50 2022 +0000 @@ -160,7 +160,7 @@ ;;;;;;;;;;;;;;;;;;;;;; push es - push byte main + push word main retf main: @@ -173,7 +173,7 @@ mov esi, [bx(bpbRootDirCluster)] ; esi=cluster # of root dir push byte ImageLoadSeg - pop es + pop es ; cx = 0 RootDirReadContinue: call ReadCluster ; read one sector of root dir @@ -207,11 +207,10 @@ cmp al, 0c0h ; EXFAT_ENTRY_FILE_INFO ? jne NotFileInfo - mov bl, 30 + mov bl, 31 CopyInfo: - mov ax, [es:di+bx] - mov [bx], ax - dec bx + mov al, [es:di+bx] + mov [bx], al dec bx jnz CopyInfo @@ -232,6 +231,7 @@ popf ; restore carry="not last sector" flag jc RootDirReadContinue ; continue to the next root dir cluster FindNameFailed: ; end of root directory (dir end reached) +; mov dx, [bx] ; restore BIOS boot drive number call Error db "File not found." FindNameFound: @@ -251,6 +251,7 @@ call ReadCluster ; read one cluster of root dir sub [bx+FileSize], ebp ja FileReadContinue + mov dx, [bx] ; restore BIOS boot drive number pop bp ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -260,7 +261,6 @@ mov ds, bp ; bp=ds=seg the file is loaded to add bp, [bx+08h] ; bp = image base - mov ax, [bx+06h] ; ax = reloc items mov di, [bx+18h] ; di = reloc table pointer cmp word [bx], 5A4Dh ; "MZ" signature? @@ -270,9 +270,9 @@ ;; Setup and run a .COM program ;; ;; Set CS=DS=ES=SS SP=0 IP=100h ;; ;; AX=0ffffh BX=0 CX=0 DX=drive ;; +;; and cmdline=void ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - mov ax, 0ffffh ; both FCB in the PSP don't have a valid drive identifier mov di, 100h ; ip mov bp, ImageLoadSeg-10h ; "org 100h" stuff :) mov ss, bp @@ -284,7 +284,7 @@ ;; Relocate, setup and run a .EXE program ;; ;; Set CS:IP, SS:SP, DS, ES and AX according ;; ;; to wiki.osdev.org/MZ#Initial_Program_State ;; -;; AX=0ffffh BX=0 CX=0 DX=drive ;; +;; AX=0ffffh BX=0 CX=0 DX=drive cmdline=void ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ReloCycle: @@ -295,13 +295,11 @@ scasw ; point to next entry RelocateEXE: - dec ax ; 32768 max (128KB table) - jns ReloCycle ; leave with ax=0ffffh: both FCB in the - ; PSP don't have a valid drive identifier - les si, [bx+0Eh] - add si, bp - mov ss, si ; ss for EXE - mov sp, es ; sp for EXE + dec word [bx+06h] ; reloc items, 32768 max (128KB table) + jns ReloCycle + + add [bx+0Eh], bp + lss sp, [bx+0Eh] ; ss:sp for EXE lea si, [bp-10h] ; ds and es both point to the segment push si ; containing the PSP structure @@ -314,6 +312,9 @@ push di push ds pop es + xor ax, ax + mov [80h], ax ; clear cmdline + dec ax ; both FCB in the PSP don't have a valid drive identifier ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Set the magic numbers so the program knows that it ;; @@ -411,7 +412,7 @@ ReadSectorRetry: mov si, sp mov ah, 42h ; ah = 42h = extended read function no. - mov dl, [bx] + mov dx, [bx] ; restore BIOS boot drive number int 13h ; extended read sectors (DL, DS:SI) jnc ReadSuccess @@ -434,9 +435,14 @@ cmp esi, byte -10 ; carry=0 if last cluster, and carry=1 otherwise ReadSectorNext: - mov dl, [bx] ; restore BIOS boot drive number ret +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Fill free space with zeroes ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + times (512-13-20-($-$$)) db 0 + ;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Error Messaging Code ;; ;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -460,12 +466,6 @@ hlt jmp short Stop -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Fill free space with zeroes ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - times (512-13-($-$$)) db 0 - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Name of the file to load and run ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff -r e7bde16e8f79 -r d1f31f5f6401 BootProg/stuff/bootprog.sh --- a/BootProg/stuff/bootprog.sh Sat Apr 16 12:43:33 2022 +0000 +++ b/BootProg/stuff/bootprog.sh Wed Apr 20 15:10:50 2022 +0000 @@ -1,39 +1,30 @@ #!/bin/sh [ ! -e "$1" ] && cat <] $0 device [boot name entry] [boot.bin] +Usage: [FAT=] $0 device [file] Example: $0 /dev/fd0 STARTUP.BIN EOT -while read chk ofs fat bin name; do - [ $FAT -eq $fat ] || [ "$(dd if="$1" bs=1 count=8 skip=$chk)" = "$fat " ] || continue - echo "Install $fat bootsector on $1." - for arg in "skip=$(($ofs+8)) seek=$(($ofs+8))" "count=11" ; do - if [ "$3" ]; then - cat "$3" - else - sed '1,/^exit 1/d' $0 | tar xzOf - boot$bin.bin - fi | dd of="$1" bs=1 conv=notrunc $arg +ddo="dd of=$1 bs=1 conv=notrunc" +while read c o b f; do + [ "${FAT:-$(dd if="$1" bs=1 count=5 skip=$c)}" = "$f" ] || continue + echo "Install $f bootsector on $1." + for a in "$((o+b)) seek=$o count=$((512-o))" "$b count=11"; do + sed '1,/^exit 1/d' $0 | unlzma | $ddo skip=$a done - [ "$2" ] && echo "Set bootfile '$2'" && echo -en "$name" | \ - dd of="$1" bs=1 conv=notrunc seek=499 count=11 - case "$fat" in - EXFAT) dd if="$1" bs=512 count=11 | od -v -An -t u1 -w1 - | awk ' -BEGIN { chk=0; i=-1 } -{ - i++ - if (i == 106 || i == 107 || i == 112) next - chk = or(lshift(chk,31),rshift(chk,1)) + $1 -} -END { a=chk%256; b=(chk/256)%256; c=(chk/256/256)%256; d=chk/256/256/256 - for (i=0;i<128;i++) printf "echo -en \"\\x%02X\\x%02X\\x%02X\\x%02X\"\n",a,b,c,d -} ' | sh | dd bs=512 of="$1" seek=11 - esac + [ "$2" ] && echo "Set boot file '$2'" && echo -n "$2" | case "$f" in + E*) sed 's| |.|;s| ||g' | cat - /dev/zero;; + *) tr a-z A-Z | sed 's|\.| |;s|^\(.\{8\}\) *|\1|;s|$| |' + esac | $ddo seek=499 count=11 + [ "$f" = "EXFAT" ] && dd if="$1" bs=512 count=11 | od -v -An -t u1 -w1 - | LANG=C awk ' +BEGIN { a=0;i=-1;m=0xFFFFFFFE } +{ if (++i!=106 && i!=107 && i!=112) a=or(and(lshift(a,31),m),and(rshift(a,1),m/2))+$1 } +END { b=a/256;c=b/256; for (i=0;i<128;i++) printf "%c%c%c%c",a%256,b%256,c%256,(c/256)%256 }' | $ddo seek=5632 exit 0 -done 2> /dev/null </dev/null <= 0x202 movw $INITSEG/16+stacktop/256, EXEADRS(cmd_line_ptr+1) # else diff -r e7bde16e8f79 -r d1f31f5f6401 memtest/stuff/bootloader.S --- a/memtest/stuff/bootloader.S Sat Apr 16 12:43:33 2022 +0000 +++ b/memtest/stuff/bootloader.S Wed Apr 20 15:10:50 2022 +0000 @@ -20,6 +20,7 @@ /* some extra features */ #define EXE_SUPPORT real mode dos .exe file support +208/264 #define CMDLINE dos kernel cmdline support +45 +#define BUGGY_CMDLINE verify cmdline length +2 #define VCPI VCPI 4.0 support (386+) +109 #define SHUTDOWNDOS shutdown DOS services +29 @@ -356,7 +357,12 @@ lodsb cbw xchgw %ax, %cx +#ifdef BUGGY_CMDLINE + test %cl, %cl # C=O=0, set S & Z + jng nocmdline # Z == 1 or O != S ? +#else jcxz nocmdline +#endif # if defined(BZIMAGE) && BZIMAGE >= 0x202 movw $INITSEG/16+stacktop/256, EXEADRS(cmd_line_ptr+1) # else diff -r e7bde16e8f79 -r d1f31f5f6401 memtest/stuff/memtest86+-5.01-array-size.patch --- a/memtest/stuff/memtest86+-5.01-array-size.patch Sat Apr 16 12:43:33 2022 +0000 +++ b/memtest/stuff/memtest86+-5.01-array-size.patch Wed Apr 20 15:10:50 2022 +0000 @@ -18,3 +18,30 @@ pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); vid &= 0xFFFF; +@@ -1424,7 +1424,7 @@ + unsigned long dramchr; + float clockratio; + double dramclock; +- unsigned int dummy[3]; ++ unsigned int dummy[4]; + int ram_type; + + float coef = 10; +@@ -3680,7 +3680,7 @@ + static void poll_timings_k16(void) { + + ulong dramt0, dramt1; +- int cas, rcd, rp, rc, ras; ++ int cas, rcd, rp, ras; + + pci_conf_read(0, 24, 2, 0x200, 4, &dramt0); + pci_conf_read(0, 24, 2, 0x204, 4, &dramt1); +@@ -3690,7 +3690,7 @@ + rp = ((dramt0 >> 16) & 0x1F); + ras = ((dramt0 >> 24) & 0x3F); + +- rc = (dramt1 & 0x3F); ++ //int rc = (dramt1 & 0x3F); + + print_ram_line(cas, rcd, rp, ras, 1); + } diff -r e7bde16e8f79 -r d1f31f5f6401 pingus/receipt --- a/pingus/receipt Sat Apr 16 12:43:33 2022 +0000 +++ b/pingus/receipt Wed Apr 20 15:10:50 2022 +0000 @@ -11,7 +11,7 @@ LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="https://pingus.seul.org/" +WEB_SITE="https://gitlab.com/pingus/pingus" WGET_URL="http://pingus.seul.org/files/$TARBALL" DEPENDS="libsdl libsdl-image libsdl-mixer @@ -23,8 +23,8 @@ current_version() { - wget -O - $WEB_SITE/download.html 2>/dev/null | \ - sed "/tar/!d;s|.*$PACKAGE-||;s|.tar.*||;q" + wget -O - https://gitlab.com/pingus/pingus/-/tags?sort=updated_desc | \ + sed '/item-title/!d;s|.*>v||;s|<.*||;q' } # Rules to configure and make the package. diff -r e7bde16e8f79 -r d1f31f5f6401 plop/stuff/bootloader.S --- a/plop/stuff/bootloader.S Sat Apr 16 12:43:33 2022 +0000 +++ b/plop/stuff/bootloader.S Wed Apr 20 15:10:50 2022 +0000 @@ -20,12 +20,13 @@ /* some extra features */ #define EXE_SUPPORT real mode dos .exe file support +208/264 #define CMDLINE dos kernel cmdline support +45 +#define BUGGY_CMDLINE verify cmdline length +2 #define VCPI VCPI 4.0 support (386+) +109 #define SHUTDOWNDOS shutdown DOS services +29 /* some contraints to reduce the code size */ //#define FLOPPY_1440K_ONLY 1.44M floppies support only -26 -#define FLOPPY_HAS_2_SIDES hardcoded heads count to 2 -15 +//#define FLOPPY_HAS_2_SIDES hardcoded heads count to 2 -15 //#define NO_CMDLINE_SHRINK remove heading spaces ? -6-21 //#define NO_CMDLINE_FILE remove @cmdline file support ? -21 //#define NO_DOTS show progression dots ? -5 @@ -313,8 +314,8 @@ #else subw %ax, %bx jnc forward + //movw $0x8FFF, %ax movb $0x90, %ah - ;decw %ax forward: movw %ax, %es movw %ax, %di @@ -356,7 +357,12 @@ lodsb cbw xchgw %ax, %cx +#ifdef BUGGY_CMDLINE + test %cl, %cl # C=O=0, set S & Z + jng nocmdline # Z == 1 or O != S ? +#else jcxz nocmdline +#endif # if defined(BZIMAGE) && BZIMAGE >= 0x202 movw $INITSEG/16+stacktop/256, EXEADRS(cmd_line_ptr+1) # else diff -r e7bde16e8f79 -r d1f31f5f6401 tumbler-dev/receipt --- a/tumbler-dev/receipt Sat Apr 16 12:43:33 2022 +0000 +++ b/tumbler-dev/receipt Wed Apr 20 15:10:50 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Development files for tumbler." MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2 LGPL2.1" -WEB_SITE="https://docs.xfce.org/xfce/thunar/tumbler" +WEB_SITE="https://gitlab.xfce.org/xfce/tumbler/" DEPENDS="pkg-config tumbler" WANTED="tumbler" diff -r e7bde16e8f79 -r d1f31f5f6401 tumbler/receipt --- a/tumbler/receipt Sat Apr 16 12:43:33 2022 +0000 +++ b/tumbler/receipt Wed Apr 20 15:10:50 2022 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="A D-Bus thumbnailing service based on the thumbnail management D-Bus specification." MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2 LGPL2.1" -WEB_SITE="https://docs.xfce.org/xfce/thunar/tumbler" +WEB_SITE="https://gitlab.xfce.org/xfce/tumbler/" TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL" diff -r e7bde16e8f79 -r d1f31f5f6401 xaos/receipt --- a/xaos/receipt Sat Apr 16 12:43:33 2022 +0000 +++ b/xaos/receipt Wed Apr 20 15:10:50 2022 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://matek.hu/xaos/" +WEB_SITE="https://xaos-project.github.io/" WGET_URL="http://heanet.dl.sourceforge.net/project/xaos/XaoS/$VERSION/$TARBALL" DEPENDS="libpng zlib"