From a60f033fd1e11b67c7d2b581069d0d9b50bf6eab Mon Sep 17 00:00:00 2001 From: hidnplayr Date: Thu, 3 Oct 2013 18:43:25 +0000 Subject: [PATCH] FTP client: print some more text to the user. git-svn-id: svn://kolibrios.org@3967 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/network/ftpc/ftpc.asm | 2 ++ programs/network/ftpc/servercommands.inc | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/network/ftpc/ftpc.asm b/programs/network/ftpc/ftpc.asm index 066d0f904e..72161655c9 100644 --- a/programs/network/ftpc/ftpc.asm +++ b/programs/network/ftpc/ftpc.asm @@ -348,6 +348,8 @@ str_unknown db "Unknown command or insufficient parameters - type help for m str_lcwd db "Local working directory is now: ",0 str_open db "opening data socket",10,0 +str_close db "closing data socket",10,0 +str2b db '.',0 str_help db "available commands:",10 db 10 diff --git a/programs/network/ftpc/servercommands.inc b/programs/network/ftpc/servercommands.inc index 03ab7836ab..cf135a91f6 100644 --- a/programs/network/ftpc/servercommands.inc +++ b/programs/network/ftpc/servercommands.inc @@ -12,7 +12,7 @@ server_parser: je welcome ; cmp dword[s], "226 " -; je list_ok +; je transfer_ok cmp dword[s], "227 " je pasv_ok @@ -100,6 +100,8 @@ pasv_ok: data_ok: + invoke con_write_asciiz, str2b + cmp [operation], OPERATION_STOR je .stor @@ -143,12 +145,14 @@ data_ok: mcall send, [datasocket], buffer_ptr2, , 0 .done: + invoke con_write_asciiz, str_close mcall close, [datasocket] jmp wait_for_servercommand close_datacon: + invoke con_write_asciiz, str_close mcall close, [datasocket] jmp wait_for_usercommand