2009-06-12 13:30 UTC+0300 Alexander Kresin <alex at belacy.belgorod.su>

* utils/hbformat/hbformat.prg
    ! EOL handling fixed
  * utils/hbformat/hbformac.c
    * EOF dropped now

harbour/ChangeLog

@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-12 13:30 UTC+0300 Alexander Kresin <alex at belacy.belgorod.su>
+  * utils/hbformat/hbformat.prg
+    ! EOL handling fixed
+  * utils/hbformat/hbformac.c
+    * EOF dropped now
+
 2009-06-12 11:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to autodetect special *nix dir layout in case

harbour/utils/hbformat/hbformac.c

@@ -76,6 +76,11 @@ HB_FUNC( RF_FILEREAD )
          }
          ulLines ++;
       }
+      else if( (unsigned int)(*ptr) < 9 )
+      {
+         hb_ret();
+         return;
+      }
       ptr ++;
    }
    ptr --;
@@ -102,7 +107,11 @@ HB_FUNC( RF_FILEREAD )
    }
 
    if( ul == ulLines )
+   {
+      if( *(ptr-1) == 0x1A )
+         ptr --;
       hb_arraySetCL( arr, ul, ptr1, ptr - ptr1 );
+   }
 
    hb_itemReturnRelease( arr );
 }

harbour/utils/hbformat/hbformat.prg

@@ -926,7 +926,7 @@ METHOD File2Array( cFileName ) CLASS CODEFORMAT
 
    IF hb_FileExists( cFileName )
       aFile := rf_FileRead( MemoRead( cFileName ), @cEol )
-      IF ::nEol <= 0
+      IF ::nEol < 0
          ::cEol := cEol
       ENDIF
    ENDIF