aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-02-10 22:22:23 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-02-10 22:22:23 -0800
commit8814df6683dca8e6a54da61d8afd88372d99047d (patch)
treeb78fd9ea2013020bbefd707d551af8e25e0c8c9a /core
parentd379e8c25b29794798395bf024f1c31c24bcb385 (diff)
downloadsyslinux-elf-8814df6683dca8e6a54da61d8afd88372d99047d.tar.gz
syslinux-elf-8814df6683dca8e6a54da61d8afd88372d99047d.tar.xz
syslinux-elf-8814df6683dca8e6a54da61d8afd88372d99047d.zip
ldlinux: fix interface to ucs2_to_cp
The interface to ucs2_to_cp has changed slightly, it now returns ZF=0 on failure, not CF=1.
Diffstat (limited to 'core')
-rw-r--r--core/ldlinux.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index 29f3b3b4..a06e727c 100644
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -1437,8 +1437,8 @@ readdir:
jne .vfat_abort ; Is this the entry we need?
mov bl,[gs:si+13]
cmp bl,[VFATCsum]
- jne .vfat_abort
- jmp .vfat_cp_ln
+ je .vfat_cp_ln
+ jmp .vfat_abort
.vfat_ck_ln: ; Load this line's VFAT CheckSum
mov bl,[gs:si+13]
@@ -1459,10 +1459,10 @@ readdir:
call ucs2_to_cp ; Convert to local codepage
mov bp,fs
mov es,bp
- jc .vfat_abort ;-; Use short name if character not on codepage
+ jnz .vfat_abort ; Use short name if character not on codepage
stosb ; CAN NOT OVERRIDE es
cmp al,0
- jz .vfat_find_next ; Null-terminated string; don't process more
+ jz .vfat_find_next ; Null-terminated string; don't process more
cmp cx,3
je .vfat_adj_add2
cmp cx,9