Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6394 → Rev 6393

/programs/network/ftpc/parser.inc
File deleted
\ No newline at end of file
/programs/network/ftpc/ftpc.asm
48,7 → 48,6
 
include 'usercommands.inc'
include 'servercommands.inc'
include 'parser.inc'
 
start:
; initialize heap for using dynamic blocks
123,7 → 122,7
invoke con_set_flags, 0x07
invoke con_write_asciiz, str_newline
 
no_resolve:
resolve:
mov [sockaddr1.port], 21 shl 8
 
; delete terminating '\n'
342,54 → 341,24
 
.connected:
; request username
cmp [use_params], 1
je .copy_user
 
invoke con_write_asciiz, str_user
mov dword[buf_cmd], "USER"
mov byte[buf_cmd+4], " "
jmp .send
 
.copy_user:
; copy user name to buf_cmd
mov edi, buf_cmd
mov esi, param_user
@@:
lodsb
stosb
cmp byte [esi-1], 0
jne @b
jmp .send
 
.needpass:
; request password
cmp [use_params], 1
je .copy_password
 
invoke con_write_asciiz, str_pass
mov dword[buf_cmd], "PASS"
mov byte[buf_cmd+4], " "
invoke con_set_flags, 0x00 ; black text on black background for password
jmp .send
 
.copy_password:
; copy password to buf_cmd
mov edi, buf_cmd
mov esi, param_password
@@:
lodsb
stosb
cmp byte [esi-1], 0
jne @b
 
.send:
; read string
cmp [use_params], 1
je @f
mov esi, buf_cmd+5
invoke con_gets, esi, 256
 
@@:
; find end of string
mov edi, buf_cmd+5
mov ecx, 256
578,8 → 547,6
db 10
db 'Please enter ftp server address.',10,0
 
str_ftp db 'ftp://',0
 
str_prompt db '> ',0
str_resolve db 'Resolving ',0
str_newline db 10,0
713,10 → 680,4
 
path rb 1024
 
use_params db 0
param_user rb 1024
param_password rb 1024
param_server_addr rb 1024
param_path rb 1024
 
mem:
/programs/network/ftpc/servercommands.inc
33,7 → 33,6
je welcome
 
cmp dword[buf_cmd], "530 " ; password incorrect
mov [use_params], 0
je welcome
 
cmp dword[buf_cmd], "550 "
59,20 → 58,8
login_ok:
 
mov [status], STATUS_LOGGED_IN
cmp [use_params], 0
je wait_for_usercommand
jmp wait_for_usercommand
 
cmp [param_path+4], 0
je wait_for_usercommand
; copy path to buf_cmd and execute CWD
mov edi, buf_cmd
mov esi, param_path
@@:
lodsb
stosb
cmp byte[esi-1], 0
jne @b
jmp cmd_cwd
 
pasv_ok: