X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffseek.c;h=44cc6fbf86a8ca2f8a80bbace841f84ebd3453ad;hb=3309ec3ad8a5db735eaa2de7f5dc6a331d8e7319;hp=d74d55292279cd03f4bdc9a7129d0751b66d9f4a;hpb=4721cb1b6b5a90da9b70d53569a3449cbd1f8cf7;p=pdclib.old

diff --git a/functions/stdio/fseek.c b/functions/stdio/fseek.c
index d74d552..44cc6fb 100644
--- a/functions/stdio/fseek.c
+++ b/functions/stdio/fseek.c
@@ -9,11 +9,11 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-#include <_PDCLIB_glue.h>
-
-int fseek( struct _PDCLIB_file_t * stream, long offset, int whence )
+int _PDCLIB_fseek_unlocked( FILE * stream, long loffset, int whence )
 {
+    _PDCLIB_int64_t offset = loffset;
     if ( stream->status & _PDCLIB_FWRITE )
     {
         if ( _PDCLIB_flushbuffer( stream ) == EOF )
@@ -26,9 +26,24 @@ int fseek( struct _PDCLIB_file_t * stream, long offset, int whence )
     {
         stream->status &= ~ ( _PDCLIB_FREAD | _PDCLIB_FWRITE );
     }
+
+    if ( whence == SEEK_CUR )
+    {
+        whence  = SEEK_SET;
+        offset += _PDCLIB_ftell64_unlocked( stream );
+    }
+
     return ( _PDCLIB_seek( stream, offset, whence ) != EOF ) ? 0 : EOF;
 }
 
+int fseek( FILE * stream, long loffset, int whence )
+{
+    _PDCLIB_flockfile( stream );
+    int r = _PDCLIB_fseek_unlocked( stream, loffset, whence );
+    _PDCLIB_funlockfile( stream );
+    return r;
+}
+
 #endif
 
 #ifdef TEST
@@ -38,7 +53,7 @@ int fseek( struct _PDCLIB_file_t * stream, long offset, int whence )
 int main( void )
 {
     FILE * fh;
-    TESTCASE( ( fh = fopen( testfile, "wb+" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( fwrite( teststring, 1, strlen( teststring ), fh ) == strlen( teststring ) );
     /* General functionality */
     TESTCASE( fseek( fh, -1, SEEK_END ) == 0  );
@@ -75,11 +90,20 @@ 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 );
     TESTCASE( fclose( fh ) == 0 );
-    remove( testfile );
     return TEST_RESULTS;
 }