X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffopen.c;h=9a01fe3debc8f225a5bdd1244ba85814355589f1;hb=90e52eb83afae4969bec36cd11ece85507458f79;hp=4d249efc1bc6948204dee36719453b006e8188fb;hpb=d02f38605b53cdff5460cc6b9e1b2a80c3a2ba4c;p=pdclib

diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c
index 4d249ef..9a01fe3 100644
--- a/functions/stdio/fopen.c
+++ b/functions/stdio/fopen.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* fopen( const char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -14,9 +12,14 @@
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
 
-static const FILE * _PDCLIB_filelist = NULL;
+/* FIXME: This approach is a possible attack vector. */
+struct _PDCLIB_file_t * _PDCLIB_filelist = NULL;
 
-static int filemode( char const * const mode )
+/* 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] )
@@ -31,42 +34,56 @@ static int filemode( char const * const mode )
             rc |= _PDCLIB_FAPPEND;
             break;
         default:
-            return -1;
+            /* Other than read, write, or append - invalid */
+            return 0;
     }
     for ( size_t i = 1; i < 4; ++i )
     {
-        switch ( mode[1] )
+        switch ( mode[i] )
         {
             case '+':
-                if ( rc & _PDCLIB_FRW ) return -1;
+                if ( rc & _PDCLIB_FRW ) return 0; /* Duplicates are invalid */
                 rc |= _PDCLIB_FRW;
                 break;
             case 'b':
-                if ( rc & _PDCLIB_FBIN ) return -1;
+                if ( rc & _PDCLIB_FBIN ) return 0; /* Duplicates are invalid */
                 rc |= _PDCLIB_FBIN;
                 break;
             case '\0':
+                /* End of mode */
                 return rc;
             default:
-                return -1;
+                /* Other than read/write or binary - invalid. */
+                return 0;
         }
     }
-    return -1;
+    /* 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 ) return rc; /* no space for another FILE */
-    if ( ( rc->status = filemode( mode ) ) == -1 ) goto fail; /* invalid mode given */
-    if ( ( rc->handle = _PDCLIB_open( filename, rc->status ) ) == -1 ) goto fail; /* OS "open" failed */
+    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 */
+    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;
-    /* TODO: Continue here: Set up PDCLib FILE contents */
+    /* Setting buffer, and mark as internal. TODO: Check for unbuffered? */
+    if ( ( rc->buffer = malloc( BUFSIZ ) ) == NULL ) goto fail;
+    rc->status |= ( _PDCLIB_LIBBUFFER | _PDCLIB_VIRGINSTR );
+    /* TODO: Setting mbstate */
     return rc;
 fail:
     free( rc );
@@ -80,7 +97,34 @@ fail:
 
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+#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 );
+    TESTCASE( fopen( NULL, "w" ) == NULL );
+    TESTCASE( 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" );
+#else
+    puts( " NOTEST fopen() test driver is PDCLib-specific." );
+#endif
     return TEST_RESULTS;
 }