From 6dfcbb3d54160cb29d957a8664fc5d3b47dc7c78 Mon Sep 17 00:00:00 2001
From: hidnplayr <hidnplayr@kolibrios.org>
Date: Tue, 9 Jul 2013 21:14:47 +0000
Subject: [PATCH] FTPc: receive all data from server, larger screen buffer.

git-svn-id: svn://kolibrios.org@3792 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/network/ftpc/ftpc.asm           |  4 ++--
 programs/network/ftpc/servercommands.inc | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/programs/network/ftpc/ftpc.asm b/programs/network/ftpc/ftpc.asm
index 3fe2bb9f3f..b99ff7f000 100644
--- a/programs/network/ftpc/ftpc.asm
+++ b/programs/network/ftpc/ftpc.asm
@@ -51,7 +51,7 @@ start:
         jnz     exit
 ; initialize console
         invoke  con_start, 1
-        invoke  con_init, 80, 25, 80, 25, title
+        invoke  con_init, 80, 25, 80, 250, title
 
 ; Check for parameters
         cmp     byte [s], 0
@@ -278,7 +278,7 @@ exit:
 
 ; data
 title   db 'FTP client',0
-str1    db 'FTP client for KolibriOS v0.02',10,10,'Please enter ftp server address.',10,0
+str1    db 'FTP client for KolibriOS v0.03',10,10,'Please enter ftp server address.',10,0
 str2    db '> ',0
 str3    db 'Resolving ',0
 str4    db 10,0
diff --git a/programs/network/ftpc/servercommands.inc b/programs/network/ftpc/servercommands.inc
index d12f87922e..40e1f727d7 100644
--- a/programs/network/ftpc/servercommands.inc
+++ b/programs/network/ftpc/servercommands.inc
@@ -90,15 +90,15 @@ pasv_ok:
 
 data_ok:
 
-        mcall   recv, [datasocket], buffer_ptr2, BUFFERSIZE, MSG_DONTWAIT
-        inc     eax
-        jz      .fail
-        dec     eax
-        jz      .fail
+        mcall   recv, [datasocket], buffer_ptr2, BUFFERSIZE, 0
+        test    ebx, ebx
+        jnz     .fail
         mov     byte[buffer_ptr2 + eax], 0
 
         invoke  con_write_asciiz, buffer_ptr2
 
+        jmp     data_ok
+
   .fail:
         mcall   close, [datasocket]
         jmp     wait_for_servercommand