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

 ;; Copyright (C) KolibriOS team 2004-2016. All rights reserved. ;;
 ;;  Distributed under terms of the GNU General Public License.  ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 6468 $
+$Revision: 6471 $
 ERROR_SUCCESS        = 0
 ERROR_DISK_BASE      = 1
         ret
 @@:
         cmp     word [ebp], '/'
+        jz      .rootdir
+        cmp     byte [ebp], 2
+        jnz     @f
+        cmp     dword[ebp+1], '/'
+        jz      .rootdir
-        jz      .rootdir
+@@:
         stdcall kernel_alloc, maxPathLength
         push    ebx
         mov     ebx, ebp
         mov     ebp, eax
         push    maxPathLength
         push    eax
         call    get_full_file_name
+        pop     ebx
+        test    eax, eax
-        pop     ebx
+        jz      .notfound
         mov     esi, ebp
         mov     ax, [ebp]
         or      ax, 2020h
         cmp     ax, 'cd'
 ;-----------------------------------------------------------------------------
 process_replace_file_name:
 ; in: [esi] = virtual path
-; out: [esi]+[ebp] = physical path
-        pushfd
-        cli
-        mov     ebp, [full_file_name_table]
+; out: [esi]+[ebp] = physical path
+        xor     edi, edi
-        xor     edi, edi
+        xor     ebp, ebp
 .loop:
         cmp     edi, [full_file_name_table.size]
         jae     .notfound
         push    esi edi
         shl     edi, 7
-        add     edi, ebp
+        add     edi, [full_file_name_table]
 @@:
         cmp     byte [edi], 0
         jz      .dest_done
         lodsb
 .dest_done:
         cmp     byte [esi], 0
         jz      .found
         cmp     byte [esi], '/'
         jnz     .cont
-        inc     esi
 .found:
         pop     edi eax
         shl     edi, 7
-        add     edi, ebp
+        add     edi, [full_file_name_table]
         mov     ebp, esi
-        cmp     byte [esi], 0
         lea     esi, [edi+64]
-        jnz     .ret
 .notfound:
-        xor     ebp, ebp
-.ret:
-        popfd
         ret
 ;-----------------------------------------------------------------------------
 uglobal
-lock_flag_for_f30_3 rb 1
+addDirSeal db  ?
 endg
 sys_current_directory:  ; sysfunction 30
         jz      .set
         dec     ebx
         jz      .get
         dec     ebx
         jz      .mount_additional_directory
+        dec     ebx
+        jz      .get16
+@@:
         ret
 .mount_additional_directory:
+; in: ecx -> dir name+dir path (128)
-; in: ecx -> dir name+dir path (128)
+        mov     al, 1
+        xchg    [addDirSeal], al
-        cmp     [lock_flag_for_f30_3], 1    ; check lock
+        test    al, al
-        je      @f
+        jnz     @b
         mov     esi, ecx
         mov     edi, sysdir_name1
-        mov     ecx, 63
-        pushfd
-        cli
-        cld
+        mov     ecx, 63
         rep movsb   ; copying fake directory name
         inc     esi
         xor     eax, eax
         stosb       ; terminator of name, in case if we get the inlet trash
-        mov     ecx, 63
-        rep movsb   ; copying real directory path for mounting
+        mov     cl, 63
-        xor     eax, eax
+        cmp     word [esi], 2
-        stosb
-; increase the pointer of inputs for procedure "process_replace_file_name"
+        jz      .utf16
-        mov     [full_file_name_table.size], 2
-        mov     [lock_flag_for_f30_3], 1    ; lock
-        popfd
+        call    cp866toUTF8_string
+@@:
+        mov     byte [edi], 0
-@@:
+        mov     [full_file_name_table.size], 2
+        ret
+.utf16:
+        add     esi, 2
+        call    UTF16to8_string
-        ret
+        jmp     @b
-.get:       ; in: ecx -> buffer, edx = length
-        mov     ebx, edi    ; buffer
-        push    ecx
+.get:       ; in: ecx -> buffer, edx = length
-        push    edi
+        mov     esi, edi
-        xor     eax, eax
-        mov     ecx, maxPathLength
-        repne scasb
-        jnz     .error
-        sub     edi, ebx
-        inc     edi
-        mov     [esp+32+8], edi ; return in eax
+        mov     edi, ecx
-        cmp     edx, edi
+        cmp     edx, maxPathLength
-        jbe     @f
+        jc      @f
-        mov     edx, edi
-@@:
-        pop     esi
-        pop     edi
-        cmp     edx, 1
+        mov     edx, maxPathLength
-        jbe     .ret
+@@:
         mov     al, '/'
+        stosb
+        mov     ecx, edx
+        dec     ecx
+@@:
+        dec     ecx
+        js      @f
-        stosb
+        call    utf8to16
+        call    uni2ansi_char
+        stosb
+        test    al, al
+        jnz     @b
-        mov     ecx, edx
+        sub     edx, ecx
+        mov     ecx, edx
-        rep movsb
+@@:
-.ret:
+        mov     [esp+32], ecx
+        ret
+.get16:
+        mov     esi, edi
+        mov     edi, ecx
+        cmp     edx, maxPathLength
-        ret
+        jc      @f
+        mov     edx, maxPathLength
+@@:
+        shr     edx, 1
+        mov     ax, '/'
+        stosw
+        mov     ecx, edx
+        dec     ecx
+@@:
+        dec     ecx
+        js      @f
+        call    utf8to16
+        stosw
+        test    ax, ax
+        jnz     @b
+        sub     edx, ecx
-.error:
+        mov     ecx, edx
-        add     esp, 8
+@@:
-        or      dword[esp+32], -1
+        mov     [esp+32], ecx
         ret
 .set:
         pop     eax
         push    maxPathLength
         push    edi
         push    eax
         mov     ebx, ecx
+get_full_file_name:
+; in: ebx -> file name, [esp+4] -> destination, [esp+8] = max length
+; out: eax=0 -> out of length
+        push    ebp ebx
+        mov     esi, ebx
-get_full_file_name:
+        cmp     byte [ebx], 2
-; in: ebx -> file name, [esp+4] -> destination, [esp+8] = max length
+        jnz     @f
+        inc     esi
-; destroys all registers
+@@:
+        cmp     byte [esi], '/'
+        jnz     .set_relative
+        inc     esi
-        push    ebp
+        cmp     byte [ebx], 2
-        cmp     byte [ebx], '/'
+        jnz     @f
-        jnz     .set_relative
+        inc     esi
-        lea     esi, [ebx+1]
+@@:
+        call    process_replace_file_name
-        call    process_replace_file_name
+        mov     edi, [esp+12]
-        mov     edi, [esp+8]
+        mov     ecx, [esp+16]
-        mov     edx, [esp+12]
+        test    ebp, ebp
+        jz      .absolute
-        add     edx, edi
+@@:
-.set_copy:
+        lodsb
-        lodsb
         stosb
-        test    al, al
-        jz      .set_part2
-.set_copy_cont:
+        dec     ecx
+        test    al, al
+        jnz     @b
+        mov     esi, ebp
+        dec     edi
+.absolute:
+        cmp     byte [ebx], 2
+        jz      @f
+        call    cp866toUTF8_string
+        jns     .ret
+        jmp     .fail
         cmp     edi, edx
-        jb      .set_copy
+@@:
-.overflow:
+        call    UTF16to8_string
-        dec     edi
+        jns     .ret
 .fail:
-        mov     byte [edi], 0
-        xor     eax, eax
-        pop     ebp
-        ret     8
-.set_part2:
-        mov     esi, ebp
-        xor     ebp, ebp
-        test    esi, esi
+        mov     byte [edi], 0
-        jz      .ret.ok
+        xor     eax, eax
-        mov     byte [edi-1], '/'
+        pop     ebx ebp
-        jmp     .set_copy_cont
+        ret     8
 .set_relative:
         mov     edi, [current_slot]
         mov     edi, [edi+APPDATA.cur_dir]
         mov     edx, edi
-        mov     ecx, [esp+12]
+        mov     ecx, [esp+16]
         xor     eax, eax
+        repnz scasb
+        mov     esi, edi
-        repnz scasb
+        dec     esi
-        mov     esi, edi
+        mov     edi, [esp+12]
-        dec     esi
+        jecxz   .fail
-        mov     edi, [esp+8]
+        cmp     byte [ebx], 2
-        jecxz   .fail
+        jz      .relative16
 .relative:
-        cmp     byte [ebx], 0
-        jz      .set_ok
-        cmp     word [ebx], '.'
+        cmp     byte [ebx], 0
-        jz      .set_ok
-        cmp     word [ebx], './'
-        jnz     @f
+        jz      .set_ok
-        add     ebx, 2
+        cmp     word [ebx], '.'
-        jmp     .relative
+        jz      .set_ok
         cmp     word [ebx], './'
-@@:
+        jz      .next
         cmp     word [ebx], '..'
+        jnz     .doset_relative
-        jnz     .doset_relative
+        cmp     byte [ebx+2], 0
-        cmp     byte [ebx+2], 0
+        jz      @f
-        jz      @f
+        cmp     byte [ebx+2], '/'
-        cmp     byte [ebx+2], '/'
+        jnz     .doset_relative
+        inc     ebx
-        jnz     .doset_relative
+@@:
-@@:
+        dec     esi
-        dec     esi
+        cmp     byte [esi], '/'
-        cmp     byte [esi], '/'
+        jnz     @b
-        jnz     @b
+.next:
-        add     ebx, 3
+        add     ebx, 2
         jmp     .relative
 .set_ok:
-        cmp     edx, edi        ; is destination equal to APPDATA.cur_dir?
+        cmp     edx, edi    ; is destination equal to cur_dir?
         jz      @f
         mov     ecx, esi
         sub     ecx, edx
         mov     esi, edx
         rep movsb
         mov     byte [edi], 0
-.ret.ok:
+.ret:
         mov     al, 1
+        pop     ebx ebp
-        pop     ebp
+        ret     8
-        ret     8
+@@:
         mov     byte [esi], 0
-@@:
+        jmp     .ret
         mov     byte [esi], 0
-        jmp     .ret.ok
+.doset_relative:
         cmp     edx, edi    ; is destination equal to cur_dir?
-.doset_relative:
-        cmp     edx, edi
+        mov     edi, esi
-        jz      .doset_relative.cur_dir
-        mov     ecx, esi
-        sub     ecx, edx
-        mov     esi, edx
-        mov     edx, edi
+        jz      @f
-        rep movsb
+        mov     edi, [esp+12]
+        mov     ecx, esi
-        jmp     .doset_relative.copy
+        sub     ecx, edx
+        mov     esi, edx
+        mov     edx, edi
+        rep movsb
+@@:
+        mov     byte [edi], '/'
+        inc     edi
+        mov     esi, ebx
+        mov     ecx, edx
+        add     ecx, [esp+16]
+        sub     ecx, edi
+        mov     ebx, [esp]
+        jmp     .absolute
+.relative16:
+        cmp     word [ebx], 0
+        jz      .set_ok
+        cmp     word [ebx], '.'
+        jnz     .doset_relative
+        cmp     word [ebx+2], 0
+        jz      .set_ok
+        cmp     word [ebx+2], '/'
-.doset_relative.cur_dir:
+        jz      .next16
-        mov     edi, esi
-.doset_relative.copy:
+        cmp     word [ebx+2], '.'
-        add     edx, [esp+12]
-        mov     byte [edi], '/'
+        jnz     .doset_relative
-        inc     edi
+        cmp     word [ebx+4], 0
-        cmp     edi, edx
+        jz      @f
-        jae     .overflow
+        cmp     word [ebx+4], '/'
-@@:
+        jnz     .doset_relative
-        mov     al, [ebx]
+        add     ebx, 2
-        inc     ebx
+@@:
-        stosb
+        dec     esi
-        test    al, al
+        cmp     byte [esi], '/'

Subversion Repositories Kolibri OS

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