X-Git-Url: https://pd.if.org/git/?p=pdclib.old;a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=d0efadb207df354eabdca050be5819c1756a370d;hp=8765d0be7e23c70507c1779e359674fc948624b3;hb=0082c47404ecdeb00e08e1aedbea0f8402cfc906;hpb=52e702f02142dc34a476f01ca6bf8257cc9bc7e4

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 8765d0b..d0efadb 100644
--- a/functions/stdio/fwrite.c
+++ b/functions/stdio/fwrite.c
@@ -7,13 +7,62 @@
 */
 
 #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 _PDCLIB_fwrite_unlocked( const void *restrict vptr,
+               size_t size, size_t nmemb,
+               FILE * _PDCLIB_restrict stream )
+{
+    if ( _PDCLIB_prepwrite( stream ) == EOF )
+    {
+        return 0;
+    }
 
-size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+    const char *restrict ptr = vptr;
+    size_t nmemb_i;
+    for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i )
+    {
+        for ( size_t size_i = 0; size_i < size; ++size_i )
+        {
+            char c = ptr[ nmemb_i * size + size_i ];
+            stream->buffer[ stream->bufidx++ ] = c;
+
+            if ( stream->bufidx == stream->bufsize || ( c == '\n' && stream->status & _IOLBF ) )
+            {
+                if ( _PDCLIB_flushbuffer( stream ) == EOF )
+                {
+                    /* Returning number of objects completely buffered */
+                    return nmemb_i;
+                }
+            }
+        }
+
+        if ( stream->status & _IONBF )
+        {
+            if ( _PDCLIB_flushbuffer( stream ) == EOF )
+            {
+                /* Returning number of objects completely buffered */
+                return nmemb_i;
+            }
+        }
+    }
+    return nmemb_i;
+}
+
+size_t fwrite( const void * _PDCLIB_restrict ptr,
+               size_t size, size_t nmemb,
+               FILE * _PDCLIB_restrict stream )
 {
-    return _PDCLIB_write( stream->handle, ptr, size * nmemb );
+    _PDCLIB_flockfile( stream );
+    size_t r = _PDCLIB_fwrite_unlocked( ptr, size, nmemb, stream );
+    _PDCLIB_funlockfile( stream );
+    return r;
 }
 
 #endif
@@ -23,13 +72,9 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str
 
 int main( void )
 {
-    FILE * fh;
-    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;
 }
 
 #endif
+