X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdio%2Frename.c;h=409005f933776055198186e34713cf6f1ab9bd3f;hp=f3ff01ee604a44ba46fc65c4802d8c17ef22ba9a;hb=55cf35957bf8dec0a489ba758c02c83303a5eb50;hpb=f0ac10970fd7b6bca57495e1aa41517c1e673110

diff --git a/functions/stdio/rename.c b/functions/stdio/rename.c
index f3ff01e..409005f 100644
--- a/functions/stdio/rename.c
+++ b/functions/stdio/rename.c
@@ -11,60 +11,75 @@
 #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 );
 }
 
 #endif
 
 #ifdef TEST
-/* TODO: Work around the following undef */
-#undef SEEK_SET
 #include <_PDCLIB_test.h>
 
 #include <stdlib.h>
 
 int main( void )
 {
-    /* TODO: Extend to internal testing (buffer etc.) */
-    char filename1[] = "touch testfile1";
-    char filename2[] = "testfile2";
-    /* check that neither file exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
-    TESTCASE( fopen( filename2, "r" ) == NULL );
+    FILE * file;
+    remove( testfile1 );
+    remove( testfile2 );
+    /* make sure that neither file exists */
+    TESTCASE( fopen( testfile1, "r" ) == NULL );
+    TESTCASE( fopen( testfile2, "r" ) == NULL );
     /* rename file 1 to file 2 - expected to fail */
-    TESTCASE( rename( filename1 + 6, filename2 ) == -1 );
+    TESTCASE( rename( testfile1, testfile2 ) == -1 );
     /* create file 1 */
-    system( filename1 );
+    TESTCASE( ( file = fopen( testfile1, "w" ) ) != NULL );
+    TESTCASE( fputs( "x", file ) != EOF );
+    TESTCASE( fclose( file ) == 0 );
     /* check that file 1 exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) != NULL );
+    TESTCASE( ( file = fopen( testfile1, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* rename file 1 to file 2 */
-    TESTCASE( rename( filename1 + 6, filename2 ) == 0 );
+    TESTCASE( rename( testfile1, testfile2 ) == 0 );
     /* check that file 2 exists, file 1 does not */
-    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
-    TESTCASE( fopen( filename2, "r" ) != NULL );
+    TESTCASE( fopen( testfile1, "r" ) == NULL );
+    TESTCASE( ( file = fopen( testfile2, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* create another file 1 */
-    system( filename1 );
+    TESTCASE( ( file = fopen( testfile1, "w" ) ) != NULL );
+    TESTCASE( fputs( "x", file ) != EOF );
+    TESTCASE( fclose( file ) == 0 );
     /* check that file 1 exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) != NULL );
+    TESTCASE( ( file = fopen( testfile1, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* rename file 1 to file 2 - expected to fail, see comment in
        _PDCLIB_rename() itself.
     */
-#ifndef REGTEST
-    TESTCASE( rename( filename1 + 6, filename2 ) == -1 );
-#else
-    /* glibc rename() overwrites existing destination file. */
-    TESTCASE( rename( filename1 + 6, filename2 ) == 0 );
-#endif
+    /* NOREG as glibc overwrites existing destination file. */
+    TESTCASE_NOREG( rename( testfile1, testfile2 ) == -1 );
     /* remove both files */
-    remove( filename1 + 6 );
-    remove( filename2 );
+    remove( testfile1 );
+    remove( testfile2 );
     /* check that they're gone */
-    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
-    TESTCASE( fopen( filename2, "r" ) == NULL );
+    TESTCASE( fopen( testfile1, "r" ) == NULL );
+    TESTCASE( fopen( testfile2, "r" ) == NULL );
     return TEST_RESULTS;
 }
 
 #endif
+