X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Ffilemode.c;h=d160f39d3d6437c469d927143a89a9b6ea56d794;hb=b1fc26afebd4d557ff89a44bc21767a8704c3809;hp=460cc6e4cfb5ec0dc2bdf53ae194ada37e303236;hpb=d9e48b611b63bcfc55727463cb9d9d0e87a7a405;p=pdclib

diff --git a/functions/_PDCLIB/filemode.c b/functions/_PDCLIB/filemode.c
index 460cc6e..d160f39 100644
--- a/functions/_PDCLIB/filemode.c
+++ b/functions/_PDCLIB/filemode.c
@@ -1,13 +1,9 @@
-/* $Id$ */
-
 /* _PDCLIB_filemode( const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#ifndef REGTEST
-
 #include <stddef.h>
 
 /* Helper function that parses the C-style mode string passed to fopen() into
@@ -16,7 +12,7 @@
 */
 unsigned int _PDCLIB_filemode( char const * const mode )
 {
-    int rc = 0;
+    unsigned rc = 0;
     switch ( mode[0] )
     {
         case 'r':
@@ -26,7 +22,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 */
@@ -56,33 +52,32 @@ unsigned int _PDCLIB_filemode( char const * const mode )
     return 0;
 }
 
-#endif
-
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
 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." );
-#endif
+    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 );
     return TEST_RESULTS;
 }
 
 #endif
+