X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdio%2Frename.c;h=2a34fe698f6704f1e9c626cf16bb9161fdc97e0f;hb=b189506b1b895940933bdfc5d6d6ae5d0ba65721;hp=66ba2b8fbfce0b0c0905f6b27166129c43121c3c;hpb=f9f9ce7e59f5e144c6506e516454f2acc26cdbeb;p=pdclib

diff --git a/functions/stdio/rename.c b/functions/stdio/rename.c
index 66ba2b8..2a34fe6 100644
--- 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 );
 }
 
@@ -22,14 +35,53 @@ int rename( const char * old, const char * new )
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
+#include <stdlib.h>
+
 int main( void )
 {
+    char filename1[] = "touch testfile1";
+    char filename2[] = "testfile2";
+    FILE * file;
+    remove( filename1 + 6 );
+    remove( filename2 );
+    /* make sure that neither file exists */
+    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
+    TESTCASE( fopen( filename2, "r" ) == NULL );
+    /* rename file 1 to file 2 - expected to fail */
+    TESTCASE( rename( filename1 + 6, filename2 ) == -1 );
+    /* create file 1 */
+    system( filename1 );
+    /* check that file 1 exists */
+    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( ( file = fopen( filename2, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
+    /* create another file 1 */
+    system( filename1 );
+    /* check that file 1 exists */
+    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.
+    */
 #ifndef REGTEST
-    TESTCASE( NO_TESTDRIVER );
+    TESTCASE( rename( filename1 + 6, filename2 ) == -1 );
 #else
-    puts( " NOTEST rename() test driver is PDCLib-specific." );
+    /* glibc rename() overwrites existing destination file. */
+    TESTCASE( rename( filename1 + 6, filename2 ) == 0 );
 #endif
+    /* remove both files */
+    remove( filename1 + 6 );
+    remove( filename2 );
+    /* check that they're gone */
+    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
+    TESTCASE( fopen( filename2, "r" ) == NULL );
     return TEST_RESULTS;
 }
 
 #endif
+