KolibriOS/umka
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update unicode fs test, increase read buffer, clean macros.

Browse Source
This commit is contained in:
Ivan B
2020-02-29 04:04:32 +03:00
parent f10976c16a
commit 349800ca54
4 changed files with 173 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.ref.log
View File

@@ -74,4 +74,142 @@ d0bfd180d0b8d0b2d0b5d182e29da6d0bcd0b8d1800a
status = 0 success, count = 26 status = 0 success, count = 26
d0bfd180d0b8d0b2d0b5d182e29da6f09f9297d0bcd0b8d1800a d0bfd180d0b8d0b2d0b5d182e29da6f09f9297d0bcd0b8d1800a
/> ls70 /hd0/1/ -e utf8
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f dir0
----f дир❦
----f ❦❦❦
----f дир3
/> ls70 /hd0/1/ -e utf16
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f d
----f 48@f'
----f f'f'f'
----f 48@3
/> ls70 /hd0/1/ -e cp866
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f dir0
----f <20><><EFBFBD>_
----f ___
----f <20><><EFBFBD>3
/> ls70 /hd0/1/ -e default
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f d
----f 48@f'
----f f'f'f'
----f 48@3
/> ls70 /hd0/1/❦❦❦/ -e utf8
status = 5 file_not_found
/> ls70 /hd0/1/❦❦❦/ -e utf16
status = 5 file_not_found
/> ls70 /hd0/1/❦❦❦/ -e cp866
status = 5 file_not_found
/> ls70 /hd0/1/❦❦❦/ -e default
status = 5 file_not_found
/> ls70 /hd0/1/дир3/ -e utf8
status = 5 file_not_found
/> ls70 /hd0/1/дир3/ -e utf16
status = 5 file_not_found
/> ls70 /hd0/1/дир3/ -e cp866
status = 5 file_not_found
/> ls70 /hd0/1/дир3/ -e default
status = 5 file_not_found
/> ls80 /hd0/1/ -e utf8
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f dir0
----f дир❦
----f ❦❦❦
----f дир3
/> ls80 /hd0/1/ -e utf16
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f d
----f 48@f'
----f f'f'f'
----f 48@3
/> ls80 /hd0/1/ -e cp866
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f dir0
----f <20><><EFBFBD>_
----f ___
----f <20><><EFBFBD>3
/> ls80 /hd0/1/ -e default
status = 6 end_of_file, count = 6
total = 6
----f .
----f ..
----f d
----f 48@f'
----f f'f'f'
----f 48@3
/> ls80 /hd0/1/❦❦❦/ -e utf8
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----f д❦р22
/> ls80 /hd0/1/❦❦❦/ -e utf16
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----f 4f'@2
/> ls80 /hd0/1/❦❦❦/ -e cp866
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----f <20>_<EFBFBD>22
/> ls80 /hd0/1/❦❦❦/ -e default
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----f 4f'@2
/> ls80 /hd0/1/дир3/ -e utf8
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----- файл33
/> ls80 /hd0/1/дир3/ -e utf16
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----- D09;3
/> ls80 /hd0/1/дир3/ -e cp866
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----- 䠩<>33
/> ls80 /hd0/1/дир3/ -e default
status = 6 end_of_file, count = 3
total = 3
----f .
----f ..
----- D09;3
/> disk_del hd0 /> disk_del hd0

26
test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.t
View File

@@ -24,4 +24,30 @@ read80 /hd0/1/dir0/file00/ 0 100 -b
read80 /hd0/1/❦❦❦/д❦р22/❦❦ 0 100 -b read80 /hd0/1/❦❦❦/д❦р22/❦❦ 0 100 -b
read80 /hd0/1/дир3/файл33 0 100 -b read80 /hd0/1/дир3/файл33 0 100 -b
ls70 /hd0/1/ -e utf8
ls70 /hd0/1/ -e utf16
ls70 /hd0/1/ -e cp866
ls70 /hd0/1/ -e default
ls70 /hd0/1/❦❦❦/ -e utf8
ls70 /hd0/1/❦❦❦/ -e utf16
ls70 /hd0/1/❦❦❦/ -e cp866
ls70 /hd0/1/❦❦❦/ -e default
ls70 /hd0/1/дир3/ -e utf8
ls70 /hd0/1/дир3/ -e utf16
ls70 /hd0/1/дир3/ -e cp866
ls70 /hd0/1/дир3/ -e default
ls80 /hd0/1/ -e utf8
ls80 /hd0/1/ -e utf16
ls80 /hd0/1/ -e cp866
ls80 /hd0/1/ -e default
ls80 /hd0/1/❦❦❦/ -e utf8
ls80 /hd0/1/❦❦❦/ -e utf16
ls80 /hd0/1/❦❦❦/ -e cp866
ls80 /hd0/1/❦❦❦/ -e default
ls80 /hd0/1/дир3/ -e utf8
ls80 /hd0/1/дир3/ -e utf16
ls80 /hd0/1/дир3/ -e cp866
ls80 /hd0/1/дир3/ -e default
disk_del hd0 disk_del hd0

18
umka.asm
View File

@@ -340,17 +340,15 @@ map_memEx:
ret 20 ret 20
macro include_ x { HEAP_BASE equ
inclu#de `x include 'init.inc'
} sys_msg_board equ __pew
include fix pew include fix pew
macro pew x {} macro pew x {}
macro pew x {inclu#de `x}
macro org x {} macro org x {}
macro format [x] {} macro format [x] {}
HEAP_BASE equ
include_ 'init.inc'
sys_msg_board equ __pew
macro lea r, v { macro lea r, v {
if v eq [(ecx-(CURRENT_TASK and 1FFFFFFFh)-TASKDATA.state)*8+SLOT_BASE] if v eq [(ecx-(CURRENT_TASK and 1FFFFFFFh)-TASKDATA.state)*8+SLOT_BASE]
@@ -370,10 +368,10 @@ macro add r, v {
end if end if
} }
include_ 'kernel.asm' include 'kernel.asm'
purge lea,add,org,pew purge lea,add,org
restore lea,add,org,pew restore lea,add,org
purge sys_msg_board,HEAP_BASE purge sys_msg_board,HEAP_BASE
coverage_end: coverage_end:
@@ -428,4 +426,4 @@ BUTTON_INFO rb 64*1024
BUTTON_INFO equ BUTTON_INFO equ
endg endg
include_ 'data32.inc' include 'data32.inc'

2
umka_shell.c
View File

@@ -41,7 +41,7 @@
#define MAX_COMMAND_ARGS 42 #define MAX_COMMAND_ARGS 42
#define PRINT_BYTES_PER_LINE 32 #define PRINT_BYTES_PER_LINE 32
#define MAX_DIRENTS_TO_READ 100 #define MAX_DIRENTS_TO_READ 100
#define MAX_BYTES_TO_READ (16*1024) #define MAX_BYTES_TO_READ (1024*1024)
#define DEFAULT_READDIR_ENCODING UTF8 #define DEFAULT_READDIR_ENCODING UTF8
#define DEFAULT_PATH_ENCODING UTF8 #define DEFAULT_PATH_ENCODING UTF8