X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfprintf.c;h=ffb4bbe6e49794509ccf20d018e924e22d0ac22c;hb=84d648157e22cecc65902ecfdd4e3a1b88d5e53f;hp=7ab3167499a8d2f57360d01a1b3a458abf4b477d;hpb=82cd4468d130cac87062bc6e4fc5bf0f593785d3;p=pdclib.old

diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c
index 7ab3167..ffb4bbe 100644
--- a/functions/stdio/vfprintf.c
+++ b/functions/stdio/vfprintf.c
@@ -12,7 +12,9 @@
 
 #ifndef REGTEST
 
-int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg )
+int vfprintf_unlocked( struct _PDCLIB_file_t * _PDCLIB_restrict stream, 
+                       const char * _PDCLIB_restrict format, 
+                       va_list arg )
 {
     /* TODO: This function should interpret format as multibyte characters.  */
     struct _PDCLIB_status_t status;
@@ -46,14 +48,22 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDC
     return status.i;
 }
 
+int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, 
+              const char * _PDCLIB_restrict format, 
+              va_list arg )
+{
+    flockfile( stream );
+    int r = vfprintf_unlocked( stream, format, arg );
+    funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST
 #define _PDCLIB_FILEID "stdio/vfprintf.c"
-#define FPRINTF_FUNCTION
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
+#define _PDCLIB_FILEIO
+
 #include <_PDCLIB_test.h>
 
 static int testprintf( FILE * stream, const char * format, ... )
@@ -69,10 +79,9 @@ static int testprintf( FILE * stream, const char * format, ... )
 int main( void )
 {
     FILE * target;
-    TESTCASE( ( target = fopen( testfile, "wb+" ) ) != NULL );
-#include "printf_testcases.incl"
+    TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
     TESTCASE( fclose( target ) == 0 );
-    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }