*/
#include <stdio.h>
+
#ifndef REGTEST
+#include <_PDCLIB_glue.h>
+
#include <stdbool.h>
#include <string.h>
-#include <_PDCLIB_glue.h>
+//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 fwrite_unlocked( const void * _PDCLIB_restrict ptr,
+ size_t size, size_t nmemb,
+ struct _PDCLIB_file_t * _PDCLIB_restrict stream )
{
if ( _PDCLIB_prepwrite( stream ) == EOF )
{
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 )
{
for ( size_t size_i = 0; size_i < size; ++size_i )
{
- /* TODO: Should line-buffered streams be flushed on '\n' or system EOL? */
if ( ( stream->buffer[ stream->bufidx++ ] = ((char*)ptr)[ nmemb_i * size + size_i ] ) == '\n' )
{
/* 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 )
{
/* 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;
}
}
}
return nmemb_i;
}
+size_t fwrite( const void * _PDCLIB_restrict ptr,
+ size_t size, size_t nmemb,
+ struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+{
+ flockfile( stream );
+ size_t r = fwrite_unlocked( ptr, size, nmemb, stream );
+ funlockfile( stream );
+ return r;
+}
+
#endif
#ifdef TEST
int main( void )
{
- FILE * fh;
- remove( "testfile" );
- TESTCASE( ( fh = fopen( "testfile", "w" ) ) != NULL );
- TESTCASE( fwrite( "SUCCESS testing fwrite()\n", 1, 25, fh ) == 25 );
- TESTCASE( fclose( fh ) == 0 );
- /* TODO: Add readback test. */
- TESTCASE( remove( "testfile" ) == 0 );
+ /* Testing covered by fread(). */
return TEST_RESULTS;
}