X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=9ab8a0abfb1380df315f5565edd7c5b1d5a30871;hb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;hp=0ea1b02e75fcef534a2ecc132984c2f1ed3a5f7e;hpb=dd71cbbfbd68cd8c653277a0c1f70ab2b179421c;p=pdclib

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 0ea1b02..9ab8a0a 100644
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -15,14 +15,18 @@
 #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 fwrite_unlocked( const void * _PDCLIB_restrict ptr, 
+               size_t size, size_t nmemb, 
+               struct _PDCLIB_file_t * _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, 
+               struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+{
+    flockfile( stream );
+    size_t r = fwrite_unlocked( ptr, size, nmemb, stream );
+    funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST