Yet closer to functional output.

[pdclib] / functions / stdio / vfprintf.c

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 3656843602dfd76e14e95ec5abdae3b0ef8af1d8..9a9a9503ce099eb5a5ac6f4ef000c4d7effc54b6 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -12,7 +12,7 @@
 
 #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: This function should interpret format as multibyte characters.  */
     /* Members: base, flags, n, i, this, s, width, prec, stream, arg         */
@@ -24,6 +24,7 @@ int vfprintf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict form
         {
             /* No conversion specifier, print verbatim */
             putc( *(format++), stream );
+            status.i++;
         }
         else
         {
@@ -37,11 +38,26 @@ int vfprintf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict form
 #endif
 
 #ifdef TEST
+#include <stdlib.h>
 #include <_PDCLIB_test.h>
 
+static int testprintf( FILE * stream, const char * format, ... )
+{
+    int i;
+    va_list arg;
+    va_start( arg, format );
+    i = vfprintf( stream, format, arg );
+    va_end( arg );
+    return i;
+}
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * fh;
+    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
+    TESTCASE( testprintf( fh, "Hallo\n" ) == 6 );
+    TESTCASE( fclose( fh ) == 0 );
+    /* FIXME: Testfile doesn't exist... */
     return TEST_RESULTS;
 }