X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=47da8e25a54956c10c1cf4528bcb7f74e0e6b568;hp=8765d0be7e23c70507c1779e359674fc948624b3;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=f603f88b4456cf9b7ab1328bf657ede22a0c9940

diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c
index 8765d0b..47da8e2 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,29 +5,74 @@
 */
 
 #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 )
+size_t _PDCLIB_fwrite_unlocked( const void *restrict vptr,
+               size_t size, size_t nmemb,
+               FILE * _PDCLIB_restrict stream )
 {
-    return _PDCLIB_write( stream->handle, ptr, size * nmemb );
+    if ( _PDCLIB_prepwrite( stream ) == EOF )
+    {
+        return 0;
+    }
+
+    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 )
+{
+    _PDCLIB_flockfile( stream );
+    size_t r = _PDCLIB_fwrite_unlocked( ptr, size, nmemb, stream );
+    _PDCLIB_funlockfile( stream );
+    return r;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 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
+