X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=c9396bf6751fcf6df33fd3f0e73095f2a8b8ae5f;hb=202af43c19ec4f5f1d1b2827a7ef0b46abfebed5;hp=89e9c03944f1c86a8cc11d2e0431b845d6e707d4;hpb=b41576197133c1211d6ec353faf93f505f573b8a;p=pdclib diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c index 89e9c03..c9396bf 100644 --- a/functions/stdio/fwrite.c +++ b/functions/stdio/fwrite.c @@ -9,7 +9,7 @@ #include #ifndef REGTEST - +#include <_PDCLIB_io.h> #include <_PDCLIB_glue.h> #include @@ -17,7 +17,9 @@ //TODO OS(2012-08-01): Ascertain purpose of lineend & potentially remove -size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream ) +size_t _PDCLIB_fwrite_unlocked( const void * _PDCLIB_restrict ptr, + size_t size, size_t nmemb, + FILE * _PDCLIB_restrict stream ) { if ( _PDCLIB_prepwrite( stream ) == EOF ) { @@ -44,6 +46,12 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str return nmemb_i; } //lineend = false; + /* + * The entire buffer has been flushed; this means we have to + * reset our newline position as we have already written + * that part of the stream. + */ + offset = 0; } } } @@ -82,6 +90,16 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str return nmemb_i; } +size_t fwrite( const void * _PDCLIB_restrict ptr, + size_t size, size_t nmemb, + FILE * _PDCLIB_restrict stream ) +{ + _PDCLIB_flockfile( stream ); + size_t r = _PDCLIB_fwrite_unlocked( ptr, size, nmemb, stream ); + _PDCLIB_funlockfile( stream ); + return r; +} + #endif #ifdef TEST