#include <stdio.h>
#include <stdarg.h>
#include <stdint.h>
+#include <limits.h>
#ifndef REGTEST
+#include <_PDCLIB_io.h>
-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 };
+ struct _PDCLIB_status_t status;
+ status.base = 0;
+ status.flags = 0;
+ status.n = UINT_MAX;
+ status.i = 0;
+ status.current = 0;
+ status.s = NULL;
+ status.width = 0;
+ status.prec = 0;
+ status.stream = stream;
+ va_copy( status.arg, arg );
+
while ( *format != '\0' )
{
const char * rc;
if ( ( *format != '%' ) || ( ( rc = _PDCLIB_print( format, &status ) ) == format ) )
{
/* No conversion specifier, print verbatim */
- putc( *(format++), stream );
+ _PDCLIB_putc_unlocked( *(format++), stream );
status.i++;
}
else
format = rc;
}
}
+ va_end( status.arg );
return status.i;
}
+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 <stdlib.h>
+#define _PDCLIB_FILEID "stdio/vfprintf.c"
+#define _PDCLIB_FILEIO
+
#include <_PDCLIB_test.h>
static int testprintf( FILE * stream, const char * format, ... )
int main( void )
{
- FILE * fh;
- TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
- TESTCASE( testprintf( fh, "Hallo\n" ) == 6 );
- TESTCASE( fclose( fh ) == 0 );
- /* FIXME: Testfile doesn't exist... */
+ FILE * target;
+ TESTCASE( ( target = tmpfile() ) != NULL );
+#include "printf_testcases.h"
+ TESTCASE( fclose( target ) == 0 );
return TEST_RESULTS;
}