PDCLIB-16: Add _unlocked variations of all I/O routines; move work into these versions

[pdclib] / functions / stdio / fseek.c

diff --git a/functions/stdio/fseek.c b/functions/stdio/fseek.c
index 18c38c324ecc7dbacaa8fe734550360f28a4f0f9..c897325509b4421e7277d8eb4f77b1dc9f5738b8 100644 (file)
--- a/functions/stdio/fseek.c
+++ b/functions/stdio/fseek.c
@@ -12,7 +12,7 @@
 
 #include <_PDCLIB_glue.h>
 
-int fseek( struct _PDCLIB_file_t * stream, long loffset, int whence )
+int fseek_unlocked( struct _PDCLIB_file_t * stream, long loffset, int whence )
 {
     _PDCLIB_int64_t offset = loffset;
     if ( stream->status & _PDCLIB_FWRITE )
@@ -31,12 +31,20 @@ int fseek( struct _PDCLIB_file_t * stream, long loffset, int whence )
     if ( whence == SEEK_CUR )
     {
         whence  = SEEK_SET;
-        offset += stream->pos.offset;
+        offset += _PDCLIB_ftell64( stream );
     }
 
     return ( _PDCLIB_seek( stream, offset, whence ) != EOF ) ? 0 : EOF;
 }
 
+int fseek( struct _PDCLIB_file_t * stream, long loffset, int whence )
+{
+    flockfile( stream );
+    int r = fseek_unlocked( stream, loffset, whence );
+    funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST
@@ -83,6 +91,16 @@ int main( void )
     TESTCASE( ftell( fh ) == 2 );
     TESTCASE( fseek( fh, 2, SEEK_SET ) == 0 );
     TESTCASE( fgetc( fh ) == teststring[2] );
+    /* PDCLIB-7: Check that we handle the underlying file descriptor correctly
+     *           in the SEEK_CUR case */
+    TESTCASE( fseek( fh, 10, SEEK_SET ) == 0 );
+    TESTCASE( ftell( fh ) == 10l );
+    TESTCASE( fseek( fh, 0, SEEK_CUR ) == 0 );
+    TESTCASE( ftell( fh ) == 10l );
+    TESTCASE( fseek( fh, 2, SEEK_CUR ) == 0 );
+    TESTCASE( ftell( fh ) == 12l );
+    TESTCASE( fseek( fh, -1, SEEK_CUR ) == 0 );
+    TESTCASE( ftell( fh ) == 11l );
     /* Checking error handling */
     TESTCASE( fseek( fh, -5, SEEK_SET ) == -1 );
     TESTCASE( fseek( fh, 0, SEEK_END ) == 0 );