X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fsetvbuf.c;h=5ac14a9357345653e7e64d7b980999c7d4b806b3;hb=d655f5154c5a3d21a6ca3e7ff2cee9ba5e2ad0b3;hp=9d96ad8f8583e3681e8bdfa8d162c613a6231cab;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c
index 9d96ad8..5ac14a9 100644
--- a/functions/stdio/setvbuf.c
+++ b/functions/stdio/setvbuf.c
@@ -11,20 +11,67 @@
 
 #ifndef REGTEST
 
-int setvbuf( FILE * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mode, size_t size )
+int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mode, size_t size )
 {
-    /* TODO: Only allowed on a "virgin" stream; add check. */
-    if ( ( stream->status & ( _IOFBF | _IOLBF | _IONBF ) ) /* Only allowed on "virgin" stream */
-      || ( ( mode != _IOFBF ) && ( mode != _IOLBF ) && ( mode != _IONBF ) ) /* invalid mode */
-      || ( ( buf == NULL ) && ( ( buf = malloc( size ) ) == NULL ) ) /* no memory available */
-    )
+    /* TODO: Honor user-provided buffer / buffer size. (Not actually required
+       by the standard...) */
+    stream->status &= ~( _IOFBF | _IOLBF | _IONBF );
+    stream->status |= mode; /* TODO: Unchecked use of mode -> vulnerable. */
+    return 0;
+
+#if 0
+    /* Only allowed on "virgin" streams (i.e., before first I/O occurs), a
+       valid value for mode, and only once per stream (i.e., the buffer
+       attached to the stream should always be the one allocated by fopen().
+    */
+    if ( ( ! stream->status & _PDCLIB_VIRGINSTR ) ||
+         ( ( mode != _IOFBF ) && ( mode != _IOLBF ) && ( mode != _IONBF ) ) ||
+         ! ( stream->status & _PDCLIB_LIBBUFFER ) )
     {
         return -1;
     }
+    if ( mode == _IONBF )
+    {
+        /* When unbuffered I/O is requested, we don't need a buffer. */
+        buf = NULL;
+        size = 0;
+    }
+    else
+    {
+        /* The standard does not really require this - only BUFSIZ is required
+           to be no smaller than 256 - but it makes sense not to make buffers
+           too small anyway.
+        */
+        if ( size < 256 )
+        {
+            buf = NULL; /* do not use too-small user buffer */
+            size = 256;
+        }
+    }
+    /* If a suitable buffer is provided by user... */
+    if ( buf != NULL )
+    {
+        /* ...do not free it in library functions like fclose(), freopen(). */
+        stream->status &= ~_PDCLIB_LIBBUFFER;
+    }
+    /* If we cannot allocate enough memory, that is not a reason for failure -
+       the standard does not actually *require* that setvbuf() honors user-
+       supplied buffer and buffer size, so we can quietly ignore this.
+    */
+    /* FIXME: Logic stops here. Handle _IONBF, new buf value etc. correctly. */
+    puts("foo");
+    if ( ( ( buf = malloc( size ) ) != NULL ) || ( mode == _IONBF ) )
+    {
+        free( stream->buffer );
+    }
+    puts("bar");
+    /* Applying new settings to stream. */
+    stream->status &= ~( _IOFBF | _IOLBF | _IONBF );
     stream->status |= mode;
-    stream->buffer  = buf;
     stream->bufsize = size;
+    stream->status &= ~_PDCLIB_VIRGINSTR;
     return 0;
+#endif
 }
 
 #endif
@@ -32,9 +79,47 @@ int setvbuf( FILE * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mo
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#define BUFFERSIZE 500
+
 int main( void )
 {
-    TESTCASE( NO_TESTDRIVER );
+#ifndef REGTEST
+    char const * const filename = "testfile";
+    char buffer[ BUFFERSIZE ];
+    struct _PDCLIB_file_t * fh;
+    /* full buffered, user-supplied buffer */
+    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( fh->status & _PDCLIB_LIBBUFFER );
+    TESTCASE( fh->bufsize == BUFSIZ );
+    TESTCASE( setvbuf( fh, buffer, _IOFBF, BUFFERSIZE ) == 0 );
+#if 0
+    TESTCASE( fh->buffer == buffer );
+    TESTCASE( fh->bufsize == BUFFERSIZE );
+#endif
+    TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOFBF );
+    TESTCASE( fclose( fh ) == 0 );
+    /* line buffered, lib-supplied buffer */
+    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( setvbuf( fh, NULL, _IOLBF, BUFFERSIZE ) == 0 );
+#if 0
+    TESTCASE( fh->buffer != buffer );
+    TESTCASE( fh->buffer != NULL );
+    TESTCASE( fh->bufsize == BUFFERSIZE );
+#endif
+    TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOLBF );
+    TESTCASE( fclose( fh ) == 0 );
+    /* not buffered, user-supplied buffer */
+    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( setvbuf( fh, buffer, _IONBF, BUFFERSIZE ) == 0 );
+#if 0
+    TESTCASE( fh->buffer == NULL );
+    TESTCASE( fh->bufsize == 0 );
+#endif
+    TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IONBF );
+    TESTCASE( fclose( fh ) == 0 );
+#else
+    puts( " NOTEST setvbuf() test driver is PDCLib-specific." );
+#endif
     return TEST_RESULTS;
 }