X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=functions%2Fstdio%2Ffread.c;h=51e6a7b37a5d8766134dc581e395808d4a2b57de;hb=f2c41eedc0c43f9ea65c8e0fac0b642cb7a74b68;hp=83bc3b7e6d0eb2f5dd5e571e393bcdfb46f5a69d;hpb=fae6eaa5fd1857623b296e7aad3ad97b9923f06e;p=fw%2Fpdclib

diff --git a/functions/stdio/fread.c b/functions/stdio/fread.c
index 83bc3b7..51e6a7b 100644
--- a/functions/stdio/fread.c
+++ b/functions/stdio/fread.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-/* fread( void *, size_t, size_t, FILE * )
+/* fwrite( void *, size_t, size_t, FILE * )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -11,9 +11,33 @@
 
 #ifndef REGTEST
 
+#include <stdbool.h>
+#include <string.h>
+
 size_t fread( void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
 {
-    return _PDCLIB_read( stream->handle, ptr, size * nmemb );
+    if ( _PDCLIB_prepread( stream ) == EOF )
+    {
+        return 0;
+    }
+    char * dest = (char *)ptr;
+    size_t nmemb_i;
+    for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i )
+    {
+        for ( size_t size_i = 0; size_i < size; ++size_i )
+        {
+            if ( stream->bufidx == stream->bufend )
+            {
+                if ( _PDCLIB_fillbuffer( stream ) == EOF )
+                {
+                    /* Could not read requested data */
+                    return nmemb_i;
+                }
+            }
+            dest[ nmemb_i * size + size_i ] = stream->buffer[ stream->bufidx++ ];
+        }
+    }
+    return nmemb_i;
 }
 
 #endif
@@ -23,8 +47,13 @@ size_t fread( void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PD
 
 int main( void )
 {
-    /* Testing handled by fwrite(). */
+    FILE * fh;
+    TESTCASE( ( fh = tmpfile() ) != NULL );
+    TESTCASE( fwrite( "SUCCESS testing fwrite()\n", 1, 25, fh ) == 25 );
+    /* TODO: Add readback test. */
+    TESTCASE( fclose( fh ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+