X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffwrite.c;h=90c8f44eb3993307e5f6498da08adba71186824a;hb=6cb7e8dab67e8807aad79c3bdc8f96d78a5e5dbc;hp=0ea1b02e75fcef534a2ecc132984c2f1ed3a5f7e;hpb=dd71cbbfbd68cd8c653277a0c1f70ab2b179421c;p=pdclib diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c index 0ea1b02..90c8f44 100644 --- a/functions/stdio/fwrite.c +++ b/functions/stdio/fwrite.c @@ -15,6 +15,8 @@ #include #include +//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 ) { if ( _PDCLIB_prepwrite( stream ) == EOF ) @@ -22,7 +24,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str return 0; } _PDCLIB_size_t offset = 0; - bool lineend = false; + //bool lineend = false; size_t nmemb_i; for ( nmemb_i = 0; nmemb_i < nmemb; ++nmemb_i ) { @@ -32,7 +34,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str { /* Remember last newline, in case we have to do a partial line-buffered flush */ offset = stream->bufidx; - lineend = true; + //lineend = true; } if ( stream->bufidx == stream->bufsize ) { @@ -41,7 +43,13 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str /* Returning number of objects completely buffered */ return nmemb_i; } - lineend = false; + //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; } } }