X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffgetpos.c;h=e14012ee25b9d4331010016e3fe95e958167ece5;hb=5b64e18a94a184cc73392d563a1f3e0dbd3bdbf8;hp=248fb356a0f07d5fb6ef91c904b97de758212ee4;hpb=a7a8d2f1c85c2d7760d4d3479e90466cc3a81b04;p=pdclib

diff --git a/functions/stdio/fgetpos.c b/functions/stdio/fgetpos.c
index 248fb35..e14012e 100644
--- a/functions/stdio/fgetpos.c
+++ b/functions/stdio/fgetpos.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* fgetpos( FILE * , fpos_t * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -9,15 +7,24 @@
 #include <stdio.h>
 
 #ifndef REGTEST
+#include <_PDCLIB_io.h>
 
-int fgetpos( struct _PDCLIB_file_t * _PDCLIB_restrict stream, struct _PDCLIB_fpos_t * _PDCLIB_restrict pos )
+int _PDCLIB_fgetpos_unlocked( FILE * _PDCLIB_restrict stream, _PDCLIB_fpos_t * _PDCLIB_restrict pos )
 {
     pos->offset = stream->pos.offset + stream->bufidx - stream->ungetidx;
-    pos->status = stream->pos.status;
+    pos->mbs    = stream->pos.mbs;
     /* TODO: Add mbstate. */
     return 0;
 }
 
+int fgetpos( FILE * _PDCLIB_restrict stream, _PDCLIB_fpos_t * _PDCLIB_restrict pos )
+{
+    _PDCLIB_flockfile( stream );
+    int res = _PDCLIB_fgetpos_unlocked( stream, pos );
+    _PDCLIB_funlockfile( stream );
+    return res;
+}
+
 #endif
 
 #ifdef TEST
@@ -31,6 +38,7 @@ int main( void )
     TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( fgetpos( fh, &pos1 ) == 0 );
     TESTCASE( fwrite( teststring, 1, strlen( teststring ), fh ) == strlen( teststring ) );
+    TESTCASE( (size_t)ftell( fh ) == strlen( teststring ) );
     TESTCASE( fgetpos( fh, &pos2 ) == 0 );
     TESTCASE( fsetpos( fh, &pos1 ) == 0 );
     TESTCASE( ftell( fh ) == 0 );