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: 6471 $
+$Revision: 6522 $
 ; EXT external functions
 ;   in:
 ;   in:
 ; eax = inode from which to unlink
 ; ebx = inode to unlink
 ;   out:
 ; eax = current number of links to inode, -1 = error
-        push    edx esi edi ebx
+        push    edx ebx
         lea     ebx, [ebp+EXTFS.tempInodeBuffer]
         call    readInode
         jc      .fail
         push    eax
         lea     esi, [ebp+EXTFS.tempInodeBuffer]
         mov     eax, [esp]
         call    writeInode
         jc      .fail
         movzx   eax, word [ebx+INODE.linksCount]
 @@:
-        pop     ebx edi esi edx
+        pop     ebx edx
         ret
-findInode_parent:
+findInode:
 ; in: esi -> path string in UTF-8
 ;   out:
 ; edi -> file name in UTF-8
+; esi = last inode number
+; [ebp+EXTFS.mainInodeBuffer] = last inode
+; ecx = parent inode number
-; esi = inode
+; CF=1 -> file not found, edi=0 -> error
-        push    esi
-        xor     edi, edi
-.loop:
-        cmp     byte [esi], '/'
-        jne     @f
-        mov     edi, esi
-        inc     esi
-        jmp     .loop
-@@:
-        inc     esi
-        cmp     byte [esi-1], 0
-        jne     .loop
-        cmp     edi, 0
-        jne     @f
-; parent is root
-        pop     edi
-        dec     esi
-        jmp     .get_inode
-@@: ; parent is folder
-        mov     byte [edi], 0
-        inc     edi
-        pop     esi
-.get_inode:
-        push    ebx edx
-        call    findInode
-        pop     edx ebx
-        ret
-findInode:
-; in: esi -> path string in UTF-8
-;   out:
-; [ebp+EXTFS.mainInodeBuffer] = inode
-; esi = inode number
-;  dl = first byte of file/folder name
-        lea     edx, [ebp+EXTFS.rootInodeBuffer]
-        cmp     [edx+INODE.sectorsUsed], 0
-        je      .not_found
-        cmp     byte [esi], 0
-        jne     .next_path_part
-; root
-        push    edi ecx
+        push    esi
         lea     esi, [ebp+EXTFS.rootInodeBuffer]
         lea     edi, [ebp+EXTFS.mainInodeBuffer]
+        movzx   ecx, [ebp+EXTFS.superblock.inodeSize]
-        movzx   ecx, [ebp+EXTFS.superblock.inodeSize]
+        mov     edx, esi
         rep movsb
+        pop     esi
+        pushd   0 ROOT_INODE
+        cmp     [edx+INODE.sectorsUsed], 0
+        jz      .not_found
+        cmp     byte [esi], 0
-        pop     ecx edi
+        jnz     .next_path_part
         xor     eax, eax
+        mov     edi, esi
+        pop     esi ecx
+        ret
+@@:
+        pop     esi esi
+.error:
-        xor     dl, dl
+        pop     esi ecx
+        xor     edi, edi
-        mov     esi, ROOT_INODE
+        stc
         ret
 .next_path_part:
         push    [edx+INODE.sectorsUsed]
         xor     ecx, ecx
 .folder_block_cycle:
         push    ecx
         xchg    esi, edx
         call    extfsGetFileBlock
-        jc      .error_get_block
+        jc      @b
         xchg    esi, edx
         mov     eax, ecx
         mov     ebx, [ebp+EXTFS.mainBlockBuffer]
         call    extfsReadBlock
-        jc      .error_get_block
+        jc      @b
         push    esi edx
         mov     edx, ebx
         add     edx, [ebp+EXTFS.bytesPerBlock]
         je      @f
         cmp     byte [esi], '/'
         jne     @b
         inc     esi
 @@:
-        pop     edx edx edi ecx
+        pop     edx edx edi ecx eax
 ; 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
-        mov     eax, [ebx+DIRENTRY.inodeNumber]
-        lea     ebx, [ebp+EXTFS.mainInodeBuffer]
-        call    readInode
-        jc      .error_get_inode
-        movzx   eax, [ebx+INODE.accessMode]
-        and     eax, TYPE_MASK
-        cmp     eax, DIRECTORY
-        jne     .not_found      ; path folder is a file
-        pop     ecx
+        jnz     @f
-        mov     edx, ebx
-        jmp     .next_path_part
-.next_folder_block:
-        pop     eax
         sub     eax, [ebp+EXTFS.sectorsPerBlock]
         jle     .not_found
         push    eax
         inc     ecx
         jmp     .folder_block_cycle
-.get_inode_ret:
+@@:
         pop     eax
-        mov     dl, [ebx+DIRENTRY.name]
+        mov     [esp], eax
         mov     eax, [ebx+DIRENTRY.inodeNumber]
         lea     ebx, [ebp+EXTFS.mainInodeBuffer]
-        mov     esi, eax
+        push    eax
+        call    readInode
+        jc      .error
-        call    readInode
+        cmp     byte [esi], 0
-        ret
+        je      .ret
+        mov     edx, ebx
+        movzx   eax, [ebx+INODE.accessMode]
+        and     eax, TYPE_MASK
+        cmp     eax, DIRECTORY
+        jz      .next_path_part
         xor     edi, edi        ; path folder is a file
 .not_found:
         movi    eax, ERROR_FILE_NOT_FOUND
         stc
-        ret
-.error_get_block:
+.ret:
-        pop     ebx
-.error_get_inode:
-        pop     ebx
+        pop     esi ecx
         ret
 writeSuperblock:
         push    ebx
         call    findInode
         pop     ebx
         jc      .error_ret
         lea     esi, [ebp+EXTFS.mainInodeBuffer]
-        test    [esi+INODE.accessMode], DIRECTORY
+        test    [esi+INODE.accessMode], FLAG_FILE
-        jz      .error_not_found
+        jnz     .error_not_found
         jmp     @f
 .root_folder:
         lea     esi, [ebp+EXTFS.rootInodeBuffer]
         mov     eax, [esi+INODE.dataModified]
         sub     eax, 978307200
         call    fsTime2bdfe
         pop     edx
         or      dword [edx], KOS_DIRECTORY
-        test    [esi+INODE.accessMode], DIRECTORY
+        test    [esi+INODE.accessMode], FLAG_FILE
-        jnz     @f
+        jz      @f
         xor     dword [edx], KOS_DIRECTORY  ; mark as file
         mov     eax, [esi+INODE.fileSize]
         stosd
         mov     eax, [esi+INODE.fileSizeHigh]
         stosd
         mov     edx, [ebx+16]
         cmp     byte [esi], 0
         jz      .is_root
         push    edx
         call    findInode
-        mov     ebx, edx
         pop     edx
         lea     esi, [ebp+EXTFS.mainInodeBuffer]
         jnc     @f
         push    eax
         call    ext_unlock
         pop     eax
         ret
 .is_root:
-        xor     ebx, ebx
+        mov     edi, esi
         lea     esi, [ebp+EXTFS.rootInodeBuffer]
+@@:
-@@:
+        mov     bl, [edi]
         xor     eax, eax
         mov     edi, edx
         mov     ecx, 40/4
         rep stosd
         cmp     bl, '.'
         jne     @f
         or      dword [edx], KOS_HIDDEN
 @@:
         or      dword [edx], KOS_DIRECTORY
-        test    [esi+INODE.accessMode], DIRECTORY
+        test    [esi+INODE.accessMode], FLAG_FILE
-        jnz     @f
+        jz      @f
         xor     dword [edx], KOS_DIRECTORY  ; mark as file
         mov     eax, [esi+INODE.fileSize]
         mov     ebx, [esi+INODE.fileSizeHigh]
         mov     dword [edx+32], eax
         ret
 ;----------------------------------------------------------------
 ext_Delete:
-        call    extfsWritingInit
-        push    esi
+        call    extfsWritingInit
         call    findInode
-        mov     ebx, esi
-        pop     esi
+        mov     ebx, esi
         push    eax
         jc      .ret
         pop     eax
         lea     edx, [ebp+EXTFS.mainInodeBuffer]
         movzx   edx, [edx+INODE.accessMode]
         and     edx, TYPE_MASK
         cmp     edx, DIRECTORY
         jne     .file
-        push    esi ebx edx 0
+        push    ebx ecx edx 0
         lea     esi, [ebp+EXTFS.mainInodeBuffer]
 .checkDirectory:
         mov     ecx, [esp]
         call    extfsGetFileBlock
         jb      .dir_entry
         inc     dword[esp]
         jmp     .checkDirectory
 .empty:
-        pop     edx edx ebx esi
+        pop     edx edx ecx ebx
-.file:
-        call    findInode_parent
-        jc      .error
+.file:
-        mov     eax, esi
-; save file/folder's and parent's inode
+        mov     eax, ecx
-        push    ebx eax
-        cmp     edx, DIRECTORY
-        jne     @f
-; Unlink '.'
-        mov     eax, [esp+4]
-        call    unlinkInode
-        cmp     eax, -1
-        je      .error_stack8
-; Unlink '..'
-        mov     eax, [esp+4]
-        mov     ebx, [esp]
+        push    ebx ecx
         call    unlinkInode
         cmp     eax, -1
-        je      .error_stack8
-@@:
+        je      .error_stack8
-        pop     eax
-        mov     ebx, [esp]
-        call    unlinkInode
-        cmp     eax, -1
-        je      .error_stack4
+        pop     ebx
         test    eax, eax
-        jz      @f
-; has hardlinks
+        jz      @f
+        xor     eax, eax
+        cmp     edx, DIRECTORY
-        xor     eax, eax
+        jnz     .error_stack4_eax   ; hardlinks
-        mov     [esp], eax
+        mov     eax, [esp]
-        jmp     .disk_sync
         call    unlinkInode
 @@:
         mov     eax, [esp]
         lea     ebx, [ebp+EXTFS.mainInodeBuffer]
         call    readInode
         ret
 .not_empty:
         pop     eax
 .error_stack8:
-        pop     eax
-.error_stack4:
-        pop     eax
+        pop     eax eax
         push    ERROR_ACCESS_DENIED
         jmp     .disk_sync
         jmp     .disk_sync
 ;----------------------------------------------------------------
 ext_CreateFolder:
-        call    extfsWritingInit
-        push    esi
+        call    extfsWritingInit
-        call    findInode
-        pop     esi
+        call    findInode
         jnc     .success    ; exist
-        call    findInode_parent
+        test    edi, edi
-        jc      .error
+        jz      .error
         mov     eax, esi
         xor     ebx, ebx
         inc     ebx
         call    extfsResourceAlloc
 parent_link db "..", 0
 ;----------------------------------------------------------------
 ext_CreateFile:
         call    extfsWritingInit
-        push    ebx esi
+        push    0 ebx
-        call    findInode
-        mov     esi, [esp]
+        call    findInode
-        jc      @f
-        call    ext_unlock
-        call    ext_Delete
-        push    eax
-        call    ext_lock
-        pop     eax
+        jnc     .exist
-        test    eax, eax
-        jnz     .error
-        mov     esi, [esp]
-@@:
-        call    findInode_parent
+        test    edi, edi
-        jc      .error
+        jz      .error
         mov     eax, esi
         xor     ebx, ebx
         inc     ebx
         call    extfsResourceAlloc
         jc      .error
         inc     ebx
-        push    ebx esi edi
+        push    ebx ebx esi edi
         xor     al, al
         lea     edi, [ebp+EXTFS.tempInodeBuffer]
         movzx   ecx, [ebp+EXTFS.superblock.inodeSize]
         rep stosb
         pop     edi esi edx
 ; edx = allocated inode number, edi -> filename, esi = parent inode number
         mov     [ebx+INODE.accessMode], FLAG_FILE or PERMISSIONS
         mov     eax, edx
         call    writeInode
-        jc      .error
+        jc      .error2
 ; link parent to child
         mov     eax, esi
         mov     ebx, edx
         mov     esi, edi
         mov     dl, DIR_FLAG_FILE
         call    linkInode
-        jc      .error
+        jc      .error2
         pop     esi ebx
-        call    ext_unlock
+        push    ebx esi
+        mov     ecx, [ebx+12]
-        jmp     ext_WriteFile
+        jmp     ext_WriteFile.start
+.exist:
+        lea     edx, [ebp+EXTFS.mainInodeBuffer]
+        movi    eax, ERROR_ACCESS_DENIED
+        test    [edx+INODE.accessMode], FLAG_FILE
+        jz      .error  ; not a file
+        pop     ebx
+        push    ebx esi
+        mov     eax, esi
+        mov     ecx, [ebx+12]
+        call    extfsTruncateFile
+        jnc     ext_WriteFile.start
+.error2:
         pop     ebx
 .error:
         push    eax
         call    ext_unlock
         pop     eax ebx ebx
 ;----------------------------------------------------------------
 ext_WriteFile:
         call    extfsWritingInit
         push    0 ebx
         call    findInode
+        pop     ebx
+        push    ebx esi
         jc      .error
         lea     edx, [ebp+EXTFS.mainInodeBuffer]
         movi    eax, ERROR_ACCESS_DENIED
         test    [edx+INODE.accessMode], FLAG_FILE
         jz      .error  ; not a file
-        mov     ebx, [esp]
-        push    esi     ; inode number
-        mov     eax, esi
         mov     ecx, [ebx+4]
+        add     ecx, [ebx+12]
+.start:
+        mov     eax, esi
         call    extfsExtendFile
-        jc      .error2
+        jc      .error
+        mov     eax, [ebx+4]
         mov     ecx, [ebx+12]
         mov     esi, [ebx+16]
-        mov     eax, [edx+INODE.fileSize]
         push    eax
         xor     edx, edx
         div     [ebp+EXTFS.bytesPerBlock]
         test    edx, edx
         jz      .start_aligned
         xor     ecx, ecx
 .error_inode_size:
         mov     [esp+12], eax
 .write_inode:
         lea     ebx, [ebp+EXTFS.tempInodeBuffer]
-        pop     [ebx+INODE.fileSize]
-        pop     eax
+        pop     eax eax
         call    writeInode
         pop     ebx
         mov     ebx, [ebx+12]
         sub     ebx, ecx
         test    eax, eax
 @@:
         call    ext_unlock
         pop     eax
         ret
-.error2:
         pop     ebx
 .error:
-        pop     ebx ebx
+        pop     ebx ebx ebx
         push    eax
         jmp     @b

Subversion Repositories Kolibri OS

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