X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=c9396bf6751fcf6df33fd3f0e73095f2a8b8ae5f;hb=b5b6c4a890795ea76f9b92b817b0a83c6bb4862c;hp=4eabd22943db112e85f8cc07f2cf1ff83b909a72;hpb=f0c4a925a835e6efd444b2de5406219551dc65d4;p=pdclib.old

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 4eabd22..c9396bf 100644
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -7,21 +7,26 @@
 */
 
 #include <stdio.h>
-#include <_PDCLIB_glue.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
+#include <_PDCLIB_glue.h>
 
 #include <stdbool.h>
 #include <string.h>
 
-size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+//TODO OS(2012-08-01): Ascertain purpose of lineend & potentially remove
+
+size_t _PDCLIB_fwrite_unlocked( const void * _PDCLIB_restrict ptr, 
+               size_t size, size_t nmemb, 
+               FILE * _PDCLIB_restrict stream )
 {
     if ( _PDCLIB_prepwrite( stream ) == EOF )
     {
         return 0;
     }
     _PDCLIB_size_t offset = 0;
-    bool lineend = false;
+    //bool lineend = false;
     size_t nmemb_i;
     for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i )
     {
@@ -31,7 +36,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
             {
                 /* 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 )
             {
@@ -40,7 +45,13 @@ 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;
+                /*
+                 * The entire buffer has been flushed; this means we have to
+                 * reset our newline position as we have already written
+                 * that part of the stream.
+                 */
+                offset = 0;
             }
         }
     }
@@ -79,6 +90,16 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
     return nmemb_i;
 }
 
+size_t fwrite( const void * _PDCLIB_restrict ptr, 
+               size_t size, size_t nmemb, 
+               FILE * _PDCLIB_restrict stream )
+{
+    _PDCLIB_flockfile( stream );
+    size_t r = _PDCLIB_fwrite_unlocked( ptr, size, nmemb, stream );
+    _PDCLIB_funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST
@@ -86,11 +107,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
 
 int main( void )
 {
-    FILE * fh;
-    TESTCASE( ( fh = tmpfile() ) != NULL );
-    TESTCASE( fwrite( "SUCCESS testing fwrite()\n", 1, 25, fh ) == 25 );
-    /* TODO: Add readback test. */
-    TESTCASE( fclose( fh ) == 0 );
+    /* Testing covered by fread(). */
     return TEST_RESULTS;
 }