Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6437 → Rev 6436

/programs/network/ftpc/parser.inc
29,10 → 29,8
.user:
lodsb
cmp al, 0
jne @f
mov eax, str_err_params
jmp error
@@: stosb
je .error
stosb
cmp byte [esi], ':'
jne .user
mov word [edi], 0x0a0d
46,10 → 44,8
.pass:
lodsb
cmp al, 0
jne @f
mov eax, str_err_params
jmp error
@@: stosb
je .error
stosb
cmp byte [esi], '@'
jne .pass
mov word [edi], 0x0a0d
61,10 → 57,8
.addr:
lodsb
cmp al, 0
jne @f
mov eax, str_err_params
jmp error
@@: stosb
je .error
stosb
cmp byte [esi], ':'
jne .addr
mov byte [edi], 0
77,24 → 71,18
.port:
lodsb
cmp al, 0
jne @f
mov eax, str_err_params
jmp error
@@: cmp al, '/'
jbe .port_done
je .error
cmp al, '/'
jbe @f
sub al, '0'
jnb @f
mov eax, str_err_host
jmp error
@@: cmp al, 9
jna @f
mov eax, str_err_host
jmp error
@@: lea ebx, [ebx*4 + ebx]
jb error_hostname
cmp al, 9
ja error_hostname
lea ebx, [ebx*4 + ebx]
shl ebx, 1
add ebx, eax
jmp .port
.port_done:
@@: ; port done
xchg bl, bh
mov [sockaddr1.port], bx
 
124,3 → 112,5
 
jmp no_resolve.done
 
.error:
jmp main ; parameter resolution failed. get input from user
/programs/network/ftpc/servercommands.inc
84,10 → 84,8
 
mcall socket, AF_INET4, SOCK_STREAM, 0
cmp eax, -1
jne @f
mov eax, str_err_socket
jmp error
@@: mov [datasocket], eax
je error_socket
mov [datasocket], eax
 
mov esi, edi
call ascii_dec
107,10 → 105,8
invoke con_write_asciiz, str_open
mcall connect, [datasocket], sockaddr2, 18
cmp eax, -1
jne @f
mov eax, str_err_connect
jmp error
@@: jmp wait_for_servercommand
je error_socket
jmp wait_for_servercommand
 
.fail:
invoke con_write_asciiz, str_unknown