X-Git-Url: https://git.gag.com/?p=fw%2Fpdclib;a=blobdiff_plain;f=platform%2Fexample%2Ffunctions%2F_PDCLIB%2Fopen.c;h=0230558c9ccc4aea4f907f44b985232cbb4cb18e;hp=40d294f7de1150deabb11b2c601468ac330f58ee;hb=185c9e2dc3a58f33f12d406049b36350c93dc00b;hpb=427ac084998b7869539e0dfcf3eec5c180c76687

diff --git a/platform/example/functions/_PDCLIB/open.c b/platform/example/functions/_PDCLIB/open.c
index 40d294f..0230558 100644
--- a/platform/example/functions/_PDCLIB/open.c
+++ b/platform/example/functions/_PDCLIB/open.c
@@ -20,17 +20,15 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "/usr/include/errno.h"
+
 int _PDCLIB_open( char const * const filename, unsigned int mode )
 {
-    /* FIXME: THIS IS NOT TO BE USED OUT-OF-THE-BOX.
-       It is a proof-of-concept implementation. E.g. a stream may only be fully
-       buffered IF IT CAN BE DETERMINED NOT TO REFER TO AN INTERACTIVE DEVICE.
-       This logic is not represented here, as this is the EXAMPLE platform, and
-       actual platform overlays may differ widely. Another point is the value
-       for permissions being hardcoded to 0664 for file creations.
+    /* This is an example implementation of _PDCLIB_open() fit for use with
+       POSIX kernels.
     */
     int osmode;
-    switch ( mode & ~_PDCLIB_FBIN )
+    switch ( mode & ( _PDCLIB_FREAD | _PDCLIB_FWRITE | _PDCLIB_FAPPEND | _PDCLIB_FRW ) )
     {
         case _PDCLIB_FREAD: /* "r" */
             osmode = O_RDONLY;
@@ -53,14 +51,41 @@ int _PDCLIB_open( char const * const filename, unsigned int mode )
         default: /* Invalid mode */
             return -1;
     }
+    int rc;
     if ( osmode & O_CREAT )
     {
-        return open( filename, osmode, S_IRUSR | S_IWUSR );
+        rc = open( filename, osmode, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH );
     }
     else
     {
-        return open( filename, osmode );
+        rc = open( filename, osmode );
+    }
+    if ( rc == -1 )
+    {
+        switch ( errno )
+        {
+            case EACCES:
+            case EFAULT:
+            case EINTR:
+            case EISDIR:
+            case ELOOP:
+            case EMFILE:
+            case ENAMETOOLONG:
+            case ENFILE:
+            case ENODEV:
+            case ENOENT:
+            case ENOMEM:
+            case ENOSPC:
+            case ENOTDIR:
+            case EOVERFLOW:
+            case EROFS:
+            case ETXTBSY:
+                _PDCLIB_errno = _PDCLIB_EIO;
+            default:
+                _PDCLIB_errno = _PDCLIB_EUNKNOWN;
+        }
     }
+    return rc;
 }
 
 #endif
@@ -71,8 +96,6 @@ int _PDCLIB_open( char const * const filename, unsigned int mode )
 #include <stdlib.h>
 #include <string.h>
 
-#include <errno.h>
-
 int main( void )
 {
     /* This testdriver assumes POSIX, i.e. _PDCLIB_fd_t being int and being
@@ -80,27 +103,28 @@ int main( void )
     */
     int fh;
     char buffer[ 10 ];
+    remove( testfile );
     /* Trying to read non-existent file. */
-    TESTCASE( _PDCLIB_open( "testfile", _PDCLIB_FREAD ) == _PDCLIB_NOHANDLE );
+    TESTCASE( _PDCLIB_open( testfile, _PDCLIB_FREAD ) == _PDCLIB_NOHANDLE );
     /* Writing to file, trying to read from it. */
-    TESTCASE( ( fh = _PDCLIB_open( "testfile", _PDCLIB_FWRITE ) ) != _PDCLIB_NOHANDLE );
+    TESTCASE( ( fh = _PDCLIB_open( testfile, _PDCLIB_FWRITE ) ) != _PDCLIB_NOHANDLE );
     TESTCASE( write( fh, "test", 4 ) == 4 );
     TESTCASE( lseek( fh, 0, SEEK_SET ) == 0 );
     TESTCASE( read( fh, buffer, 4 ) == -1 );
     TESTCASE( _PDCLIB_close( fh ) == 0 );
     /* Reading from file, trying to write to it. */
-    TESTCASE( ( fh = _PDCLIB_open( "testfile", _PDCLIB_FREAD ) ) != _PDCLIB_NOHANDLE );
+    TESTCASE( ( fh = _PDCLIB_open( testfile, _PDCLIB_FREAD ) ) != _PDCLIB_NOHANDLE );
     TESTCASE( write( fh, "test", 4 ) == -1 );
     TESTCASE( _PDCLIB_close( fh ) == 0 );
     /* Appending to file, trying to read from it. */
-    TESTCASE( ( fh = _PDCLIB_open( "testfile", _PDCLIB_FAPPEND ) ) != _PDCLIB_NOHANDLE );
+    TESTCASE( ( fh = _PDCLIB_open( testfile, _PDCLIB_FAPPEND ) ) != _PDCLIB_NOHANDLE );
     TESTCASE( write( fh, "app", 3 ) == 3 );
     TESTCASE( lseek( fh, 0, SEEK_SET ) == 0 );
     TESTCASE( read( fh, buffer, 10 ) == -1 );
     TESTCASE( write( fh, "end", 3 ) == 3 );
     TESTCASE( _PDCLIB_close( fh ) == 0 );
     /* Reading and writing from file ("r+"). */
-    TESTCASE( ( fh = _PDCLIB_open( "testfile", _PDCLIB_FREAD | _PDCLIB_FRW ) ) != _PDCLIB_NOHANDLE );
+    TESTCASE( ( fh = _PDCLIB_open( testfile, _PDCLIB_FREAD | _PDCLIB_FRW ) ) != _PDCLIB_NOHANDLE );
     TESTCASE( read( fh, buffer, 10 ) == 10 );
     TESTCASE( memcmp( buffer, "testappend", 10 ) == 0 );
     TESTCASE( lseek( fh, 0, SEEK_SET ) == 0 );
@@ -110,7 +134,7 @@ int main( void )
     TESTCASE( memcmp( buffer, "wedoappend", 10 ) == 0 );
     TESTCASE( _PDCLIB_close( fh ) == 0 );
     /* Writing and reading from file ("w+"). */
-    TESTCASE( ( fh = _PDCLIB_open( "testfile", _PDCLIB_FWRITE | _PDCLIB_FRW ) ) != _PDCLIB_NOHANDLE );
+    TESTCASE( ( fh = _PDCLIB_open( testfile, _PDCLIB_FWRITE | _PDCLIB_FRW ) ) != _PDCLIB_NOHANDLE );
     TESTCASE( write( fh, "test", 4 ) == 4 );
     TESTCASE( lseek( fh, 1, SEEK_SET ) == 1 );
     TESTCASE( read( fh, buffer, 2 ) == 2 );
@@ -121,15 +145,16 @@ int main( void )
     TESTCASE( memcmp( buffer, "tessie", 6 ) == 0 );
     TESTCASE( _PDCLIB_close( fh ) == 0 );
     /* Appending and reading from file ("a+"). */
-    TESTCASE( ( fh = _PDCLIB_open( "testfile", _PDCLIB_FAPPEND | _PDCLIB_FRW ) ) != _PDCLIB_NOHANDLE );
+    TESTCASE( ( fh = _PDCLIB_open( testfile, _PDCLIB_FAPPEND | _PDCLIB_FRW ) ) != _PDCLIB_NOHANDLE );
     TESTCASE( write( fh, "baby", 4 ) == 4 );
     TESTCASE( lseek( fh, 0, SEEK_SET ) == 0 );
     TESTCASE( read( fh, buffer, 10 ) == 10 );
     TESTCASE( memcmp( buffer, "tessiebaby", 10 ) == 0 );
     TESTCASE( _PDCLIB_close( fh ) == 0 );
     /* Cleaning up. */
-    system( "rm testfile" );
+    TESTCASE( remove( testfile ) == 0 );
     return TEST_RESULTS;
 }
 
 #endif
+