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

diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c
index 4d249ef..d181cc1 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,59 +12,38 @@
 #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 )
+struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode )
 {
-    int rc = 0;
-    switch ( mode[0] )
+    struct _PDCLIB_file_t * rc;
+    if ( mode == NULL || filename == NULL || filename[0] == '\0' )
     {
-        case 'r':
-            rc |= _PDCLIB_FREAD;
-            break;
-        case 'w':
-            rc |= _PDCLIB_FWRITE;
-            break;
-        case 'a':
-            rc |= _PDCLIB_FAPPEND;
-            break;
-        default:
-            return -1;
+        /* Mode or filename invalid */
+        return NULL;
     }
-    for ( size_t i = 1; i < 4; ++i )
-    {
-        switch ( mode[1] )
-        {
-            case '+':
-                if ( rc & _PDCLIB_FRW ) return -1;
-                rc |= _PDCLIB_FRW;
-                break;
-            case 'b':
-                if ( rc & _PDCLIB_FBIN ) return -1;
-                rc |= _PDCLIB_FBIN;
-                break;
-            case '\0':
-                return rc;
-            default:
-                return -1;
-        }
-    }
-    return -1;
-}
-
-FILE * fopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode )
-{
-    FILE * rc;
-    if ( mode == NULL || filename == NULL || filename[0] == '\0' )
+    if ( ( rc = calloc( 1, sizeof( struct _PDCLIB_file_t ) ) ) == NULL )
     {
+        /* no memory for another FILE */
         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->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;
-    /* 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->bufsize = BUFSIZ;
+    rc->bufidx = 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 | _PDCLIB_VIRGINSTR /* | _IOLBF */ ); /* FIXME: Uncommenting the _IOLBF here breaks output. */
+    /* TODO: Setting mbstate */
     return rc;
 fail:
     free( rc );
@@ -80,7 +57,25 @@ 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;
 }