2003-08-23 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* apps/utils/stats/stats.c (ReadLine): Handle unix end-of-line characters.

svn path=/trunk/; revision=5796

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 29b8be3..80fd554 100644 (file)
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-23  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+       * apps/utils/stats/stats.c (ReadLine): Handle unix end-of-line characters.
+
 2003-08-23  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * apps/tests/Makefile (TEST_APPS): Remove patblt and stretchblt

diff --git a/reactos/apps/utils/stats/stats.c b/reactos/apps/utils/stats/stats.c
index 4566964..e60af40 100644 (file)
--- a/reactos/apps/utils/stats/stats.c
+++ b/reactos/apps/utils/stats/stats.c
@@ -229,8 +229,8 @@ ReadLine()
     return FALSE;
 
   i = 0;
-  while (((j = CurrentOffset + i) < FileBufferSize) && (i < sizeof (Line)) &&
-    ((ch = FileBuffer[j]) != 0x0D))
+  while ((((j = CurrentOffset + i) < FileBufferSize) && (i < sizeof (Line)) &&
+    ((ch = FileBuffer[j]) != 0x0D && (ch = FileBuffer[j]) != 0x0A)))
   {
     Line[i] = ch;
     i++;
@@ -239,7 +239,7 @@ ReadLine()
   Line[i]    = '\0';
   LineLength = i;
   
-  if (FileBuffer[CurrentOffset + i + 1] == 0x0A)
+  if ((FileBuffer[CurrentOffset + i] == 0x0D) && (FileBuffer[CurrentOffset + i + 1] == 0x0A))
     CurrentOffset++;
 
   CurrentOffset += i + 1;