X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffopen.c;h=32a66a1fa13053a149e493ae779164cbbd0014d0;hb=0326491c5ed243ea6efc5e66e3a6ea21427aad92;hp=48c07d2b3ff41d6c2244461bc417832546063161;hpb=393020b6e48719d27699dea6b29e53025bbd5123;p=pdclib

diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c
index 48c07d2..32a66a1 100644
--- a/functions/stdio/fopen.c
+++ b/functions/stdio/fopen.c
@@ -11,20 +11,30 @@
 
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
+#include <string.h>
 
 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 ) 
@@ -40,21 +50,13 @@ struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const cha
         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 )
-    {
-        free( rc );
-        return NULL;
-    }
-    if ( ( rc->ungetbuf = malloc( _PDCLIB_UNGETCBUFSIZE ) ) == NULL )
-    {
-       free( rc->buffer );
-       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;
@@ -62,8 +64,11 @@ struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const cha
        buffered if and only if it can be determined not to refer to an
        interactive device."
     */
-    rc->status |= _PDCLIB_LIBBUFFER | _IOLBF;
+    rc->status |= _IOLBF;
     /* TODO: Setting mbstate */
+    /* Adding to list of open files */
+    rc->next = _PDCLIB_filelist;
+    _PDCLIB_filelist = rc;
     return rc;
 }
 
@@ -78,16 +83,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 );
+    remove( testfile );
     return TEST_RESULTS;
 }