X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fsetvbuf.c;h=b07d87e3f847e32de5927b260f7c818a62571f0a;hb=HEAD;hp=125a73f8808a32d341cd67710c1f0c0d7b9694e2;hpb=0d54a75af25ca44411e7c4190cc2a93a390e61a2;p=pdclib.old

diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c
index 125a73f..b07d87e 100644
--- a/functions/stdio/setvbuf.c
+++ b/functions/stdio/setvbuf.c
@@ -11,9 +11,11 @@
 #include <limits.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mode, size_t size )
+int setvbuf( FILE * _PDCLIB_restrict stream, char * _PDCLIB_restrict buf, int mode, size_t size )
 {
+    _PDCLIB_flockfile( stream );
     switch ( mode )
     {
         case _IONBF:
@@ -24,11 +26,12 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
             break;
         case _IOFBF:
         case _IOLBF:
-            if ( size > INT_MAX || size == NULL )
+            if ( size > INT_MAX || size == 0 )
             {
                 /* PDCLib only supports buffers up to INT_MAX in size. A size
                    of zero doesn't make sense.
                 */
+                _PDCLIB_funlockfile( stream );
                 return -1;
             }
             if ( buf == NULL )
@@ -36,42 +39,37 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
                 /* 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 ) ) )
                 {
-                    /* 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.
-                    */
-                    /* Free the buffer allocated by fopen(), and allocate a new
-                       one.
-                    */
+                    /* Buffer too small, or much too large - allocate. */
                     if ( ( buf = (char *) malloc( size ) ) == NULL )
                     {
                         /* Out of memory error. */
+                        _PDCLIB_funlockfile( stream );
                         return -1;
                     }
+                    /* This buffer must be free()d on fclose() */
+                    stream->status |= _PDCLIB_FREEBUFFER;
                 }
             }
-            else
-            {
-                /* User provided buffer -> set flag to not free() the buffer
-                   on fclose().
-                */
-                stream->status &= ~ _PDCLIB_LIBBUFFER;
-            }
-            free( stream->buffer );
             stream->buffer = buf;
             stream->bufsize = size;
             break;
         default:
             /* If mode is something else than _IOFBF, _IOLBF or _IONBF -> exit */
+            _PDCLIB_funlockfile( stream );
             return -1;
     }
     /* Deleting current buffer mode */
     stream->status &= ~( _IOFBF | _IOLBF | _IONBF );
     /* Set user-defined mode */
     stream->status |= mode;
+    _PDCLIB_funlockfile( stream );
     return 0;
 }
 
@@ -79,40 +77,36 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
 
 #ifdef TEST
 #include <_PDCLIB_test.h>
-
 #include <errno.h>
-
+#ifndef REGTEST
+#include <_PDCLIB_io.h>
+#endif
 #define BUFFERSIZE 500
 
 int main( void )
 {
 #ifndef REGTEST
-    char const * const filename = "testfile";
     char buffer[ BUFFERSIZE ];
     FILE * fh;
-    remove( filename );
     /* full buffered, user-supplied buffer */
-    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != 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( filename ) == 0 );
     /* line buffered, lib-supplied buffer */
-    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != 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( filename ) == 0 );
     /* not buffered, user-supplied buffer */
-    TESTCASE( ( fh = fopen( filename, "w" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( setvbuf( fh, buffer, _IONBF, BUFFERSIZE ) == 0 );
     TESTCASE( ( fh->status & ( _IOFBF | _IONBF | _IOLBF ) ) == _IONBF );
     TESTCASE( fclose( fh ) == 0 );
-    TESTCASE( remove( filename ) == 0 );
 #else
     puts( " NOTEST setvbuf() test driver is PDCLib-specific." );
 #endif