X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffprintf.c;h=07283b2d162dc5ac0c6c80bfc32d515ab94aef1c;hb=HEAD;hp=5dfec4d10a069d03d12234ff2ac7567e570d873b;hpb=12e17136786afb1775c9dc946cbe41f5e230c24a;p=pdclib.old

diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c
index 5dfec4d..07283b2 100644
--- a/functions/stdio/fprintf.c
+++ b/functions/stdio/fprintf.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* fprintf( FILE *, const char *, ... )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -12,23 +10,52 @@
 #include <stdarg.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fprintf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, ... )
+int _PDCLIB_fprintf_unlocked( FILE * _PDCLIB_restrict stream, 
+                      const char * _PDCLIB_restrict format, ... )
 {
+    int rc;
     va_list ap;
     va_start( ap, format );
-    return vfprintf( stream, format, ap );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    va_end( ap );
+    return rc;
+}
+
+int fprintf( FILE * _PDCLIB_restrict stream,
+             const char * _PDCLIB_restrict format, ... )
+{
+    int rc;
+    va_list ap;
+    va_start( ap, format );
+    _PDCLIB_flockfile( stream );
+    rc = _PDCLIB_vfprintf_unlocked( stream, format, ap );
+    _PDCLIB_funlockfile( stream );
+    va_end( ap );
+    return rc;
 }
 
 #endif
 
 #ifdef TEST
+#include <stdint.h>
+#include <stddef.h>
+#define _PDCLIB_FILEID "stdio/fprintf.c"
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
+#define testprintf( stream, ... ) fprintf( stream, __VA_ARGS__ )
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+    FILE * target;
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+    TESTCASE( fclose( target ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+