#include <stdlib.h>
#include <string.h>
-struct _PDCLIB_file_t * freopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode, struct _PDCLIB_file_t * _PDCLIB_restrict stream )
+struct _PDCLIB_file_t * freopen(
+ const char * _PDCLIB_restrict filename,
+ const char * _PDCLIB_restrict mode,
+ struct _PDCLIB_file_t * _PDCLIB_restrict stream )
{
- unsigned int status = stream->status & ( _IONBF | _IOLBF | _IOFBF | _PDCLIB_FREEBUFFER | _PDCLIB_DELONCLOSE );
+ flockfile( stream );
+
+ unsigned int status = stream->status &
+ ( _IONBF | _IOLBF | _IOFBF | _PDCLIB_FREEBUFFER
+ | _PDCLIB_DELONCLOSE | _PDCLIB_STATIC );
+
/* TODO: This function can change wide orientation of a stream */
if ( stream->status & _PDCLIB_FWRITE )
{
if ( ( filename == NULL ) && ( stream->filename == NULL ) )
{
/* TODO: Special handling for mode changes on std-streams */
+ funlockfile( stream );
return NULL;
}
- _PDCLIB_close( stream->handle );
+ stream->ops->close(stream->handle);
+
/* TODO: It is not nice to do this on a stream we just closed.
It does not matter with the current implementation of clearerr(),
but it might start to matter if someone replaced that implementation.
/* Allocate new buffer */
if ( ( stream->filename = (char *)malloc( strlen( filename ) ) ) == NULL )
{
+ funlockfile( stream );
return NULL;
}
strcpy( stream->filename, filename );
}
if ( ( mode == NULL ) || ( filename[0] == '\0' ) )
{
+ funlockfile( stream );
return NULL;
}
if ( ( stream->status = _PDCLIB_filemode( mode ) ) == 0 )
{
+ funlockfile( stream );
return NULL;
}
/* Re-add the flags we saved above */
stream->bufend = 0;
stream->ungetidx = 0;
/* TODO: Setting mbstate */
- if ( ( stream->handle = _PDCLIB_open( filename, stream->status ) ) == _PDCLIB_NOHANDLE )
+ if ( ! _PDCLIB_open( &stream->handle, &stream->ops, filename,
+ stream->status ) )
{
+ funlockfile( stream );
return NULL;
}
+ funlockfile( stream );
return stream;
}
TESTCASE( fclose( fin ) == 0 );
TESTCASE( fclose( fout ) == 0 );
- remove( testfile1 );
- remove( testfile2 );
+ TESTCASE( remove( testfile1 ) == 0 );
+ TESTCASE( remove( testfile2 ) == 0 );
return TEST_RESULTS;
}