Add _cbprintf/_vcbprintf (callback based printf formatters)

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

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 2315b9ab656c9b79f9290a6426833796c2806333..0aa66485e7ec96b86a5bde2c340a5e214b5de6b6 100644 (file)
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* vfprintf( FILE *, const char *, va_list )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,23 +8,58 @@
 
 #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 _PDCLIB_vfprintf_unlocked( FILE * _PDCLIB_restrict stream,
+                       const char * _PDCLIB_restrict format,
+                       va_list arg )
+{
+    return _vcbprintf(stream, filecb, format, arg);
+}
 
-int vfprintf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
+int vfprintf( FILE * _PDCLIB_restrict stream,
+              const char * _PDCLIB_restrict format,
+              va_list arg )
 {
-    /* TODO: Implement using vsnprintf() writing to file buffer */
-    return 0;
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_vfprintf_unlocked( stream, format, arg );
+    _PDCLIB_funlockfile( stream );
+    return r;
 }
 
 #endif
 
 #ifdef TEST
+#define _PDCLIB_FILEID "stdio/vfprintf.c"
+#define _PDCLIB_FILEIO
+#include <stddef.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 * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }