X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Fvfprintf.c;h=1eeaf0986fedca5503f0495bc638751b9a554dd8;hp=0288f6d74b90b9c17fa38ee43a6a68acc01e634a;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=ed4d5abcad8b07c4a06d2483497066c2c621a6d7

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 0288f6d..1eeaf09 100644
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* vfprintf( FILE *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,35 +7,40 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
+#include <limits.h>
 
 #ifndef REGTEST
+#include "_PDCLIB_io.h"
+
+static size_t filecb(void *p, const char *buf, size_t size)
+{
+    return _PDCLIB_fwrite_unlocked( buf, 1, size, (FILE*) p );
+}
 
-int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
+int _PDCLIB_vfprintf_unlocked( FILE * _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         */
-    struct _PDCLIB_status_t status = { 0, 0, SIZE_MAX, 0, 0, NULL, 0, 0, stream, arg };
-    while ( *format != '\0' )
-    {
-        const char * rc;
-        if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
-        {
-            /* No conversion specifier, print verbatim */
-            putc( *(format++), stream );
-        }
-        else
-        {
-            /* Continue parsing after conversion specifier */
-            format = rc;
-        }
-    }
-    return status.i;
+    return _vcbprintf(stream, filecb, format, arg);
+}
+
+int vfprintf( FILE * _PDCLIB_restrict stream,
+              const char * _PDCLIB_restrict format,
+              va_list arg )
+{
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_vfprintf_unlocked( stream, format, arg );
+    _PDCLIB_funlockfile( stream );
+    return r;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "stdio/vfprintf.c"
+#define _PDCLIB_FILEIO
+#include <stddef.h>
+#include "_PDCLIB_test.h"
 
 static int testprintf( FILE * stream, const char * format, ... )
 {
@@ -51,14 +54,10 @@ static int testprintf( FILE * stream, const char * format, ... )
 
 int main( void )
 {
-    FILE * fh;
-    TESTCASE( testprintf( stdout, "Hallo\n" ) == 6 );
-#if 0
-    TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
-    TESTCASE( testprintf( fh, "Hallo\n" ) );
-    TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( "testfile" ) == 0 );
-#endif
+    FILE * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }