X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffgetpos.c;h=ff88fba500ec7ac3793d49f9b7f455026464ccdb;hb=abc15df6b9fae3374d24c7cf5c3ab94c605b2a6d;hp=7e5fbe7068c23ab67d69a589693140d69b13b875;hpb=afde3daa4992d49e190a6e8677e7317e0d367c59;p=pdclib

diff --git a/functions/stdio/fgetpos.c b/functions/stdio/fgetpos.c
index 7e5fbe7..ff88fba 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,35 +7,44 @@
 #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
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 #include <string.h>
 
 int main( void )
 {
     FILE * fh;
     fpos_t pos1, pos2;
-    TESTCASE( ( fh = fopen( testfile, "wb+" ) ) != NULL );
+    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 );
     TESTCASE( fsetpos( fh, &pos2 ) == 0 );
     TESTCASE( (size_t)ftell( fh ) == strlen( teststring ) );
     TESTCASE( fclose( fh ) == 0 );
-    remove( testfile );
     return TEST_RESULTS;
 }