X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=c9396bf6751fcf6df33fd3f0e73095f2a8b8ae5f;hb=3309ec3ad8a5db735eaa2de7f5dc6a331d8e7319;hp=0ea1b02e75fcef534a2ecc132984c2f1ed3a5f7e;hpb=df85774c4417c5852610d83836b5ec095ebed667;p=pdclib.old

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 0ea1b02..c9396bf 100644
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -9,20 +9,24 @@
 #include <stdio.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 )
     {
@@ -32,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 )
             {
@@ -41,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;
             }
         }
     }
@@ -80,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