X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Ffopen.c;h=3d9f95ab1a205917d4ec2b0424b6866a248bc99d;hp=93e27191aaf9a06d78d9253e3db96406d9080e51;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=8f67eac83402119dfdd2627da82c65d5a349cb02

diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c
index 93e2719..3d9f95a 100644
--- a/functions/stdio/fopen.c
+++ b/functions/stdio/fopen.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fopen( const char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,72 +8,40 @@
 #include <stdlib.h>
 
 #ifndef REGTEST
-#include <_PDCLIB_glue.h>
+#include "_PDCLIB_io.h"
+#include "_PDCLIB_glue.h"
 #include <string.h>
+#include <errno.h>
 
-extern struct _PDCLIB_file_t * _PDCLIB_filelist;
+extern FILE * _PDCLIB_filelist;
 
-struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode )
+FILE * 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 */
+    int imode = _PDCLIB_filemode( mode );
+    
+    if( imode == 0 || filename == NULL )
         return 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 */
-        return NULL;
-    }
-    if ( ( rc->status = _PDCLIB_filemode( mode ) ) == 0 ) 
-    {
-        /* invalid mode */
-        free( rc );
+
+    _PDCLIB_fd_t              fd;
+    const _PDCLIB_fileops_t * ops;
+    if(!_PDCLIB_open( &fd, &ops, filename, imode )) {
         return NULL;
     }
-    rc->handle = _PDCLIB_open( filename, rc->status );
-    if ( rc->handle == _PDCLIB_NOHANDLE )
-    {
-        /* OS open() failed */
-        free( rc );
-        return NULL;
+
+    FILE * f = _PDCLIB_fvopen( fd, ops, imode, filename );
+    if(!f) {
+        int saveErrno = errno;
+        ops->close(fd);
+        errno = saveErrno;
     }
-    /* 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;
-    return rc;
+    return f;
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
@@ -83,16 +49,18 @@ int main( void )
        my system is at once less forgiving (segfaults on mode NULL) and more
        forgiving (accepts undefined modes).
     */
-    remove( "testfile" );
+    FILE * fh;
+    remove( testfile );
     TESTCASE_NOREG( fopen( NULL, NULL ) == NULL );
     TESTCASE( fopen( NULL, "w" ) == NULL );
     TESTCASE_NOREG( fopen( "", NULL ) == NULL );
     TESTCASE( fopen( "", "w" ) == NULL );
     TESTCASE( fopen( "foo", "" ) == NULL );
-    TESTCASE_NOREG( fopen( "testfile", "wq" ) == NULL ); /* Undefined mode */
-    TESTCASE_NOREG( fopen( "testfile", "wr" ) == NULL ); /* Undefined mode */
-    TESTCASE( fopen( "testfile", "w" ) != NULL );
-    remove( "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 );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }