_PDCLIB_flushbuffer for win32. correct seeking behaviour.

[pdclib] / functions / _PDCLIB / filemode.c

diff --git a/functions/_PDCLIB/filemode.c b/functions/_PDCLIB/filemode.c
index 460cc6e4cfb5ec0dc2bdf53ae194ada37e303236..454810626d74a616dc47a75380487a2976560033 100644 (file)
--- a/functions/_PDCLIB/filemode.c
+++ b/functions/_PDCLIB/filemode.c
@@ -6,17 +6,18 @@
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#ifndef REGTEST
-
 #include <stddef.h>
 
+#ifndef REGTEST
 /* Helper function that parses the C-style mode string passed to fopen() into
    the PDCLib flags FREAD, FWRITE, FAPPEND, FRW (read-write) and FBIN (binary
    mode).
 */
 unsigned int _PDCLIB_filemode( char const * const mode )
 {
-    int rc = 0;
+    if(!mode) return 0;
+
+    unsigned rc = 0;
     switch ( mode[0] )
     {
         case 'r':
@@ -26,7 +27,7 @@ unsigned int _PDCLIB_filemode( char const * const mode )
             rc |= _PDCLIB_FWRITE;
             break;
         case 'a':
-            rc |= _PDCLIB_FAPPEND;
+            rc |= _PDCLIB_FAPPEND | _PDCLIB_FWRITE;
             break;
         default:
             /* Other than read, write, or append - invalid */
@@ -55,7 +56,6 @@ unsigned int _PDCLIB_filemode( char const * const mode )
     /* Longer than three chars - invalid. */
     return 0;
 }
-
 #endif
 
 #ifdef TEST
@@ -66,23 +66,26 @@ int main( void )
 #ifndef REGTEST
     TESTCASE( _PDCLIB_filemode( "r" ) == _PDCLIB_FREAD );
     TESTCASE( _PDCLIB_filemode( "w" ) == _PDCLIB_FWRITE );
-    TESTCASE( _PDCLIB_filemode( "a" ) == _PDCLIB_FAPPEND );
+    TESTCASE( _PDCLIB_filemode( "a" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FWRITE ) );
     TESTCASE( _PDCLIB_filemode( "r+" ) == ( _PDCLIB_FREAD | _PDCLIB_FRW ) );
     TESTCASE( _PDCLIB_filemode( "w+" ) == ( _PDCLIB_FWRITE | _PDCLIB_FRW ) );
-    TESTCASE( _PDCLIB_filemode( "a+" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FRW ) );
+    TESTCASE( _PDCLIB_filemode( "a+" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FWRITE | _PDCLIB_FRW ) );
     TESTCASE( _PDCLIB_filemode( "rb" ) == ( _PDCLIB_FREAD | _PDCLIB_FBIN ) );
     TESTCASE( _PDCLIB_filemode( "wb" ) == ( _PDCLIB_FWRITE | _PDCLIB_FBIN ) );
-    TESTCASE( _PDCLIB_filemode( "ab" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FBIN ) );
+    TESTCASE( _PDCLIB_filemode( "ab" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FWRITE | _PDCLIB_FBIN ) );
     TESTCASE( _PDCLIB_filemode( "r+b" ) == ( _PDCLIB_FREAD | _PDCLIB_FRW | _PDCLIB_FBIN ) );
     TESTCASE( _PDCLIB_filemode( "w+b" ) == ( _PDCLIB_FWRITE | _PDCLIB_FRW | _PDCLIB_FBIN ) );
-    TESTCASE( _PDCLIB_filemode( "a+b" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FRW | _PDCLIB_FBIN ) );
+    TESTCASE( _PDCLIB_filemode( "a+b" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FWRITE | _PDCLIB_FRW | _PDCLIB_FBIN ) );
     TESTCASE( _PDCLIB_filemode( "rb+" ) == ( _PDCLIB_FREAD | _PDCLIB_FRW | _PDCLIB_FBIN ) );
     TESTCASE( _PDCLIB_filemode( "wb+" ) == ( _PDCLIB_FWRITE | _PDCLIB_FRW | _PDCLIB_FBIN ) );
-    TESTCASE( _PDCLIB_filemode( "ab+" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FRW | _PDCLIB_FBIN ) );
-#else
-    puts( " NOTEST fopen() test driver is PDCLib-specific." );
+    TESTCASE( _PDCLIB_filemode( "ab+" ) == ( _PDCLIB_FAPPEND | _PDCLIB_FWRITE | _PDCLIB_FRW | _PDCLIB_FBIN ) );
+    TESTCASE( _PDCLIB_filemode( "x" ) == 0 );
+    TESTCASE( _PDCLIB_filemode( "r++" ) == 0 );
+    TESTCASE( _PDCLIB_filemode( "wbb" ) == 0 );
+    TESTCASE( _PDCLIB_filemode( "a+bx" ) == 0 );
 #endif
     return TEST_RESULTS;
 }
 
 #endif
+