X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Fftell.c;h=27e25ee9e7f209ff247ff5a03417ef538538da5d;hb=dd71cbbfbd68cd8c653277a0c1f70ab2b179421c;hp=63c7f75e1d5de1ebf786a1d9e38e1c9b592a1492;hpb=50c9c6af3784c1fce7a82c50df1e7ef8f9b57bd4;p=pdclib

diff --git a/functions/stdio/ftell.c b/functions/stdio/ftell.c
index 63c7f75..27e25ee 100644
--- a/functions/stdio/ftell.c
+++ b/functions/stdio/ftell.c
@@ -13,17 +13,6 @@
 
 long int ftell( struct _PDCLIB_file_t * stream )
 {
-    /* If offset is too large for return type, report error instead of wrong
-       offset value.
-       FIXME: A bit too fuzzy in the head right now; stream->ungetidx should be
-       in here somewhere.
-    */
-    if ( stream->pos.offset > ( LONG_MAX - stream->bufidx ) )
-    {
-        /* integer overflow */
-        _PDCLIB_errno = _PDCLIB_EINVAL;
-        return -1;
-    }
     /* ftell() must take into account:
        - the actual *physical* offset of the file, i.e. the offset as recognized
          by the operating system (and stored in stream->pos.offset); and
@@ -39,7 +28,17 @@ long int ftell( struct _PDCLIB_file_t * stream )
            i.e. unprocessed bytes as positive number.
        That is how the somewhat obscure return-value calculation works.
     */
-    return (long int)( stream->pos.offset - ( ( stream->bufend - stream->bufidx ) + stream->ungetidx ) );
+    /*  If offset is too large for return type, report error instead of wrong
+        offset value.
+    */
+    /* TODO: Check what happens when ungetc() is called on a stream at offset 0 */
+    if ( ( stream->pos.offset - stream->bufend ) > ( LONG_MAX - ( stream->bufidx - stream->ungetidx ) ) )
+    {
+        /* integer overflow */
+        _PDCLIB_errno = _PDCLIB_ERANGE;
+        return -1;
+    }
+    return (long int)( stream->pos.offset - ( ( (int)stream->bufend - (int)stream->bufidx ) + stream->ungetidx ) );
 }
 
 #endif
@@ -63,6 +62,13 @@ int main( void )
     FILE * fh;
     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' );