X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffopen.c;h=e806b00a2ef76c31879a2aa0a19b55b368962aa6;hb=c5d49235e09fbd58416f10dec2799e61cf3431c8;hp=18b7b3ae4df8e2cf5646bb87fc88fc20bedc8eba;hpb=5fd032eae66fba700cb9927840222b068c62361e;p=pdclib

diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c
index 18b7b3a..e806b00 100644
--- a/functions/stdio/fopen.c
+++ b/functions/stdio/fopen.c
@@ -20,15 +20,20 @@ FILE * fopen( const char * _PDCLIB_restrict filename,
               const char * _PDCLIB_restrict mode )
 {
     int imode = _PDCLIB_filemode( mode );
-    _PDCLIB_fd_t fd = _PDCLIB_open( filename, imode );
-    if(fd == _PDCLIB_NOHANDLE) {
+    
+    if( imode == 0 || filename == NULL )
+        return NULL;
+
+    _PDCLIB_fd_t              fd;
+    const _PDCLIB_fileops_t * ops;
+    if(!_PDCLIB_open( &fd, &ops, filename, imode )) {
         return NULL;
     }
 
-    FILE * f = _PDCLIB_fdopen( fd, imode, filename );
+    FILE * f = _PDCLIB_fvopen( fd, ops, imode, filename );
     if(!f) {
         int saveErrno = errno;
-        _PDCLIB_close( fd );
+        ops->close(fd);
         errno = saveErrno;
     }
     return f;