#ifndef REGTEST
#include <_PDCLIB_glue.h>
-static FILE * _PDCLIB_filelist = NULL;
+/* FIXME: This approach is a possible attack vector. */
+struct _PDCLIB_file_t * _PDCLIB_filelist = NULL;
-/* Helper function that parses the C-style mode string passed to fopen() into
- the PDCLib flags.FREAD, FWRITE, FAPPEND, FRW (read-write) and FBIN (
- mode).
-*/
-static unsigned int filemode( char const * const mode )
-{
- int rc = 0;
- switch ( mode[0] )
- {
- case 'r':
- rc |= _PDCLIB_FREAD;
- break;
- case 'w':
- rc |= _PDCLIB_FWRITE;
- break;
- case 'a':
- rc |= _PDCLIB_FAPPEND;
- break;
- default:
- /* Other than read, write, or append - invalid */
- return 0;
- }
- for ( size_t i = 1; i < 4; ++i )
- {
- switch ( mode[1] )
- {
- case '+':
- if ( rc & _PDCLIB_FRW ) return 0; /* Duplicates are invalid */
- rc |= _PDCLIB_FRW;
- break;
- case 'b':
- if ( rc & _PDCLIB_FBIN ) return 0; /* Duplicates are invalid */
- rc |= _PDCLIB_FBIN;
- break;
- case '\0':
- /* End of mode */
- return rc;
- default:
- /* Other than read/write or binary - invalid. */
- return 0;
- }
- }
- /* Longer than three chars - invalid. */
- return 0;
-}
-
-FILE * fopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode )
+struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode )
{
- FILE * rc;
+ struct _PDCLIB_file_t * rc;
if ( mode == NULL || filename == NULL || filename[0] == '\0' )
{
/* Mode or filename invalid */
return NULL;
}
- if ( ( rc = calloc( 1, sizeof( FILE ) ) ) == NULL )
+ if ( ( rc = calloc( 1, sizeof( struct _PDCLIB_file_t ) ) ) == NULL )
{
/* no memory for another FILE */
return NULL;
}
- if ( ( rc->status = filemode( mode ) ) == 0 ) goto fail; /* invalid mode */
+ if ( ( rc->status = _PDCLIB_filemode( mode ) ) == 0 ) goto fail; /* invalid mode */
rc->handle = _PDCLIB_open( filename, rc->status );
if ( rc->handle == _PDCLIB_NOHANDLE ) goto fail; /* OS open() failed */
-
/* Adding to list of open files */
rc->next = _PDCLIB_filelist;
_PDCLIB_filelist = rc;
- /* Setting buffer. TODO: Check for unbuffered? */
- if ( ( rc->buffer = malloc( BUFSIZ ) ) == NULL goto fail;
+ /* Setting buffer, and mark as internal. TODO: Check for unbuffered */
+ if ( ( rc->buffer = malloc( BUFSIZ ) ) == NULL ) goto fail;
+ rc->bufsize = BUFSIZ;
+ rc->bufidx = 0;
+ rc->status |= ( _PDCLIB_LIBBUFFER | _PDCLIB_VIRGINSTR );
/* TODO: Setting mbstate */
return rc;
fail:
int main( void )
{
- TESTCASE( NO_TESTDRIVER );
+ /* Some of the tests are not executed for regression tests, as the libc on
+ my system is at once less forgiving (segfaults on mode NULL) and more
+ forgiving (accepts undefined modes).
+ */
+#ifndef REGTEST
+ TESTCASE( fopen( NULL, NULL ) == NULL );
+#endif
+ TESTCASE( fopen( NULL, "w" ) == NULL );
+#ifndef REGTEST
+ TESTCASE( fopen( "", NULL ) == NULL );
+#endif
+ TESTCASE( fopen( "", "w" ) == NULL );
+ TESTCASE( fopen( "foo", "" ) == NULL );
+#ifndef REGTEST
+ TESTCASE( fopen( "testfile", "wq" ) == NULL ); /* Undefined mode */
+ TESTCASE( fopen( "testfile", "wr" ) == NULL ); /* Undefined mode */
+#endif
+ TESTCASE( fopen( "testfile", "w" ) != NULL );
+ system( "rm testfile" );
return TEST_RESULTS;
}