#ifndef REGTEST
#include <_PDCLIB_glue.h>
-/* 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 (binary
- 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[i] )
- {
- 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;
-}
+extern struct _PDCLIB_file_t * _PDCLIB_filelist;
struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode )
{
/* no memory for another FILE */
return NULL;
}
- if ( ( rc->status = filemode( mode ) ) == 0 ) goto fail; /* invalid mode */
+ if ( ( rc->status = _PDCLIB_filemode( mode ) ) == 0 )
+ {
+ /* invalid mode */
+ free( rc );
+ return NULL;
+ }
rc->handle = _PDCLIB_open( filename, rc->status );
- if ( rc->handle == _PDCLIB_NOHANDLE ) goto fail; /* OS open() failed */
+ if ( rc->handle == _PDCLIB_NOHANDLE )
+ {
+ /* OS open() failed */
+ free( rc );
+ return NULL;
+ }
/* Adding to list of open files */
rc->next = _PDCLIB_filelist;
_PDCLIB_filelist = rc;
/* Setting buffer, and mark as internal. TODO: Check for unbuffered */
- if ( ( rc->buffer = malloc( BUFSIZ ) ) == NULL ) goto fail;
+ if ( ( rc->buffer = malloc( BUFSIZ ) ) == NULL )
+ {
+ free( rc );
+ return NULL;
+ }
+ if ( ( rc->ungetbuf = malloc( _PDCLIB_UNGETCBUFSIZE ) ) == NULL )
+ {
+ free( rc->buffer );
+ free( rc );
+ return NULL;
+ }
rc->bufsize = BUFSIZ;
rc->bufidx = 0;
- rc->status |= ( _PDCLIB_LIBBUFFER | _PDCLIB_VIRGINSTR );
+ rc->ungetidx = 0;
+ /* Setting buffer to _IOLBF because "when opened, a stream is fully
+ buffered if and only if it can be determined not to refer to an
+ interactive device."
+ */
+ rc->status |= _PDCLIB_LIBBUFFER | _IOLBF;
/* TODO: Setting mbstate */
return rc;
-fail:
- free( rc );
- return NULL;
}
#endif
int main( void )
{
-#ifndef REGTEST
- TESTCASE( filemode( "r" ) == _PDCLIB_FREAD );
- TESTCASE( filemode( "w" ) == _PDCLIB_FWRITE );
- TESTCASE( filemode( "a" ) == _PDCLIB_FAPPEND );
- TESTCASE( filemode( "r+" ) == ( _PDCLIB_FREAD | _PDCLIB_FRW ) );
- TESTCASE( filemode( "w+" ) == ( _PDCLIB_FWRITE | _PDCLIB_FRW ) );
- TESTCASE( filemode( "a+" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FRW ) );
- TESTCASE( filemode( "rb" ) == ( _PDCLIB_FREAD | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "wb" ) == ( _PDCLIB_FWRITE | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "ab" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "r+b" ) == ( _PDCLIB_FREAD | _PDCLIB_FRW | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "w+b" ) == ( _PDCLIB_FWRITE | _PDCLIB_FRW | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "a+b" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FRW | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "rb+" ) == ( _PDCLIB_FREAD | _PDCLIB_FRW | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "wb+" ) == ( _PDCLIB_FWRITE | _PDCLIB_FRW | _PDCLIB_FBIN ) );
- TESTCASE( filemode( "ab+" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FRW | _PDCLIB_FBIN ) );
- TESTCASE( fopen( NULL, NULL ) == NULL );
+ /* 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).
+ */
+ remove( "testfile" );
+ TESTCASE_NOREG( fopen( NULL, NULL ) == NULL );
TESTCASE( fopen( NULL, "w" ) == NULL );
- TESTCASE( fopen( "", NULL ) == NULL );
+ TESTCASE_NOREG( fopen( "", NULL ) == NULL );
TESTCASE( fopen( "", "w" ) == NULL );
TESTCASE( fopen( "foo", "" ) == NULL );
- TESTCASE( fopen( "testfile", "wq" ) == NULL ); /* Illegal mode */
- TESTCASE( fopen( "testfile", "wr" ) == NULL ); /* Illegal mode */
+ TESTCASE_NOREG( fopen( "testfile", "wq" ) == NULL ); /* Undefined mode */
+ TESTCASE_NOREG( fopen( "testfile", "wr" ) == NULL ); /* Undefined mode */
TESTCASE( fopen( "testfile", "w" ) != NULL );
- system( "rm testfile" );
-#else
- puts( " NOTEST fopen() test driver is PDCLib-specific." );
-#endif
+ remove( "testfile" );
return TEST_RESULTS;
}