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

 ;;  FAT16/32 functions for MenuetOS                                ;;
 ;;                                                                 ;;
 ;;  Copyright 2002 Paolo Minazzi, paolo.minazzi@inwind.it          ;;
 ;;                                                                 ;;
 ;;  See file COPYING for details                                   ;;
+;;  29.04.2006 Elimination of hangup after the                     ;;
-;;                                                                 ;;
+;;             expiration hd_wait_timeout -  Mario79               ;;
 ;;  23.04.2006 LFN read - diamond                                  ;;
 ;;  28.01.2006 find all Fat16/32 partition in all input point      ;;
 ;;             to MBR, see file part_set.inc - Mario79             ;;
 ;;  15.01.2005 get file size/attr/date, file_append - ATV          ;;
 ;;  04.12.2004 skip volume label, file delete bug fixed - ATV      ;;
     je    sfc_in_cache          ; yes
     cmp   [fat_change],0        ; is fat changed?
     je    sfc_no_change         ; no
+    call  write_fat_sector      ; yes. write it into disk
+    cmp   [hd_error],0
-    call  write_fat_sector      ; yes. write it into disk
+    jne   sfc_error
   sfc_no_change:
+    mov   [fat_in_cache],eax    ; save fat sector
+    call  hd_read
+    cmp  [hd_error],0
-    mov   [fat_in_cache],eax    ; save fat sector
+    jne  sfc_error
     call  hd_read
     je    gfc_in_cache
     cmp   [fat_change],0        ; is fat changed?
     je    gfc_no_change         ; no
+    call  write_fat_sector      ; yes. write it into disk
+    cmp  [hd_error],0
-    call  write_fat_sector      ; yes. write it into disk
+    jne  hd_error_01
   gfc_no_change:
+    mov   [fat_in_cache],eax
+    call  hd_read
-    mov   [fat_in_cache],eax
+    cmp  [hd_error],0
-    call  hd_read
+    jne  hd_error_01
+  gfc_in_cache:
-  gfc_in_cache:
+    mov   eax,[ebx+esi]
-    mov   eax,[ebx+esi]
+    and   eax,[fatMASK]
-    and   eax,[fatMASK]
+ hd_error_01:
     mov   eax,2
   gff_in_range:
     push  eax
+    call  get_FAT               ; get cluster state
+    cmp   [hd_error],0
+    jne   gff_not_found_1
     call  get_FAT               ; get cluster state
     test  eax,eax               ; is it free?
     pop   eax
     je    gff_found             ; yes
     inc   eax                   ; next cluster
     dec   ecx                   ; is all checked?
+    jns   gff_test              ; no
-    jns   gff_test              ; no
+  gff_not_found_1:
     add   esp,4
   gff_not_found:
     pop   ecx                   ; yes. disk is full
     mov   ebx,fat_cache
     mov   ecx,[NUMBER_OF_FATS]
   write_next_fat:
+    call  hd_write
+    cmp   [hd_error],0
+    jne   write_fat_not_used
     call  hd_write
     add   eax,[SECTORS_PER_FAT]
     dec   ecx
     jnz   write_next_fat
     add   eax,[DATA_START]
   adr_new_sector:
     mov   ebx,buffer
+    call  hd_read
+    cmp  [hd_error],0
+    jne  adr_not_found
     call  hd_read
     mov   ecx,512/32            ; count of dir entrys per sector = 16
   adr_analyze:
     je    adr_not_found
   adr_next_cluster:
     mov   eax,[cluster_tmp]
+    call  get_FAT               ; get next cluster
+    cmp  [hd_error],0
+    jne  adr_not_found
     call  get_FAT               ; get next cluster
     cmp   eax,2                 ; incorrect fat chain?
     jb    adr_not_found         ; yes
     cmp   eax,[fatRESERVED]     ; is it end of directory?
     add   eax,[DATA_START]
   adw_new_sector:
     mov   ebx,buffer
+    call  hd_read
+    cmp  [hd_error],0
+    jne  adw_not_found
     call  hd_read
     mov   ecx,512/32            ; count of dir entrys per sector = 16
   adw_analyze:
     cmp   [fat16_root],1        ; end of fat16 rootdir
     je    adw_not_found
     mov   eax,[cluster_tmp]
+    call  get_FAT               ; get next cluster
+    cmp   [hd_error],0
+    jne   adw_not_found
     call  get_FAT               ; get next cluster
     cmp   eax,2                 ; incorrect fat chain?
     jb    adw_not_found         ; yes
     cmp   eax,[fatRESERVED]     ; is it end of directory?
     call  get_free_FAT          ; for the directory because the directory
     jc    adw_not_found         ; is full
     mov   edx,[fatEND]          ; new end for directory
+    call  set_FAT
+    cmp  [hd_error],0
-    call  set_FAT
+    jne  adw_not_found
     push  eax                   ; save new cluster
     mov   edx,eax
     mov   eax,[cluster_tmp]     ; change last cluster to point new cluster
+    mov   [f_del],1
+    call  set_FAT
+    cmp  [hd_error],0
-    mov   [f_del],1
+    jne  adw_not_found_1
     call  set_FAT
     mov   [f_del],0
+    mov   ecx,-1                ; remove 1 cluster from free disk space
     call  add_disk_free_space
-    mov   ecx,-1                ; remove 1 cluster from free disk space
+    cmp  [hd_error],0
-    call  add_disk_free_space
+    jne    adw_not_found_1
     mov   ebx,buffer
     push  eax                   ; save sector number
   adw_set_empty_directory:
+    call  hd_write
+    cmp   [hd_error],0
+    jne   adw_not_found_1
     call  hd_write
     inc   eax                   ; next sector
     dec   ecx
     jnz   adw_set_empty_directory
     pop   eax
   adw_found:
+    pop   edi edx ecx
-    pop   edi edx ecx
+    clc                         ; free space found
-    clc                         ; free space found
+    ret
-    ret
+  adw_not_found_1:
     add  esp,4
   adw_not_found:
     dec   esi
     jmp   gdcl2
   gdcl1:
+    call  hd_read
+    cmp  [hd_error],0
+    jne  gdc_error
     call  hd_read
     add   ebx,512               ; update pointer
     dec   edx
     imul  eax,edx
     add   eax,[DATA_START]
   sdc_write:
+    call  hd_write
+    cmp   [hd_error],0
+    jne   sdc_error
     call  hd_write
     add   ebx,512               ; update pointer
     inc   eax
     dec   edx
     jnz   sdc_write
     pushad
     mov   ebx,edx
     call  get_cluster_of_a_path
+    jnc   make_dir_found_path
+    cmp   [hd_error],0
-    jnc   make_dir_found_path
+    jne   make_dir_error_1
   make_dir_path_not_found:
+    popad
+    call  update_disk           ; write all of cache and fat to hd
+    cmp   [hd_error],0
-    popad
+    jne   make_dir_error_2
     call  update_disk           ; write all of cache and fat to hd
     mov   [hd1_status],0
     mov   eax,ERROR_FILE_NOT_FOUND
+    ret
-    ret
+  make_dir_disk_full:
     cmp  [hd_error],0
+    jne   make_dir_error_1
+    popad
+    call  update_disk           ; write all of cache and fat to hd
-  make_dir_disk_full:
+    cmp   [hd_error],0
-    popad
+    jne   make_dir_error_2
     call  update_disk           ; write all of cache and fat to hd
     mov   [hd1_status],0
+    mov   eax,ERROR_DISK_FULL
+    ret
     mov   eax,ERROR_DISK_FULL
-    ret
+  make_dir_already_exist:
     cmp  [hd_error],0
-  make_dir_already_exist:
+    jne   make_dir_error_1
+    mov   eax,[cluster]         ; directory cluster
+    xor   edx,edx               ; free
+    mov   [f_del],1
-    mov   eax,[cluster]         ; directory cluster
+    call  set_FAT
-    xor   edx,edx               ; free
+    cmp  [hd_error],0
-    mov   [f_del],1
+    jne   make_dir_error_1
-    call  set_FAT
+    mov   [f_del],0
     mov   [f_del],0
     popad
+    call  update_disk           ; write all of cache and fat to hd
+  make_dir_error_2:
+    mov   [hd1_status],0
+    mov   eax,ERROR_ACCESS_DENIED
+    ret
+  make_dir_error_1:
+    popad
-    popad
+    jmp   make_dir_error_2
     call  update_disk           ; write all of cache and fat to hd
-    mov   [hd1_status],0
+  make_dir_error_3:
-    mov   eax,ERROR_ACCESS_DENIED
+    add  esp,4
     push  eax
     mov   eax,[cluster]         ; directory cluster
     mov   edx,[fatEND]          ; end for directory
+    call  set_FAT
+    cmp  [hd_error],0
-    call  set_FAT
+    jne   make_dir_error_3
     pop   eax
     mov   ebx,PUSHAD_EAX        ; dir name
+    push  eax
+    call  analyze_directory     ; check if directory already exist
+    cmp   [hd_error],0
-    push  eax
+    jne   make_dir_error_1
     call  analyze_directory     ; check if directory already exist
     pop   eax
     jnc   make_dir_already_exist ; need to free allocated cluster!
     mov   dword [NewDirEntry1+22],ecx
     mov   dword [NewDirEntry2+22],ecx
     mov   ebx,buffer            ; save the directory name,length,cluster
+    call  hd_write
+    cmp   [hd_error],0
-    call  hd_write
+    jne   make_dir_error_1
     mov   ecx,512/4
     xor   eax,eax
     cld
     rep   movsd                 ; copy 2 first directory entrys "." and ".."
   not_first_sector:
+    call  hd_write
+    cmp   [hd_error],0
+    jne   make_dir_error_1
     call  hd_write
     dec   edx
     jnz   dir_set_empty_directory
+    mov   ecx,-1                ; remove 1 cluster from free disk space
+    call  add_disk_free_space
-    mov   ecx,-1                ; remove 1 cluster from free disk space
+    cmp  [hd_error],0
-    call  add_disk_free_space
+    jne   make_dir_error_1
+    popad
     call  update_disk           ; write all of cache and fat to hd
-    popad
+    cmp   [hd_error],0
-    call  update_disk           ; write all of cache and fat to hd
+    jne   make_dir_error_2
 ;    call  reserve_hd1
     push  edi
     mov   edi,1                 ; allow directory remove
+    call  file_delete
+    cmp   [hd_error],0
+    jne   @f
     call  file_delete
     pop   edi
     call  update_disk           ; write all of cache and fat to hd
-    call  update_disk           ; write all of cache and fat to hd
+  @@:
     mov   [hd1_status],0
     push  eax ebx
     mov   eax,[ADR_FSINFO]
     mov   ebx,buffer
+    call  hd_read
+    cmp  [hd_error],0
+    jne  add_not_fs
     call  hd_read
     cmp   dword [ebx+0x1fc],0xaa550000 ; check sector id
     jne   add_not_fs
+    add   [ebx+0x1e8],ecx
+    call  hd_write
-    add   [ebx+0x1e8],ecx
+    cmp   [hd_error],0
-    call  hd_write
+    jne   add_not_fs
     mov   [ebx+26],cx           ; 16 bits low of cluster
     shr   ecx,16
     mov   [ebx+20],cx           ; 16 bits high of cluster (=0 fat16)
     mov   edx,[fatEND]          ; new end for cluster chain
     call  set_FAT
+    cmp  [hd_error],0
+    jne   append_access
     push  eax                   ; save first cluster
     mov   eax,[sector_tmp]
     mov   ebx,buffer
+    call  hd_write              ; write new file entry back to disk
+    cmp   [hd_error],0
+    jne   append_access_1
     call  hd_write              ; write new file entry back to disk
     pop   eax
   append_remove_free:
+    mov   ecx,-1                ; remove 1 cluster from free disk space
+    call  add_disk_free_space   ; Note: uses buffer
-    mov   ecx,-1                ; remove 1 cluster from free disk space
+    cmp  [hd_error],0
-    call  add_disk_free_space   ; Note: uses buffer
+    jne   append_access
   append_found_cluster:
     mov   [cluster],eax
     sub   eax,2
     mov   ecx,[SECTORS_PER_CLUSTER]
     imul  eax,ecx
+    add   eax,[DATA_START]
+    xor   edi,edi
     add   eax,[DATA_START]
-    xor   edi,edi
+  append_new_sector:
     cmp   [hd_error],0
-  append_new_sector:
+    jne   append_access
     push  ecx
   append_bytes_ok:
     cmp   ecx,512               ; overwrite full sector?
     jz    append_full_sector    ; yes
     mov   ebx,buffer            ; overwrite part of sector
     call  hd_read               ; read old sector
+    cmp  [hd_error],0
+    jne  append_access_1
   append_full_sector:
     sub   [bytes2write],ecx
     add   [new_filepos],ecx
     rep   movsb
     pop   ecx
     mov   ebx,buffer
+    call  hd_write
+    cmp   [hd_error],0
+    jne   append_access
     call  hd_write
     cmp   [bytes2write],0       ; is all done?
     jz    append_done
     xor   edi,edi
     inc   eax
     dec   ecx
     jnz   append_new_sector
+    mov   eax,[cluster]
+    call  get_FAT
+    cmp   [hd_error],0
-    mov   eax,[cluster]
+    jne   append_access
     call  get_FAT
     cmp   eax,2
     jb    append_fat
     call  get_free_FAT          ;       of last free cluster
     jc    append_disk_full
     push  eax                   ; save new cluster
     mov   edx,[fatEND]          ; new end for cluster chain
     call  set_FAT
+    cmp  [hd_error],0
+    jne  append_access_1
     mov   edx,eax
     mov   eax,[cluster]
     mov   [f_del],1
     call  set_FAT               ; update previous cluster
+    cmp  [hd_error],0
+    jne  append_access_1
     mov   [f_del],0
     pop   eax
     jmp   append_remove_free
   append_fat:
     mov   eax,ERROR_FAT_TABLE
     jmp   append_ret_code
+  append_disk_full:
+    cmp  [hd_error],0
-  append_disk_full:
+    jne  append_access
     mov   eax,ERROR_DISK_FULL
     jmp   append_ret_code
     mov   PUSHAD_EAX,eax        ; return code
     mov   eax,[sector_tmp]      ; update directory entry
     mov   ebx,buffer
+    call  hd_read
+    cmp  [hd_error],0
+    jne  append_access
     call  hd_read
     mov   ebx,[entry_pos]
     mov   ecx,[new_filepos]
     cmp   ecx,[old_filesize]    ; is file pos above old size?
     jbe   append_size_ok        ; no
     mov   [ebx+28],ecx          ; new file size
   append_size_ok:
     call  set_current_time_for_entry
+    mov   ebx,buffer
+    call  hd_write              ; write new file entry back to disk
-    mov   ebx,buffer
+    cmp   [hd_error],0
-    call  hd_write              ; write new file entry back to disk
+    jne   append_access
     sub   ecx,PUSHAD_ESI        ; start position
+    mov   PUSHAD_EBX,ecx        ; bytes written
+    popad
+    call  update_disk           ; write all of cache and fat to hd
-    mov   PUSHAD_EBX,ecx        ; bytes written
+    cmp   [hd_error],0
-    popad
+    jne   append_access_2
     call  update_disk           ; write all of cache and fat to hd
     mov   [hd1_status],0
     xor   ebx,ebx
     mov   eax,ERROR_END_OF_FILE
     ret
+  append_not_found:
+    cmp  [hd_error],0
-  append_not_found:
+    jne   append_access
     popad
     mov   [hd1_status],0
     xor   ebx,ebx
     mov   eax,ERROR_FILE_NOT_FOUND
+    ret
-    ret
+  append_access_1:
     add   esp,4
   append_access:
+    popad
-    popad
+  append_access_2:
     mov   [hd1_status],0
     xor   ebx,ebx
     mov   eax,ERROR_ACCESS_DENIED
   truncate_save_size:
     call  set_current_time_for_entry
     mov   ebx,buffer
+    call  hd_write
+    cmp   [hd_error],0
+    jne   append_access
     call  hd_write
     mov   eax,edx               ; first cluster
     test  edi,edi               ; 0 length file?
     jz    truncate_clear_chain
     cmp   eax,[fatRESERVED]     ; is it end of file?
     jnb   truncate_eof          ; yes
     sub   edi,esi
     jbe   truncate_pos_found
     call  get_FAT               ; get next cluster
+    cmp   [hd_error],0
+    jne   append_access
     jmp   truncate_new_cluster
   truncate_pos_found:
     mov   edx,[fatEND]          ; new end for cluster chain
     mov   [f_del],1
+    call  set_FAT
+    cmp  [hd_error],0
+    jne  append_access
     call  set_FAT
     mov   [f_del],0
     mov   eax,edx               ; clear rest of chain
+  truncate_clear_chain:
+    call  clear_cluster_chain
-  truncate_clear_chain:
+    cmp  [hd_error],0
-    call  clear_cluster_chain
+    jne  append_access
+  truncate_eof:
+    popad
+    call  update_disk           ; write all of cache and fat to hd
-  truncate_eof:
+    cmp   [hd_error],0
-    popad
+    jne   append_access_2
     call  update_disk           ; write all of cache and fat to hd
     mov   [hd1_status],0
     cmp   edi,esi               ; skip over full cluster?
     jb    filepos_cluster_ok    ; no
     sub   edi,esi
+    call  get_FAT               ; get next cluster
+    cmp   [hd_error],0
+    jne   filepos_eof
     call  get_FAT               ; get next cluster
     jmp   filepos_new_cluster
   filepos_cluster_ok:
     pushad
+    xor   edi,edi               ; don't allow directory remove
+    call  file_delete           ; try to delete the file first
+    cmp   [hd_error],0
-    xor   edi,edi               ; don't allow directory remove
+    jne   exit_write_access_1
     call  file_delete           ; try to delete the file first
     test  eax,eax
     jz    old_deleted           ; deleted ok
     cmp   eax,ERROR_FILE_NOT_FOUND
     jnz   exit_write_access     ; it exist but can't delete
   old_deleted:
+    mov   ebx,PUSHAD_EDX
+    call  get_cluster_of_a_path
-    mov   ebx,PUSHAD_EDX
+    jnc   found_directory_for_writing
-    call  get_cluster_of_a_path
+    cmp   [hd_error],0
-    jnc   found_directory_for_writing
+    jne   exit_write_access
+  exit_writing_with_error:
+    popad
     call  update_disk           ; write all of cache and fat to hd
-  exit_writing_with_error:
+    cmp   [hd_error],0
-    popad
+    jne   exit_write_access_2
     call  update_disk           ; write all of cache and fat to hd
+    mov   [hd1_status],0
+    mov   eax,ERROR_FILE_NOT_FOUND
-    mov   [hd1_status],0
+    ret
     mov   eax,ERROR_FILE_NOT_FOUND
-    ret
+  exit_writing_disk_full_clear:
+    cmp  [hd_error],0
+    jne  exit_write_access_1
+    mov   eax,[sector_tmp]
     mov   ebx,buffer
-  exit_writing_disk_full_clear:
+    call  hd_read               ; read directory sector
-    mov   eax,[sector_tmp]
+    cmp  [hd_error],0
+    jne  exit_write_access_1
+    mov   edx,[entry_pos]
-    mov   ebx,buffer
+    mov   byte [edx],0xe5       ; mark as deleted
-    call  hd_read               ; read directory sector
+    call  hd_write
-    mov   edx,[entry_pos]
+    cmp   [hd_error],0
-    mov   byte [edx],0xe5       ; mark as deleted
+    jne   exit_write_access_1
     call  hd_write
+    mov   eax,[edx+20-2]        ; FAT entry
+    mov   ax,[edx+26]
-    mov   eax,[edx+20-2]        ; FAT entry
+    and   eax,[fatMASK]
-    mov   ax,[edx+26]
+    call  clear_cluster_chain
+  exit_writing_disk_full:
-    and   eax,[fatMASK]
+    cmp  [hd_error],0
-    call  clear_cluster_chain
+    jne  exit_write_access_1
     popad
-  exit_writing_disk_full:
+    call  update_disk           ; write all of cache and fat to hd
     call  update_disk           ; write all of cache and fat to hd
     mov   [hd1_status],0
     mov   eax,ERROR_ACCESS_DENIED
     ret
+  exit_write_access_1:
+    popad
+  exit_write_access_2:
+    mov   [hd1_status],0
+    mov   eax,ERROR_ACCESS_DENIED
+    ret
 found_directory_for_writing:
     call  analyze_directory_to_write
     jc    exit_writing_disk_full
     call  set_current_time_for_entry
+    mov   ebx,buffer            ; save the directory name,length,cluster
+    call  hd_write
-    mov   ebx,buffer            ; save the directory name,length,cluster
+    cmp   [hd_error],0
-    call  hd_write
+    jne   exit_write_access_1
     imul  edi,[SECTORS_PER_CLUSTER],512 ; edi = cluster size in bytes
     xor   ecx,ecx               ; cluster count
     mov   ebx,PUSHAD_ECX        ; ebx = buffer
+hd_new_block_write:
-hd_new_block_write:
+    mov   eax,[cluster]         ; eax = block
     call  set_data_cluster
     jc    exit_writing_disk_full_clear
     mov   edx,eax
     xchg  eax,[cluster]         ; get old cluster and save new cluster
+    call  set_FAT               ; add it in cluster chain
+    cmp  [hd_error],0
+    jne   exit_write_access_1
     call  set_FAT               ; add it in cluster chain
     dec   ecx                   ; update cluster count
     jmp   hd_new_block_write
 file_saved_OK:
+    mov   edx,[fatEND]          ; new end for cluster chain
+    call  set_FAT
     cmp  [hd_error],0
-    mov   edx,[fatEND]          ; new end for cluster chain
+    jne   exit_write_access_1
+    dec   ecx                   ; update cluster count
     call  set_FAT
-    dec   ecx                   ; update cluster count
+    call  add_disk_free_space   ; remove clusters from free disk space
+    cmp  [hd_error],0
+    jne   exit_write_access_1
-    call  add_disk_free_space   ; remove clusters from free disk space
+    popad
     call  update_disk           ; write all of cache and fat to hd
 ; output : eax = 0 - ok
 ;                3 - unknown FS
 ;                5 - file not found
 ;                6 - end of file
 ;                9 - fat table corrupted
+;               10 - access denied
 ;          ebx = size of file/directory
 ;--------------------------------------------------------------------------
     cmp   [fat_type],0
     jnz   fat_ok_for_reading
     xor   ebx,ebx
     test  edi,edi               ; read rootdir
     jne   no_read_root
     xor   eax,eax
+    call  get_dir_size          ; return rootdir size
+    cmp   [hd_error],0
+    jne   file_access_denied
     call  get_dir_size          ; return rootdir size
     mov   [file_size],eax
     mov   eax,[ROOT_CLUSTER]
     jmp   file_read_start
     mov   eax,[ebx+20-2]        ; FAT entry
     mov   ax,[ebx+26]
     and   eax,[fatMASK]
+    call  get_dir_size
+    cmp   [hd_error],0
-    call  get_dir_size
+    jne   file_access_denied
   read_set_size:
     test  edx,edx               ; is all read?
     je    file_read_OK          ; yes
+    call  get_FAT               ; get next cluster
+    cmp   [hd_error],0
     jne   file_access_denied
     call  get_FAT               ; get next cluster
     cmp   eax,[fatRESERVED]     ; end of file
     jnb   file_read_eof
     mov   ebx,[file_size]
     mov   eax,ERROR_FAT_TABLE
     ret
+  file_read_eof:
+    cmp   [hd_error],0
-  file_read_eof:
+    jne   file_access_denied
     popad
     mov   [hd1_status],0
     mov   ebx,[file_size]
     mov   eax,ERROR_END_OF_FILE
     mov   ebx,[file_size]
     xor   eax,eax
     ret
+  file_to_read_not_found:
+    cmp   [hd_error],0
-  file_to_read_not_found:
+    jne   file_access_denied
     popad
     mov   [hd1_status],0
     xor   ebx,ebx
     mov   eax,ERROR_FILE_NOT_FOUND
+    ret
+  file_access_denied:
+    popad
+    mov   [hd1_status],0
+    xor   ebx,ebx
-    ret
+    mov   eax,ERROR_ACCESS_DENIED
     ret
 get_dir_size:
     cmp   eax,2                 ; incorrect fat chain
     jb    dir_size_end
     cmp   eax,[fatRESERVED]     ; end of directory
     ja    dir_size_end
     call  get_FAT               ; get next cluster
+    cmp   [hd_error],0
+    jne   dir_size_ret
     inc   edx
     jmp   dir_size_next
   dir_size_end:
     jc    delete_no_access
     push  ebx                   ; save directory pointer in buffer
     mov   ebx,buffer
+    call  hd_read               ; read directory sector
+    cmp  [hd_error],0
-    call  hd_read               ; read directory sector
+    jne  delete_no_access_1
     pop   ebx
+  delete_notdir:
+    call  delete_entry_name
+    cmp   [hd_error],0
-  delete_notdir:
+    jne   delete_no_access
     call  delete_entry_name
+    mov   eax,ecx               ; first cluster of file
+    call  clear_cluster_chain
+    cmp   [hd_error],0
-    mov   eax,ecx               ; first cluster of file
+    jne   delete_no_access
     call  clear_cluster_chain
     popad
+    xor   eax,eax
+    ret
     xor   eax,eax
-    ret
+  delete_no_access_1:
      add esp,4
   delete_no_access:
     popad
+    mov   eax,ERROR_ACCESS_DENIED
+    ret
     mov   eax,ERROR_ACCESS_DENIED
-    ret
+  file_to_delete_not_found:
     cmp  [hd_error],0
     cmp   eax,[ROOT_CLUSTER]    ; don't remove root cluster
     jz    delete_OK
     xor   edx,edx
+    call  set_FAT               ; clear fat entry
+    cmp  [hd_error],0
+    jne  access_denied_01
     call  set_FAT               ; clear fat entry
     inc   ecx                   ; update cluster count
     mov   eax,edx               ; old cluster
     jmp   clean_new_chain
+  delete_OK:
-  delete_OK:
+    call  add_disk_free_space   ; add clusters to free disk space
-    call  add_disk_free_space   ; add clusters to free disk space
+  access_denied_01:
     mov   [f_del],0
   clear_new_sector:
     mov   edi,eax               ; edi = current directory sector
     mov   ebx,deltree_buffer
+    call  hd_read
+    cmp  [hd_error],0
+    jne  clear_error
     call  hd_read
     mov   edx,512/32            ; count of dir entrys per sector = 16
   clear_analyze:
     push  eax ebx
     mov   eax,edi
     mov   ebx,deltree_buffer    ; save buffer over recursive call
+    call  hd_write              ; write directory sector to disk
+    cmp   [hd_error],0
+    jne   clear_error
     call  hd_write              ; write directory sector to disk
     pop   ebx eax
     call  clear_directory       ; recursive call !!!
     jc    clear_error           ; exit if error found
     push  eax ebx
+    mov   eax,edi
+    mov   ebx,deltree_buffer
+    call  hd_read               ; read directory sector again
-    mov   eax,edi
+    cmp  [hd_error],0
-    mov   ebx,deltree_buffer
+    jne   clear_error_1
     call  hd_read               ; read directory sector again
+    pop   ebx eax
-    pop   ebx eax
+  clear_file:
     call  clear_cluster_chain
-  clear_file:
+    cmp  [hd_error],0
     jnz   clear_analyze
     mov   eax,edi
     mov   ebx,deltree_buffer
+    call  hd_write              ; write directory sector to disk
+    cmp   [hd_error],0
-    call  hd_write              ; write directory sector to disk
+    jne   clear_error
     inc   eax                   ; next sector
     dec   ecx
     jnz   clear_new_sector
+    mov   eax,esi
+    call  get_FAT               ; get next cluster
     cmp   [hd_error],0
-    mov   eax,esi
+    jne   clear_error
     call  get_FAT               ; get next cluster
     jmp   clear_new_cluster     ; clear it
+  clear_write_last:
+    mov   eax,edi
-  clear_write_last:
+    mov   ebx,deltree_buffer
-    mov   eax,edi
+    call  hd_write              ; write directory sector to disk
-    mov   ebx,deltree_buffer
+    cmp   [hd_error],0
-    call  hd_write              ; write directory sector to disk
+    jne   clear_error
+  clear_end:
-  clear_end:
+    popad
-    popad
+    clc
-    clc
+    ret
-    ret
+clear_error_1:
     cmp   ebx,buffer
     jnb   delete_test_long
     mov   ebx,buffer
+    call  hd_write              ; write directory sector back
+    cmp   [hd_error],0
+    jne   delete_name_end
     call  hd_write              ; write directory sector back
     xor   eax,eax
     xchg  eax,[longname_sec2]
     xchg  eax,[longname_sec1]
     test  eax,eax               ; is there previous directory sector?
     jz    delete_name_end       ; no
+    mov   ebx,buffer
+    call  hd_read               ; read previous sector
+    cmp  [hd_error],0
-    mov   ebx,buffer
+    jne  delete_name_end
     call  hd_read               ; read previous sector
     mov   ebx,buffer+0x1e0      ; start from last entry
     mov   edx,eax               ; save dest directory cluster
     mov   ebx,PUSHAD_EBX        ; dest directory name
     push  [longname_sec1]
     push  [longname_sec2]
     call  analyze_directory     ; check if entry already exist
+    cmp  [hd_error],0
+    jne  rename_entry_already_exist_1
     pop   [longname_sec2]
     pop   [longname_sec1]
     jnc   rename_entry_already_exist
     jz    rename_not_dir           ; no
     mov   eax,[dir_entry+20-2]     ; FAT entry
     mov   ax,[dir_entry+26]
     and   eax,[fatMASK]
     call  change_2dot_cluster
+    cmp   [hd_error],0
+    jne   rename_entry_already_exist
+  rename_not_dir:
+    cmp   [hd_error],0
-  rename_not_dir:
+    jne   rename_entry_already_exist
     mov   eax,[sector_tmp]
     mov   ebx,buffer
+    call  hd_read               ; read source directory sector
+    cmp  [hd_error],0
-    call  hd_read               ; read source directory sector
+    jne  rename_entry_already_exist
+    mov   ebx,[entry_pos]
+    call  delete_entry_name
-    mov   ebx,[entry_pos]
+    cmp   [hd_error],0
-    call  delete_entry_name
+    jne   rename_entry_already_exist
+    popad
     call  update_disk           ; write all of cache and fat to hd
-    popad
+    cmp   [hd_error],0
-    call  update_disk           ; write all of cache and fat to hd
+    jne   rename_entry_already_exist_2
     mov   [hd1_status],0
+    xor   eax,eax
+    ret
     xor   eax,eax
-    ret
+  rename_entry_not_found:
     cmp  [hd_error],0
-  rename_entry_not_found:
+    jne  rename_entry_already_exist
+    popad
+    mov   [hd1_status],0
-    popad
+    mov   eax,ERROR_FILE_NOT_FOUND
-    mov   [hd1_status],0
+    ret
-    mov   eax,ERROR_FILE_NOT_FOUND
+  rename_entry_already_exist_1:
-    ret
+    add   esp,8
   rename_entry_already_exist:
-  rename_entry_already_exist:
+    popad
+  rename_entry_already_exist_2:
+    mov   [hd1_status],0
-    popad
+    mov   eax,ERROR_ACCESS_DENIED
-    mov   [hd1_status],0
+    ret
     mov   eax,ERROR_ACCESS_DENIED
-    ret
+  rename_disk_full:
     imul  eax,[SECTORS_PER_CLUSTER]
     add   eax,[DATA_START]
     mov   ebx,buffer
+    call  hd_read
+    cmp  [hd_error],0
-    call  hd_read
+    jne  not_2dot
     cmp   dword [ebx+32],'..  '
 ;          edx = path
 ;          edi = if 0 - read rootdir else normal dir/file size
 ; output : eax = 0 - ok
 ;                3 - unknown FS
 ;                5 - file not found
+;               10 - access denied
 ;          ebx = file size
 ;-----------------------------------------------------------
     cmp   [fat_type],0
     jnz   get_filesize_fat_ok
     xor   ebx,ebx
     mov   ax,[ebx+26]
     and   eax,[fatMASK]
   get_filesize_dirsize:
+    call  get_dir_size
+    cmp   [hd_error],0
-    call  get_dir_size
+    jne   get_filesize_access_denied
   get_filesize_set_size:
     mov   PUSHAD_EBX,eax
     popad
     mov   [hd1_status],0
     xor   eax,eax
+    ret
-    ret
+  get_filesize_not_found:
     cmp   [hd_error],0
-  get_filesize_not_found:
+    jne   get_filesize_access_denied
     popad
     mov   [hd1_status],0
+    xor   ebx,ebx
+    mov   eax,ERROR_FILE_NOT_FOUND
+    ret
+  get_filesize_access_denied:
+    popad
-    xor   ebx,ebx
+    mov   [hd1_status],0
-    mov   eax,ERROR_FILE_NOT_FOUND
+    xor   ebx,ebx
-    ret
+    mov   eax,ERROR_ACCESS_DENIED
     ret
 get_fileattr:
 ;-----------------------------------------------------------
+; input  : eax = file name
-; input  : eax = file name
+;          edx = path
-;          edx = path
+; output : eax = 0 - ok
-; output : eax = 0 - ok
+;                3 - unknown FS
-;                3 - unknown FS
+;                5 - file not found
-;                5 - file not found
+;               10 - access denied
     mov   [hd1_status],0
     xor   eax,eax
     ret
+  get_fileattr_not_found:
+    cmp   [hd_error],0
-  get_fileattr_not_found:
+    jne   get_fileattr_access_denied
     popad
     mov   [hd1_status],0
     xor   ebx,ebx
     mov   eax,ERROR_FILE_NOT_FOUND
+    ret
+  get_fileattr_access_denied:
+    popad
+    mov   [hd1_status],0
+    xor   ebx,ebx
-    ret
+    mov   eax,ERROR_ACCESS_DENIED
     ret
 get_filedate:
 ;-----------------------------------------------------------
 ; input  : eax = file name
 ;          edx = path
+; output : eax = 0 - ok
-; output : eax = 0 - ok
+;                3 - unknown FS
-;                3 - unknown FS
+;                5 - file not found
-;                5 - file not found
+;               10 - access denied
 ;          ebx = file date/time
 ;                bits 31..25 = year-1980
     mov   [hd1_status],0
     xor   eax,eax
     ret
+  get_filedate_not_found:
+    cmp   [hd_error],0
-  get_filedate_not_found:
+    jne   get_filedate_access_denied
     popad
     mov   [hd1_status],0
     xor   ebx,ebx
     mov   eax,ERROR_FILE_NOT_FOUND
+    ret
+  get_filedate_access_denied:
+    popad
+    mov   [hd1_status],0
+    xor   ebx,ebx
-    ret
+    mov   eax,ERROR_ACCESS_DENIED
     ret
 get_hd_info:
+;-----------------------------------------------------------
-;-----------------------------------------------------------
+; output : eax = 0 - ok
-; output : eax = 0 - ok
+;                3 - unknown FS
-;                3 - unknown FS
+;               10 - access denied
 ;          edx = cluster size in bytes
 ;          ebx = total clusters on disk
     mov   ebx,[LAST_CLUSTER]
   info_cluster:
     push  eax
+    call  get_FAT               ; get cluster info
+    cmp   [hd_error],0
+    jne   info_access_denied
     call  get_FAT               ; get cluster info
     test  eax,eax               ; is it free?
     jnz   info_used             ; no
     inc   ecx
     imul  edx,[SECTORS_PER_CLUSTER],512 ; cluster size in bytes
     mov   [hd1_status],0
     xor   eax,eax
     ret
+  info_access_denied:
+    add   esp,4
+    xor   edx,edx
+    xor   ebx,ebx
+    xor   ecx,ecx
+    mov   eax,ERROR_ACCESS_DENIED
     ret
 update_disk:
 ;-----------------------------------------------------------
 ; write changed fat and cache to disk
 ;-----------------------------------------------------------
     cmp   [fat_change],0        ; is fat changed?
+    je    upd_no_change
-    je    upd_no_change
+    call  write_fat_sector
     cmp   [hd_error],0
+    jne   update_disk_acces_denied
     call  write_fat_sector
   upd_no_change:
   upd_no_change:
     inc   edi
     dec   ecx
     jnz   hdreadcache
+    call  find_empty_slot       ; ret in edi
+    cmp   [hd_error],0
-    call  find_empty_slot       ; ret in edi
     jne   return_01
+    push  eax edx
+    call  wait_for_hd_idle
-    call  wait_for_hd_idle
+    cmp   [hd_error],0
-    push  eax edx
+    jne   hd_read_error
     cli
     xor   eax,eax
     mov   edx,[hdbase]
     inc   edx
-    out   dx,al   ; ATAFeatures ðåãèñòð "îñîáåííîñòåé"
+    out   dx,al   ; ATAFeatures  ¥£ð¡¢  "®¡®¡¥®¡¢¥©"
     inc   edx
     inc   eax
-    out   dx,al   ; ATASectorCount ñ÷åò÷èê ñåêòîðîâ
+    out   dx,al   ; ATASectorCount ¡§¥¢§ðª ¡¥ª¢® ®¢
     inc   edx
     mov   eax,[esp+4]
-    out   dx,al   ; ATASectorNumber ðåãèñòð íîìåðà ñåêòîðà
+    out   dx,al   ; ATASectorNumber  ¥£ð¡¢  ®¬¥   ¡¥ª¢®
     shr   eax,8
     inc   edx
-    out   dx,al   ; ATACylinder íîìåð öèëèíäðà (ìëàäøèé áàéò)
+    out   dx,al   ; ATACylinder ®¬¥  ¦ð«ð¤   (¬« ¤¨ð© ¡ ©¢)
     shr   eax,8
     inc   edx
-    out   dx,al   ; íîìåð öèëèíäðà (ñòàðøèé áàéò)
+    out   dx,al   ; ®¬¥  ¦ð«ð¤   (¡¢  ¨ð© ¡ ©¢)
     shr   eax,8
     inc   edx
     and   al,1+2+4+8
     add   al,byte [hdid]
     add   al,128+64+32
-    out   dx,al   ; íîìåð ãîëîâêè/íîìåð äèñêà
+    out   dx,al   ; ®¬¥  £®«®¢ªð/®¬¥  ¤ð¡ª
     inc   edx
     mov   al,20h
-    out   dx,al   ; ATACommand ðåãèñòð êîìàíä
+    out   dx,al   ; ATACommand  ¥£ð¡¢  ª®¬ ¤
     add   esi,0x600000+65536
     mov   edi,ebx
     mov   ecx,512/4
     cld
     rep   movsd                 ; move data
-; blok_read_2:
+ return_01:
     pop   edi esi ecx
     ret
     ; sector not found in cache
     ; write the block to a new location
+    call  find_empty_slot       ; ret in edi
     cmp   [hd_error],0
-    call  find_empty_slot       ; ret in edi
+    jne   hd_write_access_denied
     add   edi,0x600000+65536
     mov   esi,ebx
     mov   ecx,512/4
     cld
     rep   movsd                 ; move data
+ hd_write_access_denied:
     pop   edi esi ecx
     ret
     jb    danger
     cmp   eax,[PARTITION_END]
     ja    danger
+    call  wait_for_hd_idle
+    cmp   [hd_error],0
-    call  wait_for_hd_idle
+    jne   hd_write_error
     cli
     xor   eax,eax
     add   esi,8
     inc   edi
     dec   ecx
     jnz   write_cache_more
  return_02:
     pop   edi esi edx ecx eax
     ret
     jb    found_slot                    ; it's empty or read
     dec   ecx
     jnz   search_for_empty
+    call  write_cache                   ; no empty slots found, write all
+    cmp   [hd_error],0
+    jne   found_slot_access_denied
     call  write_cache                   ; no empty slots found, write all
     jmp   search_again                  ; and start again
-  found_slot:
+  found_slot:
     mov   [cache_search_start],edi
   found_slot_access_denied:
     push  eax
     mov   eax,[hd_wait_timeout]
     cmp   [timer_ticks], eax ;[0xfdf0],eax
     jg    hd_timeout_error
     pop   eax
+    mov   [hd_error],0
     ret
 iglobal
   hd_timeout_str   db 'K : FS - HD timeout',13,10,0
   hd_read_str      db 'K : FS - HD read error',13,10,0
+  hd_write_str     db 'K : FS - HD write error',13,10,0
-  hd_write_str     db 'K : FS - HD write error',13,10,0
+  hd_lba_str       db 'K : FS - HD LBA error',13,10,0
 endg
 hd_timeout_error:
     call  clear_hd_cache
     call  clear_application_table_status
+    mov   esi,hd_timeout_str
+    call  sys_msg_board_str
-    mov   esi,hd_timeout_str
+;    jmp   $
-    call  sys_msg_board_str
+    mov   [hd_error],1
-    jmp   $
+    pop   eax
     ret
 hd_read_error:
+    call  clear_hd_cache
+    call  clear_application_table_status
-    call  clear_hd_cache
+    mov   esi,hd_read_str
-    call  clear_application_table_status
+    call  sys_msg_board_str
-    mov   esi,hd_read_str
+    pop   edx eax
-    call  sys_msg_board_str
+    jmp    return_01
-    jmp   $
+;    jmp   $
+hd_write_error:
-hd_write_error:
+    call  clear_hd_cache
+    call  clear_application_table_status
+    mov   esi,hd_write_str
+    call  sys_msg_board_str
+    jmp    return_02
 ;    jmp   $
     call  clear_hd_cache
     add   edx,0x7
   wfhil1:
+    call  check_hd_wait_timeout
     cmp   [hd_error],0
-    call  check_hd_wait_timeout
+    jne   @f
+    in    al,dx
+    test  al,128
-    in    al,dx
+    jnz   wfhil1
     test  al,128
+ @@:
     jnz   wfhil1
     pop   edx eax
-    pop   edx eax
+    ret
     call  save_hd_wait_timeout
   hdwait_sbuf:                  ; wait for sector buffer to be ready
+    call  check_hd_wait_timeout
     cmp   [hd_error],0
-    call  check_hd_wait_timeout
+    jne   @f
     cmp   [hd_setup],1          ; do not mark error for setup request
     je    buf_wait_ok
     test  al,1                  ; previous command ended up with an error
+    jz    buf_wait_ok
-    jz    buf_wait_ok
+ @@:
     mov   [hd_error],1
-	mul	ecx
+    mul    ecx
-	add	eax, [DATA_START]
+    add    eax, [DATA_START]
 .new_sector:
-	mov	ebx, buffer
+    mov    ebx, buffer
-	call	hd_read
+    call    hd_read
+    cmp  [hd_error],0
+    jne  .notfound
-	mov	edi, ebx
+    mov    edi, ebx
-	add	ebx, 512
+    add    ebx, 512
-	push	eax
+    push    eax
 .l1:
-	call	fat_get_name
+    call    fat_get_name
-	loop	.new_sector
+    loop    .new_sector
-	cmp	[fat16_root], 0
+    cmp    [fat16_root], 0
-	jnz	.notfound
+    jnz    .notfound
-	mov	eax, [cluster_tmp]
+    mov    eax, [cluster_tmp]
-	call	get_FAT
+    call    get_FAT
+    cmp   [hd_error],0
+    jne   .notfound
-	cmp	eax, 2
+    cmp    eax, 2
-	jb	.notfound
+    jb    .notfound
-	cmp	eax, [fatRESERVED]
+    cmp    eax, [fatRESERVED]
-	jb	.new_cluster
+    jb    .new_cluster
 .notfound:
-	jnz	.read_entry
+    jnz    .read_entry
-	cmp	[fat16_root], 0
+    cmp    [fat16_root], 0
-	jnz	.notfound
+    jnz    .notfound
-	mov	eax, [cluster_tmp]
+    mov    eax, [cluster_tmp]
-	call	get_FAT
+    call    get_FAT
+    cmp   [hd_error],0
+    jne   .notfound
-	cmp	eax, 2
+    cmp    eax, 2
-	jb	.notfound
+    jb    .notfound
-	cmp	eax, [fatRESERVED]
+    cmp    eax, [fatRESERVED]
-	jae	.notfound
+    jae    .notfound
-	dec	eax
+    dec    eax
-	mul	[SECTORS_PER_CLUSTER]
+    mul    [SECTORS_PER_CLUSTER]
-	add	eax, [DATA_START]
+    add    eax, [DATA_START]
 .read_entry:
-	mov	ebx, [buffer]
+    mov    ebx, [buffer]
-	call	hd_read
+    call    hd_read
+    cmp  [hd_error],0
+    jne  .notfound
-	mov	edi, ebx
+    mov    edi, ebx
 .entryfound:
-	cmp	byte [esi], 0
+    cmp    byte [esi], 0
-	jz	.done
+    jz    .done
-	test	byte [edi+11], 10h	; is a directory?
+    test    byte [edi+11], 10h    ; is a directory?
-	push	edi
+    push    edi
-	cmp	byte [esi], 0
+    cmp    byte [esi], 0
-	jnz	@f
+    jnz    @f
 .noaccess:
-	pop	edi
+    pop    edi
+.noaccess_2:
-	or	ebx, -1
+    or    ebx, -1
-	mov	eax, ERROR_ACCESS_DENIED
+    mov    eax, ERROR_ACCESS_DENIED
-	ret
+    ret
+.noaccess_3:
+    add esp,4
+.noaccess_1:
+    add esp,4
+.noaccess_4:
+    add esp,4*5
+    jmp  .noaccess_2
 @@:
-	call	hd_find_lfn
+    call    hd_find_lfn
-	jnc	.found
+    jnc    .found
-	pop	edi
+    pop    edi
+    cmp   [hd_error],0
+    jne   .noaccess_2
-	or	ebx, -1
+    or    ebx, -1
-	mov	eax, ERROR_FILE_NOT_FOUND
+    mov    eax, ERROR_FILE_NOT_FOUND
-	ret
+    ret
 .found:
-	test	byte [edi+11], 0x10	; do not allow read directories
+    test    byte [edi+11], 0x10    ; do not allow read directories
-	jnz	.noaccess
+    jnz    .noaccess
-	test	ebx, ebx
+    test    ebx, ebx
-	jz	.l1
+    jz    .l1
-	jb	.force_buf
+    jb    .force_buf
 ; we may read directly to given buffer
-	push	ebx
+    push    ebx
-	mov	ebx, edx
+    mov    ebx, edx
-	call	hd_read
+    call    hd_read
+    cmp  [hd_error],0
+    jne  .noaccess_1
-	pop	ebx
+    pop    ebx
-	add	edx, 512
+    add    edx, 512
-	sub	ecx, 512
+    sub    ecx, 512
-	sub	dword [esp], 512
+    sub    dword [esp], 512
-	jmp	.skip
+    jmp    .skip
 .force_buf:
 ; we must read sector to temporary buffer and then copy it to destination
-	push	eax ebx
+    push    eax ebx
-	mov	ebx, buffer
+    mov    ebx, buffer
-	call	hd_read
+    call    hd_read
+    cmp  [hd_error],0
+    jne  .noaccess_3
-	mov	eax, ebx
+    mov    eax, ebx
-	pop	ebx
+    pop    ebx
-	add	eax, ebx
+    add    eax, ebx
-	push	ecx
+    push    ecx
-	add	ecx, ebx
+    add    ecx, ebx
-	inc	eax
+    inc    eax
-	dec	edi
+    dec    edi
-	jnz	.new_sector
+    jnz    .new_sector
-	mov	eax, [cluster_tmp]
+    mov    eax, [cluster_tmp]
-	call	get_FAT
+    call    get_FAT
+    cmp   [hd_error],0
+    jne   .noaccess_4
-	jmp	.new_cluster
+    jmp    .new_cluster
 .done:
-	pop	ebx edx ecx ebx edi
+    pop    ebx edx ecx ebx edi
-	xor	eax, eax
+    xor    eax, eax
-	ret
+    ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/fs/fat32.inc – Rev 71 → 74