Further streamlined testing.

[fw/pdclib] / functions / stdio / vfprintf.c

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 12a09097e1fc52e4ec4dc93d9c0843875d1fa19e..2b216db9ff71b19dec53384c3ab92d2f5b762bbd 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -8,23 +8,72 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdint.h>
 
 #ifndef REGTEST
 
-int vfprintf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
+int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
 {
-    /* TODO: Implement using vsnprintf() writing to file buffer */
-    return 0;
+    /* TODO: This function should interpret format as multibyte characters.  */
+    struct _PDCLIB_status_t status;
+    status.base = 0;
+    status.flags = 0;
+    status.n = SIZE_MAX;
+    status.i = 0;
+    status.current = 0;
+    status.s = NULL;
+    status.width = 0;
+    status.prec = 0;
+    status.stream = stream;
+    va_copy( status.arg, arg );
+
+    while ( *format != '\0' )
+    {
+        const char * rc;
+        if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
+        {
+            /* No conversion specifier, print verbatim */
+            putc( *(format++), stream );
+            status.i++;
+        }
+        else
+        {
+            /* Continue parsing after conversion specifier */
+            format = rc;
+        }
+    }
+    va_end( status.arg );
+    return status.i;
 }
 
 #endif
 
 #ifdef TEST
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
 #include <_PDCLIB_test.h>
 
+static int testprintf( FILE * stream, size_t n, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vfprintf( stream, format, arg );
+    va_end( arg );
+    return i;
+}
+
+#define TESTCASE_SPRINTF( x )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * buffer;
+    TESTCASE( ( buffer = fopen( testfile, "wb" ) ) != NULL );
+#include "printf_testcases.incl"
+    TESTCASE( fclose( buffer ) == 0 );
+#include "fprintf_reftest.incl"
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }