X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fftell.c;h=74bb902407a4672dfcb3c4beacc8519b16ab11ab;hb=6ca24b75c75b9c6f22e1e69693d326b8e3330841;hp=9ca449fe54a155d14bb747f0dca137aac8ede6c5;hpb=393020b6e48719d27699dea6b29e53025bbd5123;p=pdclib

diff --git a/functions/stdio/ftell.c b/functions/stdio/ftell.c
index 9ca449f..74bb902 100644
--- a/functions/stdio/ftell.c
+++ b/functions/stdio/ftell.c
@@ -7,26 +7,31 @@
 */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <limits.h>
+#include <errno.h>
 
 #ifndef REGTEST
 
-long int ftell( struct _PDCLIB_file_t * stream )
+long int ftell_unlocked( struct _PDCLIB_file_t * stream )
 {
-    /* TODO: A bit too fuzzy in the head now. stream->ungetidx should be in here
-             somewhere.
-    */
-    if ( stream->pos.offset > ( LONG_MAX - stream->bufidx ) )
+    uint_fast64_t off64 = _PDCLIB_ftell64_unlocked( stream );
+
+    if ( off64 > LONG_MAX )
     {
         /* integer overflow */
-        _PDCLIB_errno = _PDCLIB_EINVAL;
+        errno = ERANGE;
         return -1;
     }
-    /* Position of start-of-buffer, plus:
-       - buffered, unwritten content (for output streams), or
-       - already-parsed content from buffer (for input streams)
-    */
-    return (long int)( stream->pos.offset + stream->bufidx - stream->ungetidx );
+    return off64;
+}
+
+long int ftell( struct _PDCLIB_file_t * stream )
+{
+    flockfile( stream );
+    long int off = ftell_unlocked( stream );
+    funlockfile( stream );
+    return off;
 }
 
 #endif
@@ -44,13 +49,19 @@ int main( void )
     */
     /* The following functions delegate their tests to here:
        fgetc fflush rewind fputc ungetc fseek
-       flushbuffer seek fillbuffer
+       flushbuffer seek fillbuffer prepread prepwrite
     */
     char * buffer = (char*)malloc( 4 );
     FILE * fh;
-    remove( "testfile" );
-    TESTCASE( ( fh = fopen( "testfile", "w+" ) ) != NULL );
+    TESTCASE( ( fh = tmpfile() ) != NULL );
     TESTCASE( setvbuf( fh, buffer, _IOLBF, 4 ) == 0 );
+    /* Testing ungetc() at offset 0 */
+    rewind( fh );
+    TESTCASE( ungetc( 'x', fh ) == 'x' );
+    TESTCASE( ftell( fh ) == -1l );
+    rewind( fh );
+    TESTCASE( ftell( fh ) == 0l );
+    /* Commence "normal" tests */
     TESTCASE( fputc( '1', fh ) == '1' );
     TESTCASE( fputc( '2', fh ) == '2' );
     TESTCASE( fputc( '3', fh ) == '3' );
@@ -75,9 +86,8 @@ int main( void )
     TESTCASE_NOREG( fh->bufidx == 0 );
     /* Reading back first character after rewind for basic read check */
     TESTCASE( fgetc( fh ) == '1' );
-    TESTCASE( fclose( fh ) == 0 );
     /* TODO: t.b.c. */
-    remove( "testfile" );
+    TESTCASE( fclose( fh ) == 0 );
     return TEST_RESULTS;
 }