X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=eee125662b324b39eed5af25afe6b69695a5d457;hb=b1fc26afebd4d557ff89a44bc21767a8704c3809;hp=d3e58592f1c7eab5c1d0ac0bc0ec5f36b08d7a72;hpb=393020b6e48719d27699dea6b29e53025bbd5123;p=pdclib

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index d3e5859..eee1256 100644
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fwrite( const void *, size_t, size_t, FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -7,10 +5,11 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
 
+#include <_PDCLIB_glue.h>
+
 #include <stdbool.h>
 #include <string.h>
 
@@ -21,18 +20,18 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
         return 0;
     }
     _PDCLIB_size_t offset = 0;
-    bool lineend = false;
+    /* TODO: lineend */
+    /* bool lineend = false; */
     size_t nmemb_i;
     for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i )
     {
         for ( size_t size_i = 0; size_i < size; ++size_i )
         {
-            /* TODO: Should line-buffered streams be flushed on '\n' or system EOL? */
-            if ( ( stream->buffer[ stream->bufidx++ ] == ((char*)ptr)[ nmemb_i * size + size_i ] ) == '\n' )
+            if ( ( stream->buffer[ stream->bufidx++ ] = ((char*)ptr)[ nmemb_i * size + size_i ] ) == '\n' )
             {
                 /* Remember last newline, in case we have to do a partial line-buffered flush */
                 offset = stream->bufidx;
-                lineend = true;
+                /* lineend = true; */
             }
             if ( stream->bufidx == stream->bufsize )
             {
@@ -41,7 +40,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
                     /* Returning number of objects completely buffered */
                     return nmemb_i;
                 }
-                lineend = false;
+                /* lineend = false; */
             }
         }
     }
@@ -87,13 +86,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
 
 int main( void )
 {
-    FILE * fh;
-    remove( "testfile" );
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( fwrite( "SUCCESS testing fwrite()\n", 1, 25, fh ) == 25 );
-    TESTCASE( fclose( fh ) == 0 );
-    /* TODO: Add readback test. */
-    TESTCASE( remove( "testfile" ) == 0 );
+    /* Testing covered by fread(). */
     return TEST_RESULTS;
 }