From b04066c3887895c873cb755c416bc80ba319f1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Tue, 4 Mar 2014 18:15:39 +0100
Subject: [PATCH] 2014-03-04 18:15 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * src/debug/debugger.prg     * minor cleanup

  * src/rtl/copyfile.c
    ! fixed RTE after recent modification (#55)
---
 ChangeLog.txt          |  7 +++++++
 src/debug/debugger.prg |  3 ++-
 src/rtl/copyfile.c     | 11 +++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 12a2ef2ca1..210ed2e742 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-03-04 18:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/debug/debugger.prg
+    * minor cleanup
+
+  * src/rtl/copyfile.c
+    ! fixed RTE after recent modification (#55)
+
 2014-03-04 04:30 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/compiler/gencc.c
     ! pacified CLANG warning in -gc3 output (issue: #53)
diff --git a/src/debug/debugger.prg b/src/debug/debugger.prg
index 079f897748..b1e374c4cd 100644
--- a/src/debug/debugger.prg
+++ b/src/debug/debugger.prg
@@ -804,7 +804,8 @@ METHOD CommandWindowDisplay( cLine, lCmd ) CLASS HBDebugger
    n := Len( ::aHistCommands )
    nRow := ::oWndCommand:nBottom
    nSize := ::oWndCommand:nRight - ::oWndCommand:nLeft - 1
-   hb_DispOutAt( --nRow, ::oWndCommand:nLeft + 1, "> ", __dbgColors()[ 2 ] )
+   hb_DispOutAt( --nRow, ::oWndCommand:nLeft + 1, PadR( "> ", nSize ), ;
+                 __dbgColors()[ 2 ] )
    DO WHILE --nRow > ::oWndCommand:nTop
       hb_DispOutAt( nRow, ::oWndCommand:nLeft + 1, ;
                     PadR( iif( n > 0, ::aHistCommands[ n-- ], "" ), nSize ), ;
diff --git a/src/rtl/copyfile.c b/src/rtl/copyfile.c
index 3fe30c4ec5..ac3d5fe12f 100644
--- a/src/rtl/copyfile.c
+++ b/src/rtl/copyfile.c
@@ -119,11 +119,14 @@ static HB_BOOL hb_copyfile( const char * pszSource, const char * pszDest )
             while( nWritten < nRead )
             {
                nWritten += hb_fileWrite( pDest, buffer + nWritten, nRead - nWritten, -1 );
-               pError = hb_errRT_FileError( pError, NULL, EG_WRITE, 2016, pszDest );
-               if( hb_errLaunch( pError ) != E_RETRY )
+               if( nWritten < nRead )
                {
-                  bRetVal = HB_FALSE;
-                  break;
+                  pError = hb_errRT_FileError( pError, NULL, EG_WRITE, 2016, pszDest );
+                  if( hb_errLaunch( pError ) != E_RETRY )
+                  {
+                     bRetVal = HB_FALSE;
+                     break;
+                  }
                }
             }
          }