X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fstdio%2Ffseek.c;h=8e10c2ba007f49cd599c7c5fc62275995076e729;hb=05556502a427911d4499c22b809ca7d366327d7c;hp=18c38c324ecc7dbacaa8fe734550360f28a4f0f9;hpb=852ad49d5888724e4e4f82a6d51d13b0e8029e28;p=pdclib

diff --git a/functions/stdio/fseek.c b/functions/stdio/fseek.c
index 18c38c3..8e10c2b 100644
--- a/functions/stdio/fseek.c
+++ b/functions/stdio/fseek.c
@@ -31,7 +31,7 @@ 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;
@@ -83,6 +83,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 );