X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fvfprintf.c;h=01c5df618cedc0021dd826ed7a4323a56b671d4c;hb=55cf35957bf8dec0a489ba758c02c83303a5eb50;hp=626ad516302cf439116c6ba4592dcd33e54b5ba1;hpb=6089d8ab77f6f7bacbfa6354e8cfecab1b00c8bc;p=pdclib diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c index 626ad51..01c5df6 100644 --- a/functions/stdio/vfprintf.c +++ b/functions/stdio/vfprintf.c @@ -15,7 +15,6 @@ int vfprintf( struct _PDCLIB_file_t * _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, current, s, width, prec, stream, arg */ struct _PDCLIB_status_t status; status.base = 0; status.flags = 0; @@ -27,6 +26,7 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDC status.prec = 0; status.stream = stream; va_copy( status.arg, arg ); + while ( *format != '\0' ) { const char * rc; @@ -67,218 +67,11 @@ static int testprintf( FILE * stream, size_t n, const char * format, ... ) int main( void ) { FILE * buffer; - TESTCASE( ( buffer = fopen( "testfile", "w" ) ) != NULL ); - TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 ); - //TESTCASE( strcmp( buffer, "-128" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 ); - //TESTCASE( strcmp( buffer, "127" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhd", 0 ) == 1 ); - //TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MIN ) == 6 ); - //TESTCASE( strcmp( buffer, "-32768" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hd", SHRT_MAX ) == 5 ); - //TESTCASE( strcmp( buffer, "32767" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hd", 0 ) == 1 ); - //TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%d", 0 ) == 1 ); - //TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%ld", LONG_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%ld", LONG_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%ld", 0l ) == 1 ); - //TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MIN ) == 20 ); - //TESTCASE( strcmp( buffer, "-9223372036854775808" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lld", LLONG_MAX ) == 19 ); - //TESTCASE( strcmp( buffer, "9223372036854775807" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lld", 0ll ) ); - //TESTCASE( strcmp( buffer, "0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhu", UCHAR_MAX ) == 3 ); - //TESTCASE( strcmp( buffer, "255" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hhu", (unsigned char)-1 ) == 3 ); - //TESTCASE( strcmp( buffer, "255" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hu", USHRT_MAX ) == 5 ); - //TESTCASE( strcmp( buffer, "65535" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%hu", (unsigned short)-1 ) == 5 ); - //TESTCASE( strcmp( buffer, "65535" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%u", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%u", -1u ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lu", ULONG_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%lu", -1ul ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%llu", ULLONG_MAX ) == 20 ); - //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%llu", -1ull ) == 20 ); - //TESTCASE( strcmp( buffer, "18446744073709551615" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%X", UINT_MAX ) == 8 ); - //TESTCASE( strcmp( buffer, "FFFFFFFF" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#X", -1u ) == 10 ); - //TESTCASE( strcmp( buffer, "0XFFFFFFFF" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%x", UINT_MAX ) == 8 ); - //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#x", -1u ) == 10 ); - //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%o", UINT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "37777777777" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#o", -1u ) == 12 ); - //TESTCASE( strcmp( buffer, "037777777777" ) == 0 ); - /* TODO: This test case is broken, doesn't test what it was intended to. */ - TESTCASE( testprintf( buffer, 100, "%.0#o", 0 ) == 5 ); - //TESTCASE( strcmp( buffer, "%.0#o" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+d", 0 ) == 2 ); - //TESTCASE( strcmp( buffer, "+0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+u", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+u", -1u ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% d", 0 ) == 2 ); - //TESTCASE( strcmp( buffer, " 0" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% u", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "% u", -1u ) == 10 ); - //TESTCASE( strcmp( buffer, "4294967295" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%9d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%9d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%10d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%10d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%11d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%11d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%12d", INT_MIN ) == 12 ); - //TESTCASE( strcmp( buffer, " -2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%12d", INT_MAX ) == 12 ); - //TESTCASE( strcmp( buffer, " 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-9d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-9d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-10d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-10d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-11d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-11d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-12d", INT_MIN ) == 12 ); - //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-12d", INT_MAX ) == 12 ); - //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%09d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%09d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%010d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%010d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%011d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%011d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "02147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%012d", INT_MIN ) == 12 ); - //TESTCASE( strcmp( buffer, "-02147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%012d", INT_MAX ) == 12 ); - //TESTCASE( strcmp( buffer, "002147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-09d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-09d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-010d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-010d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-011d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-011d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-012d", INT_MIN ) == 12 ); - //TESTCASE( strcmp( buffer, "-2147483648 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%-012d", INT_MAX ) == 12 ); - //TESTCASE( strcmp( buffer, "2147483647 " ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%030.20d", INT_MAX ) == 30 ); - //TESTCASE( strcmp( buffer, " 00000000002147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%.6x", UINT_MAX ) == 8 ); - //TESTCASE( strcmp( buffer, "ffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#6.3x", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#3.6x", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%.6d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%6.3d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%3.6d", INT_MIN ) == 11 ); - //TESTCASE( strcmp( buffer, "-2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#0.6x", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#06.3x", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#03.6x", UINT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "0xffffffff" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#0.6d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#06.3d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#03.6d", INT_MAX ) == 10 ); - //TESTCASE( strcmp( buffer, "2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#+.6d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#+6.3d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%#+3.6d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+0.6d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+06.3d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%+03.6d", INT_MAX ) == 11 ); - //TESTCASE( strcmp( buffer, "+2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "- %d", INT_MAX ) == 12 ); - //TESTCASE( strcmp( buffer, "- 2147483647" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "- %d %% %d", INT_MAX, INT_MIN ) == 26 ); - //TESTCASE( strcmp( buffer, "- 2147483647 % -2147483648" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%c", 'x' ) == 1 ); - //TESTCASE( strcmp( buffer, "x" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%s", "abcdef" ) == 6 ); - //TESTCASE( strcmp( buffer, "abcdef" ) == 0 ); - TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 ); - //TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 ); - { - int val1, val2; - TESTCASE( testprintf( buffer, 100, "123456%n789%n", &val1, &val2 ) == 9 ); - //TESTCASE( strcmp( buffer, "123456789" ) == 0 ); - TESTCASE( val1 == 6 ); - TESTCASE( val2 == 9 ); - } - TESTCASE( fclose( buffer ) == 0 ); - char readbuffer[1000]; - TESTCASE( ( buffer = fopen( "testfile", "r" ) ) != NULL ); - TESTCASE( fread( readbuffer, 1, 1000, buffer ) == 985 ); + TESTCASE( ( buffer = fopen( testfile, "wb" ) ) != NULL ); +#include "printf_testcases.incl" TESTCASE( fclose( buffer ) == 0 ); - TESTCASE( remove( "testfile" ) == 0 ); - TESTCASE( memcmp( readbuffer, "-1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777%.0#o-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648 2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef123456789", 985 ) == 0 ); +#include "fprintf_reftest.incl" + TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; }