X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Ffclose.c;h=0b4233034afe5b79b7fe0bccfa8b2c477e8b2654;hb=d9e48b611b63bcfc55727463cb9d9d0e87a7a405;hp=446b8ee471efe56edea8f05b8a1c2289dd2d1f39;hpb=0a5395faab237ba9008352b0f4bee9659bbd3d5f;p=pdclib

diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c
index 446b8ee..0b42330 100644
--- a/functions/stdio/fclose.c
+++ b/functions/stdio/fclose.c
@@ -1,43 +1,77 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
-
-int fclose( FILE * stream ) { /* TODO */ };
-
-/* PDPC code - unreviewed.
-Read the note in fopen.c.
-int fclose(FILE *stream)
-{
-#ifdef __OS2__
-    APIRET rc;
-#endif
+/* $Id$ */
 
-    fflush(stream);
-#ifdef __OS2__
-    rc = DosClose(stream->hfile);
-#endif
-#ifdef __MSDOS__
-    __close(stream->hfile);
-#endif
-#ifdef __MVS__
-    __aclose(stream->hfile);
-#endif
-    __userFiles[stream->intFno] = NULL;
-    if (!stream->theirBuffer)
-    {
-        free(stream->intBuffer);
-    }
-    free(stream);
-#ifdef __OS2__
-    if (rc != 0)
+/* fclose( FILE * )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef REGTEST
+#include <_PDCLIB_glue.h>
+
+extern struct _PDCLIB_file_t * _PDCLIB_filelist;
+
+/* FIXME: Last file not removed from list. */
+int fclose( struct _PDCLIB_file_t * stream )
+{
+    struct _PDCLIB_file_t * current = _PDCLIB_filelist;
+    struct _PDCLIB_file_t * previous = NULL;
+    /* Checking that the FILE handle is actually one we had opened before. */
+    while ( current != NULL )
     {
-        errno = rc;
-        return (EOF);
+        if ( stream == current )
+        {
+            if ( stream->status & _PDCLIB_WROTELAST ) fflush( stream );
+            if ( stream->status & _PDCLIB_LIBBUFFER ) free( stream->buffer );
+            _PDCLIB_close( stream->handle );
+            if ( previous != NULL )
+            {
+                previous->next = stream->next;
+            }
+            else
+            {
+                _PDCLIB_filelist = stream->next;
+            }
+            free( stream );
+            return 0;
+        }
+        previous = current;
+        current = current->next;
     }
+    return -1;
+}
+
 #endif
-    return (0);
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+#ifndef REGTEST
+    struct _PDCLIB_file_t * file1;
+    struct _PDCLIB_file_t * file2;
+    TESTCASE( _PDCLIB_filelist == NULL );
+    TESTCASE( ( file1 = fopen( "testfile1", "w" ) ) != NULL );
+    TESTCASE( _PDCLIB_filelist == file1 );
+    TESTCASE( ( file2 = fopen( "testfile2", "w" ) ) != NULL );
+    TESTCASE( _PDCLIB_filelist == file2 );
+    TESTCASE( fclose( file2 ) == 0 );
+    TESTCASE( _PDCLIB_filelist == file1 );
+    TESTCASE( ( file2 = fopen( "testfile1", "w" ) ) != NULL );
+    TESTCASE( _PDCLIB_filelist == file2 );
+    TESTCASE( fclose( file1 ) == 0 );
+    TESTCASE( _PDCLIB_filelist == file2 );
+    TESTCASE( fclose( file2 ) == 0 );
+    TESTCASE( _PDCLIB_filelist == NULL );
+    system( "rm testfile1 testfile2" );
+#else
+    puts( " NOTEST fclose() test driver is PDCLib-specific." );
+#endif
+    return TEST_RESULTS;
 }
-*/
+
+#endif