X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fsetvbuf.c;h=0cd942285553ae77ec6ce9ff59b8efc871b61ce0;hb=e1c526e9bad3f6e69391e94059096145390508d3;hp=e3f9278aed159a316ab9e3da1883ff52ee12767e;hpb=dd71cbbfbd68cd8c653277a0c1f70ab2b179421c;p=pdclib

diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c
index e3f9278..0cd9422 100644
--- a/functions/stdio/setvbuf.c
+++ b/functions/stdio/setvbuf.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* setvbuf( FILE *, char *, int, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -11,9 +9,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:
@@ -29,6 +29,7 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
                 /* 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 )
@@ -47,6 +48,7 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
                     if ( ( buf = (char *) malloc( size ) ) == NULL )
                     {
                         /* Out of memory error. */
+                        _PDCLIB_funlockfile( stream );
                         return -1;
                     }
                     /* This buffer must be free()d on fclose() */
@@ -58,12 +60,14 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res
             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;
 }
 
@@ -71,9 +75,10 @@ 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 )