Some cleanups.

[pdclib] / functions / stdio / rename.c

diff --git a/functions/stdio/rename.c b/functions/stdio/rename.c
index 3f9152dca7a5d2fb07f1eaa0b558910f040ceb2e..2a34fe698f6704f1e9c626cf16bb9161fdc97e0f 100644 (file)
--- a/functions/stdio/rename.c
+++ b/functions/stdio/rename.c
@@ -11,9 +11,22 @@
 #ifndef REGTEST
 #include <_PDCLIB_glue.h>
 
+#include <string.h>
+
+extern struct _PDCLIB_file_t * _PDCLIB_filelist;
+
 int rename( const char * old, const char * new )
 {
-    /* TODO: Search open file list, flush and close file */
+    struct _PDCLIB_file_t * current = _PDCLIB_filelist;
+    while ( current != NULL )
+    {
+        if ( ( current->filename != NULL ) && ( strcmp( current->filename, old ) == 0 ) )
+        {
+            /* File of that name currently open. Do not rename. */
+            return EOF;
+        }
+        current = current->next;
+    }
     return _PDCLIB_rename( old, new );
 }
 
@@ -26,9 +39,9 @@ int rename( const char * old, const char * new )
 
 int main( void )
 {
-    /* TODO: Extend to internal testing (buffer etc.) */
     char filename1[] = "touch testfile1";
     char filename2[] = "testfile2";
+    FILE * file;
     remove( filename1 + 6 );
     remove( filename2 );
     /* make sure that neither file exists */
@@ -39,16 +52,19 @@ int main( void )
     /* create file 1 */
     system( filename1 );
     /* check that file 1 exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) != NULL );
+    TESTCASE( ( file = fopen( filename1 + 6, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* rename file 1 to file 2 */
     TESTCASE( rename( filename1 + 6, filename2 ) == 0 );
     /* check that file 2 exists, file 1 does not */
     TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
-    TESTCASE( fopen( filename2, "r" ) != NULL );
+    TESTCASE( ( file = fopen( filename2, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* create another file 1 */
     system( filename1 );
     /* check that file 1 exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) != NULL );
+    TESTCASE( ( file = fopen( filename1 + 6, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* rename file 1 to file 2 - expected to fail, see comment in
        _PDCLIB_rename() itself.
     */