X-Git-Url: https://git.gag.com/?p=fw%2Fpdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffopen.c;h=32a66a1fa13053a149e493ae779164cbbd0014d0;hp=2abb66407bb9bb7e80eb53dcecd0740148a2697e;hb=185c9e2dc3a58f33f12d406049b36350c93dc00b;hpb=3d7cdd5d5712a24fcee4acc8f746d3b04f3e4db6

diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c
index 2abb664..32a66a1 100644
--- a/functions/stdio/fopen.c
+++ b/functions/stdio/fopen.c
@@ -11,84 +11,65 @@
 
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
+#include <string.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 )
 {
     struct _PDCLIB_file_t * rc;
+    size_t filename_len;
     if ( mode == NULL || filename == NULL || filename[0] == '\0' )
     {
         /* Mode or filename invalid */
         return NULL;
     }
-    if ( ( rc = calloc( 1, sizeof( struct _PDCLIB_file_t ) ) ) == NULL )
+    /* To reduce the number of malloc calls, all data fields are concatenated:
+       * the FILE structure itself,
+       * ungetc buffer,
+       * filename buffer,
+       * data buffer.
+       Data buffer comes last because it might change in size ( setvbuf() ).
+    */
+    filename_len = strlen( filename ) + 1;
+    if ( ( rc = calloc( 1, sizeof( struct _PDCLIB_file_t ) + _PDCLIB_UNGETCBUFSIZE + filename_len + BUFSIZ ) ) == NULL )
     {
-        /* no memory for another FILE */
+        /* no memory */
+        return NULL;
+    }
+    if ( ( rc->status = _PDCLIB_filemode( mode ) ) == 0 ) 
+    {
+        /* invalid mode */
+        free( rc );
         return NULL;
     }
-    if ( ( rc->status = filemode( mode ) ) == 0 ) goto fail; /* invalid mode */
     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;
+    }
+    /* Setting pointers into the memory block allocated above */
+    rc->ungetbuf = (unsigned char *)rc + sizeof( struct _PDCLIB_file_t );
+    rc->filename = (char *)rc->ungetbuf + _PDCLIB_UNGETCBUFSIZE;
+    rc->buffer   = rc->filename + filename_len;
+    /* Copying filename to FILE structure */
+    strcpy( rc->filename, filename );
+    /* Initializing the rest of the structure */
+    rc->bufsize = BUFSIZ;
+    rc->bufidx = 0;
+    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 |= _IOLBF;
+    /* TODO: Setting mbstate */
     /* 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;
-    rc->status |= _PDCLIB_LIBBUFFER;
-    /* TODO: Setting mbstate */
     return rc;
-fail:
-    free( rc );
-    return NULL;
 }
 
 #endif
@@ -98,30 +79,22 @@ fail:
 
 int main( void )
 {
-    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).
+    */
+    FILE * fh;
+    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( fopen( "testfile", "w" ) != NULL );
-    system( "rm testfile" );
+    TESTCASE_NOREG( fopen( testfile, "wq" ) == NULL ); /* Undefined mode */
+    TESTCASE_NOREG( fopen( testfile, "wr" ) == NULL ); /* Undefined mode */
+    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( fclose( fh ) == 0 );
+    remove( testfile );
     return TEST_RESULTS;
 }