X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fsetvbuf.c;h=2c333382be537002c621b6299ff2fb14ae37545a;hb=55cf35957bf8dec0a489ba758c02c83303a5eb50;hp=a88a27fa547784313149ac3cd6b86e00537a85fe;hpb=1d9d92ba957a0b8307c9a65c35867fde68e6533b;p=pdclib

diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c
index a88a27f..2c33338 100644
--- a/functions/stdio/setvbuf.c
+++ b/functions/stdio/setvbuf.c
@@ -1,67 +1,115 @@
-/* ----------------------------------------------------------------------------
- * $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)
-{
-    char *mybuf;
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
 
-    if (mode == _IONBF)
-    {
-        stream->bufTech = mode;
-        return (0);
-    }
-    if (buf == NULL)
-    {
-        if (size < 2)
-        {
-            return (-1);
-        }
-        mybuf = malloc(size + 8);
-        if (mybuf == NULL)
-        {
-            return (-1);
-        }
-    }
-    else
-    {
-        if (size < 10)
-        {
-            return (-1);
-        }
-        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))
+#ifndef REGTEST
+
+int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mode, size_t size )
+{
+    switch ( mode )
     {
-        stream->quickBin = 0;
+        case _IONBF:
+            /* When unbuffered I/O is requested, we keep the buffer anyway, as
+               we don't want to e.g. flush the stream for every character of a
+               stream being printed.
+            */
+            /* TODO: Check this */
+            break;
+        case _IOFBF:
+        case _IOLBF:
+            if ( size > INT_MAX || size == 0 )
+            {
+                /* PDCLib only supports buffers up to INT_MAX in size. A size
+                   of zero doesn't make sense.
+                */
+                return -1;
+            }
+            if ( buf == NULL )
+            {
+                /* User requested buffer size, but leaves it to library to
+                   allocate the buffer.
+                */
+                /* If current buffer is big enough for requested size, but not
+                   over twice as big (and wasting memory space), we use the
+                   current buffer (i.e., do nothing), to save the malloc() / 
+                   free() overhead.
+                */
+                if ( ( stream->bufsize < size ) || ( stream->bufsize > ( size << 1 ) ) )
+                {
+                    /* Buffer too small, or much too large - allocate. */
+                    if ( ( buf = (char *) malloc( size ) ) == NULL )
+                    {
+                        /* Out of memory error. */
+                        return -1;
+                    }
+                    /* This buffer must be free()d on fclose() */
+                    stream->status |= _PDCLIB_FREEBUFFER;
+                }
+            }
+            stream->buffer = buf;
+            stream->bufsize = size;
+            break;
+        default:
+            /* If mode is something else than _IOFBF, _IOLBF or _IONBF -> exit */
+            return -1;
     }
-    return (0);
+    /* Deleting current buffer mode */
+    stream->status &= ~( _IOFBF | _IOLBF | _IONBF );
+    /* Set user-defined mode */
+    stream->status |= mode;
+    return 0;
 }
-*/
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+#include <errno.h>
+
+#define BUFFERSIZE 500
+
+int main( void )
+{
+#ifndef REGTEST
+    char buffer[ BUFFERSIZE ];
+    FILE * fh;
+    remove( testfile );
+    /* full buffered, user-supplied buffer */
+    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( setvbuf( fh, buffer, _IOFBF, BUFFERSIZE ) == 0 );
+    TESTCASE( fh->buffer == buffer );
+    TESTCASE( fh->bufsize == BUFFERSIZE );
+    TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOFBF );
+    TESTCASE( fclose( fh ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
+    /* line buffered, lib-supplied buffer */
+    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( setvbuf( fh, NULL, _IOLBF, BUFFERSIZE ) == 0 );
+    TESTCASE( fh->buffer != NULL );
+    TESTCASE( fh->bufsize == BUFFERSIZE );
+    TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IOLBF );
+    TESTCASE( fclose( fh ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
+    /* not buffered, user-supplied buffer */
+    TESTCASE( ( fh = fopen( testfile, "w" ) ) != NULL );
+    TESTCASE( setvbuf( fh, buffer, _IONBF, BUFFERSIZE ) == 0 );
+    TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IONBF );
+    TESTCASE( fclose( fh ) == 0 );
+    TESTCASE( remove( testfile ) == 0 );
+#else
+    puts( " NOTEST setvbuf() test driver is PDCLib-specific." );
+#endif
+    return TEST_RESULTS;
+}
+
+#endif
+