WebSVN – Kolibri OS – Path Comparison – / – /kernel/trunk/fs/parse_fn.inc Rev 520 and /kernel/trunk/fs/parse

Regard whitespace Rev 520 → Rev 521

 /kernel/trunk/fs/parse_fn.inc
 ,210 → 7,194
 ;
 ;-------------------------------------------------------------------------
-full_file_name_table dd 0               ; ãª § â¥«ì   ¯ ¬ïâì ¤«ï â ¡«¨æë ¯ãâ¥© 4   § ¯¨áì 64 (32 - áâà®ª  è ¡«® ¤«ï ¯®¨áª , 32 - áâà®ª  è ¡«® ¤«ï § ¬¥ë)
+iglobal
+; pointer to memory for path replace table,
+; size of one record is 128 bytes: 64 bytes for search pattern + 64 bytes for replace string
-; ¯¥à¥¡¨à ¥â ¯® ä ©«ã ¢ à¨ âë § ¬¥
-proc full_file_name stdcall,sourc,dest
-locals
-  tmpsrc rb 260  ; ¢à¥¬¥®¥ åà ¥¨¥ ¯à¥®¡à §®¢ ¨ï
-endl
-  pushad
-  mov esi,[sourc]
-  lea edi, [tmpsrc]
+; start with one entry: %sys% -> <sysdir>
+full_file_name_table dd sysdir_name
+.size           dd      1
-@@:
-  lodsb
-  stosb
-  or al,al
-  jnz @b
+tmp_file_name_size dd   1
+endg
-  mov al,[conf_file_loaded]                                     ; âà¥¡ã¥âáï ¯à¨ ®¡à é¥¨¨ ª ¯¥à¢®¬ã ä ©«ã (ª®ä¨£ã)
-  or al,al
-  jnz @use_replace
+uglobal
+; Parser_params will initialize: sysdir_name = "%sys%", sysdir_path = <sysdir>
+sysdir_name     rb      64
+sysdir_path     rb      64
+tmp_file_name_table dd  ?
+endg
-  jmp full_file_name_exit
-;--------------------------------
- @use_replace:
-  xor eax,eax
-.loop:
-  push eax
-  imul eax,eax,64
-  add eax,[full_file_name_table]
-  mov ebx,eax
-  add eax,32
-  mov cl,[ebx]
-  or cl,cl
-  jz .done
-  lea ecx, [tmpsrc]
-  mov edx,[dest]
-  stdcall full_file_name_parse, ecx,edx,ebx,eax
-  mov esi,[dest]
-  lea edi, [tmpsrc]
+; ¡¥à¥â ¯ à ¬¥âàë bx_from_load ¨ ¨¨æ¨ «¨§¨àã¥â § ¬¥ã ¤«ï %sys%
+Parser_params:
+  mov eax,[OS_BASE+0x10000+bx_from_load]
+  mov ecx,sysdir_path
+  mov [ecx-64],dword '%sys'
+  mov [ecx-64+4],word '%'
+  cmp al,'r' ; à ¬ ¤¨áª
+  jnz @f
+  mov [ecx],dword 'RD/?'
+  mov [ecx+3],byte ah
+  mov [ecx+4],byte 0
+  ret
 @@:
-  lodsb
-  stosb
-  or al,al
-  jnz @b
+  sub al,49
+  mov [ecx],dword 'HD?/'
+  mov [ecx+2],byte al
+  mov [ecx+4],byte ah
+  mov [ecx+5],dword '/KOL'
+  mov [ecx+9],dword 'IBRI'
+  mov [ecx+13],byte 0
+  ret
-  pop eax
-  inc eax
-  jmp .loop
+proc load_file_parse_table
+  stdcall kernel_alloc,0x1000
+  mov [tmp_file_name_table],eax
+  mov edi,eax
+  mov esi,sysdir_name
+  mov ecx,128/4
+  rep movsd
-.done:
-  pop eax
-full_file_name_exit:
+  invoke ini.enum_keys,conf_fname,conf_path_sect,get_every_key
-  lea eax, [tmpsrc]
-  stdcall full_file_name_parse , eax , [dest], sysdir_ , sys_path
-  popad
+  mov eax,[tmp_file_name_table]
+  mov [full_file_name_table],eax
+  mov eax,[tmp_file_name_size]
+  mov [full_file_name_table.size],eax
   ret
 endp
-;
-;  à¥®¡à §®¢ âì ¨¬ï ¢ ¯®«®¥. á«¨ ¢  ç «¥ áâ®¨â
-;     sourc - ááë«ª    áâà®ªã...
-;         dest - ááë«ª    ¡ãä¥à ªã¤  à¥§ã«ìâ â «®¦¨âì
-;         def - áâà®ª  è ¡«® ¤«ï ¯®¨áª
-;         dval - ª ç¥¬ã ¯à¨à ¢¨¢ âì è ¡«®
-proc full_file_name_parse stdcall,sourc,dest,def,dval
-  ; ¤«ï ®¤®£®
-  pushad
+uglobal
+def_val_1 db 0
+endg
-  mov eax,[sourc]
-  mov ebx,[def]
+proc get_every_key stdcall, f_name, sec_name, key_name
+        mov     esi, [key_name]
+        mov     ecx, esi
+        cmp     byte [esi], '/'
+        jnz     @f
+        inc     esi
 @@:
-  mov dl,[ebx]
-  mov cl,[eax]
-  cmp cl,0
-  je  @@bad_s
-  cmp dl,0
-  je  @@good
-  or cl,0x20
-  or dl,0x20
-  cmp cl,dl
-  jne  @@bad
-  inc eax
-  inc ebx
+        mov     edi, [tmp_file_name_size]
+        shl     edi, 7
+        cmp     edi, 0x1000
+        jae     .stop_parse
+        add     edi, [tmp_file_name_table]
+        lea     ebx, [edi+64]
+@@:
+        cmp     edi, ebx
+        jae     .skip_this_key
+        lodsb
+        test    al, al
+        jz      @f
+        or      al, 20h
+        stosb
   jmp @b
+@@:
+        stosb
-@@bad_s:
-  cmp dl,0
-  je  @@good
+        invoke  ini.get_str, [f_name],[sec_name],ecx,ebx,64,def_val_1
-@@bad:
-  mov edi,[dest]
-  mov esi,[sourc]
+        cmp     byte [ebx], '/'
+        jnz     @f
+        lea     esi, [ebx+1]
+        mov     edi, ebx
+        mov     ecx, 63
+        rep     movsb
 @@:
+        push    ebp
+        mov     ebp, [tmp_file_name_table]
+        mov     ecx, [tmp_file_name_size]
+        jecxz   .noreplace
+        mov     eax, ecx
+        dec     eax
+        shl     eax, 7
+        add     ebp, eax
+.replace_loop:
+        mov     edi, ebx
+        mov     esi, ebp
+@@:
   lodsb
-  stosb
-  or al,al
-  jnz   @b
-  jmp @@ret_ok
+        test    al, al
+        jz      .doreplace
+        mov     dl, [edi]
+        inc     edi
+        test    dl, dl
+        jz      .replace_loop_cont
+        or      dl, 20h
+        cmp     al, dl
+        jz      @b
+        jmp     .replace_loop_cont
+.doreplace:
+        cmp     byte [edi], 0
+        jz      @f
+        cmp     byte [edi], '/'
+        jnz     .replace_loop_cont
+@@:
+        lea     esi, [ebp+64]
+        call    .replace
+        jc      .skip_this_key2
+.replace_loop_cont:
+        sub     ebp, 128
+        loop    .replace_loop
+.noreplace:
+        pop     ebp
-@@good:
-  push eax
-  mov edi,[dest]
-  mov esi,[dval]
+        inc     [tmp_file_name_size]
+.skip_this_key:
+        xor     eax, eax
+        inc     eax
+        ret
+.skip_this_key2:
+        pop     ebp
+        jmp     .skip_this_key
+.stop_parse:
+        xor     eax, eax
+        ret
+endp
+proc get_every_key.replace
+; in: ebx->destination, esi->first part of name, edi->second part of name
+; maximum length is 64 bytes
+; out: CF=1 <=> overflow
+; 1) allocate temporary buffer in stack
+        sub     esp, 64
+; 2) save second part of name to temporary buffer
+        push    esi
+        lea     esi, [esp+4]    ; esi->tmp buffer
+        xchg    esi, edi        ; edi->tmp buffer, esi->source
 @@:
   lodsb
   stosb
-  or al,al
+        test    al, al
   jnz   @b
-@@goodl:
+; 3) copy first part of name to destination
   pop esi
-  dec edi
+        mov     edi, ebx
 @@:
   lodsb
+        test    al, al
+        jz      @f
   stosb
-  or al,al
-  jnz   @b
-@@ret_ok:
-  popad
-  ret
-endp
- sys_dir_mess: db 'System dir is '
- sys_path: db '/HD0/1/KOLIBRI',0,0
- sysdir_ db '%sys%',0
-; ¡¥à¥â ¯ à ¬¥âàë bx_from_load ¨ ¨áç¨â ä ©« ª®ä¨£ãà æ¨¨
-Parser_params:
-  pushad
-  mov ax,[OS_BASE+0x10000+bx_from_load]
-  cmp al,'r' ; à ¬ ¤¨áª
-  jnz @f
-  mov [sys_path],dword '/RD/'
-  mov [sys_path+4],byte ah
-  mov [sys_path+5],word 0 ;0x002F
-  jmp .done
+        jmp     @b
 @@:
-  sub al,49
-  mov [sys_path],dword '/HDa'
-  mov [sys_path+3],byte al
-  mov [sys_path+4],byte '/'
-  mov [sys_path+5],byte ah
-  mov [sys_path+6],dword '/KOL'
-  mov [sys_path+10],dword 'IBRI'
-  mov [sys_path+14],word 0 ;0x002F
-.done:
-  popad
-  ret
-proc load_file_parse_table
-  pushad
-  stdcall kernel_alloc,0x1000
-  mov [full_file_name_table],eax
-  invoke ini.enum_keys,conf_fname,conf_path_sect,get_every_key
-  mov eax,[loading_counter]
-  imul eax,eax,64
-  add eax,[full_file_name_table]
-  mov [eax],byte 0
-  popad
-  ret
-endp
-loading_counter dd 0
-def_val_1 db 0
-proc get_every_key stdcall,f_name, sec_name, key_name
-  pushad
-  mov esi,[key_name]
-  mov edi,[loading_counter]
-  imul edi,edi,64
-  add edi,[full_file_name_table]
+; 4) restore second part of name from temporary buffer to destination
+; (may cause overflow)
+        lea     edx, [ebx+64]   ; limit of destination
+        mov     esi, esp
 @@:
+        cmp     edi, edx
+        jae     .overflow
   lodsb
   stosb
-  or al,al
+        test    al, al
   jnz   @b
-  mov eax,[loading_counter]
-  imul eax,eax,64
-  add eax,[full_file_name_table]
-  add eax,32
-  mov ebx,[key_name]
-  invoke ini.get_str,conf_fname,conf_path_sect,ebx,eax,32,def_val_1
-  inc dword [loading_counter]
-  popad
-  mov eax,1
+; all is OK
+        add     esp, 64         ; CF is cleared
   ret
+.overflow:
+; name is too long
+        add     esp, 64
+        stc
+        ret
 endp

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 520 → Rev 521