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

diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c
index 2f9b4c4..5ac14a9 100644
--- a/functions/stdio/setvbuf.c
+++ b/functions/stdio/setvbuf.c
@@ -1,67 +1,126 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-int setvbuf( FILE * restrict stream, char * restrict buf, int mode, size_t size ) { /* TODO */ };
+/* setvbuf( FILE *, char *, int, size_t )
 
-/* PDPC code - unreviewed
-/*
-NULL + F = allocate, setup
-NULL + L = allocate, setup
-NULL + N = ignore, return success
-buf  + F = setup
-buf  + L = setup
-buf  + N = ignore, return success
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
 */
 
-int setvbuf(FILE *stream, char *buf, int mode, size_t size)
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef REGTEST
+
+int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mode, size_t size )
 {
-    char *mybuf;
+    /* 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 (mode == _IONBF)
+#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 ) )
     {
-        stream->bufTech = mode;
-        return (0);
+        return -1;
     }
-    if (buf == NULL)
+    if ( mode == _IONBF )
     {
-        if (size < 2)
-        {
-            return (-1);
-        }
-        mybuf = malloc(size + 8);
-        if (mybuf == NULL)
-        {
-            return (-1);
-        }
+        /* When unbuffered I/O is requested, we don't need a buffer. */
+        buf = NULL;
+        size = 0;
     }
     else
     {
-        if (size < 10)
+        /* 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 )
         {
-            return (-1);
+            buf = NULL; /* do not use too-small user buffer */
+            size = 256;
         }
-        mybuf = buf;
-        stream->theirBuffer = 1;
-        size -= 8;
     }
-    free(stream->intBuffer);
-    stream->intBuffer = mybuf;
-    stream->fbuf = stream->intBuffer + 2;
-    *stream->fbuf++ = '\0';
-    *stream->fbuf++ = '\0';
-    stream->szfbuf = size;
-    stream->endbuf = stream->fbuf + stream->szfbuf;
-    *stream->endbuf = '\n';
-    stream->upto = stream->endbuf;
-    stream->bufTech = mode;
-    if (!stream->textMode && (stream->bufTech == _IOLBF))
+    /* 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 ) )
     {
-        stream->quickBin = 0;
+        free( stream->buffer );
     }
-    return (0);
+    puts("bar");
+    /* Applying new settings to stream. */
+    stream->status &= ~( _IOFBF | _IOLBF | _IONBF );
+    stream->status |= mode;
+    stream->bufsize = size;
+    stream->status &= ~_PDCLIB_VIRGINSTR;
+    return 0;
+#endif
 }
-*/
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+#define BUFFERSIZE 500
+
+int main( void )
+{
+#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;
+}
+
+#endif