WebSVN – Kolibri OS – Diff – /kernel/trunk/fs/ext.inc

 ;; Copyright (C) KolibriOS team 2013-2016. All rights reserved. ;;
 ;;  Distributed under terms of the GNU General Public License.  ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 6468 $
+$Revision: 6471 $
 ; EXT external functions
 ;   in:
 ; ebx -> parameter structure of sysfunc 70
 ; ebp -> EXTFS structure
-; esi -> path string
+; esi -> path string in UTF-8
 ;   out:
 ; eax, ebx = return values for sysfunc 70
 iglobal
         test    eax, eax
         jnz     .fail
         cmp     [ebx+SUPERBLOCK.magic], 0xEF53
         jne     .fail
         cmp     [ebx+SUPERBLOCK.state], 1
-        jne     .fail
+        ja      .fail
         test    [ebx+SUPERBLOCK.incompatibleFlags], not INCOMPATIBLE_SUPPORT
         jnz     .fail
         cmp     [ebx+SUPERBLOCK.sectorsPerBlockLog], 6  ; 64KB
         ja      .fail
         cmp     [ebx+SUPERBLOCK.inodeSize], 1024
 linkInode:
 ;   in:
 ; eax = inode on which to link
 ; ebx = inode to link
-; esi -> name
+; esi -> name in UTF-8
 ;  dl = file type
         push    esi edi ebx ecx eax edx
         call    strlen
         add     ecx, 8  ; directory entry size
 @@:
         pop     ebx edi esi edx
         ret
 findInode_parent:
-; in: esi -> path
+; in: esi -> path string in UTF-8
 ;   out:
-; edi -> file name
+; edi -> file name in UTF-8
 ; esi = inode
         push    esi
         xor     edi, edi
 .loop:
         call    findInode
         pop     edx ebx
         ret
 findInode:
-; in: esi -> path string
+; in: esi -> path string in UTF-8
 ;   out:
 ; [ebp+EXTFS.mainInodeBuffer] = inode
 ; esi = inode number
 ;  dl = first byte of file/folder name
         mov     eax, ecx
         mov     ebx, [ebp+EXTFS.mainBlockBuffer]
         call    extfsReadBlock
         jc      .error_get_block
         push    esi edx
-        sub     esp, 256
         mov     edx, ebx
         add     edx, [ebp+EXTFS.bytesPerBlock]
 .start_rec:
         cmp     [ebx+DIRENTRY.inodeNumber], 0
         jz      .next_rec
-        mov     edi, esp
         push    esi
         movzx   ecx, [ebx+DIRENTRY.nameLength]
-        lea     esi, [ebx+DIRENTRY.name]
+        lea     edi, [ebx+DIRENTRY.name]
-        call    utf8_to_cp866
-        mov     ecx, edi
+        repz cmpsb
-        lea     edi, [esp+4]
-        sub     ecx, edi    ; number of bytes in resulting string
-        mov     esi, [esp]
-@@: ; edi -> converted string in stack, ecx = size, esi -> original file path
-        jecxz   .test_find
+        jz      .test_find
-        dec     ecx
-        lodsb
-        call    char_toupper
-        mov     ah, [edi]
-        inc     edi
-        xchg    al, ah
-        call    char_toupper
-        cmp     al, ah
-        je      @b
 @@: ; doesn't match
         pop     esi
 .next_rec:
         movzx   eax, [ebx+DIRENTRY.entryLength]
         add     ebx, eax
         je      @f
         cmp     byte [esi], '/'
         jne     @b
         inc     esi
 @@:
-        add     esp, 256+4
-        pop     edx edi ecx
+        pop     edx edx edi ecx
 ; ebx -> matched directory entry, esi -> name without parent, or not changed
         cmp     edi, esi
         je      .next_folder_block
         cmp     byte [esi], 0
         je      .get_inode_ret
         cmp     [ebx+DIRENTRY.inodeNumber], 0
         jz      .empty_rec
         inc     dword [edi+8]
         inc     dword [edi+4]
         push    ebx edi ecx esi edx
+        pushd   [edi+12]
         mov     edi, edx
         xor     eax, eax
         mov     ecx, 40 / 4
         rep stosd
+        popd    [edx+4]
         mov     eax, [ebx+DIRENTRY.inodeNumber]
         lea     ebx, [ebp+EXTFS.tempInodeBuffer]
         call    readInode
         jc      .error_read_subinode
         mov     esi, ebx
         mov     eax, [esi+INODE.fileSizeHigh]
         stosd
 @@:
         mov     esi, [esp+12]
         movzx   ecx, [esi+DIRENTRY.nameLength]
-        lea     edi, [edx+40]
         lea     esi, [esi+DIRENTRY.name]
+        add     ecx, esi
+        cmp     byte [esi], '.'
+        jnz     @f
+        or      byte [edx], KOS_HIDDEN
+@@:
+        lea     edi, [edx+40]
+        cmp     byte [edx+4], 1
+        jz      .utf16
+@@:
-        call    utf8_to_cp866
+        call    utf8to16
+        call    uni2ansi_char
+        stosb
+        cmp     esi, ecx
+        jc      @b
         and     byte [edi], 0
-        pop     esi ecx edi ebx
+        add     edx, 40+264
-        cmp     byte [edx+40], '.'
-        jne     @f
-        or      dword [edx], KOS_HIDDEN
 @@:
-        add     edx, 40+264 ; go to the next record
+        pop     esi ecx edi ebx
         dec     ecx
 .empty_rec:
         movzx   eax, [ebx+DIRENTRY.entryLength]
         cmp     eax, 12
         jb      .error_bad_len
         cmp     ebx, [edi+24]
         jb      .wanted_start
         push    .wanted_start
         jmp     .end_block
+.utf16:
+        call    utf8to16
+        stosw
+        cmp     esi, ecx
+        jc      .utf16
+        and     word [edi], 0
+        add     edx, 40+520
+        jmp     @b
 .end_dir:
         call    ext_unlock
         mov     edx, [edi+28]
         mov     ebx, [edi+8]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/fs/ext.inc – Rev 6468 → 6471