X-Git-Url: https://pd.if.org/git/?p=pdclib.old;a=blobdiff_plain;f=platform%2Fexample_cygwin%2Ffunctions%2F_PDCLIB%2Frename.c;h=e8e7cb179bfe36da140eed3ce3c3336195dea958;hp=3f770c9cc54cc32cc49ac3e47b6f5a586b4837e4;hb=fa385ff36986ad3167e9cd9f74724d53c42ed3e4;hpb=f0c4a925a835e6efd444b2de5406219551dc65d4

diff --git a/platform/example_cygwin/functions/_PDCLIB/rename.c b/platform/example_cygwin/functions/_PDCLIB/rename.c
index 3f770c9..e8e7cb1 100644
--- a/platform/example_cygwin/functions/_PDCLIB/rename.c
+++ b/platform/example_cygwin/functions/_PDCLIB/rename.c
@@ -90,38 +90,39 @@ int _PDCLIB_rename( const char * old, const char * new )
 
 int main( void )
 {
-    char filename1[] = "touch testfile1";
-    char filename2[] = "testfile2";
-    remove( filename1 + 6 );
-    remove( filename2 );
+    FILE * file;
+    remove( testfile1 );
+    remove( testfile2 );
     /* check that neither file exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
-    TESTCASE( fopen( filename2, "r" ) == NULL );
+    TESTCASE( fopen( testfile1, "r" ) == NULL );
+    TESTCASE( fopen( testfile2, "r" ) == NULL );
     /* rename file 1 to file 2 - expected to fail */
-    TESTCASE( _PDCLIB_rename( filename1 + 6, filename2 ) == -1 );
+    TESTCASE( _PDCLIB_rename( testfile1, testfile2 ) == -1 );
     /* create file 1 */
-    system( filename1 );
+    TESTCASE( ( file = fopen( testfile1, "w" ) ) != NULL );
+    TESTCASE( fputc( 'x', file ) == 'x' );
+    TESTCASE( fclose( file ) == 0 );
     /* check that file 1 exists */
-    TESTCASE( fopen( filename1 + 6, "r" ) != NULL );
+    TESTCASE( fopen( testfile1, "r" ) != NULL );
     /* rename file 1 to file 2 */
-    TESTCASE( _PDCLIB_rename( filename1 + 6, filename2 ) == 0 );
+    TESTCASE( _PDCLIB_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( fopen( testfile2, "r" ) != NULL );
     /* create another file 1 */
-    system( filename1 );
+    TESTCASE( ( file = fopen( testfile1, "w" ) ) != NULL );
+    TESTCASE( fputc( 'x', file ) == 'x' );
+    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.
     */
-    TESTCASE( _PDCLIB_rename( filename1 + 6, filename2 ) == -1 );
+    TESTCASE( _PDCLIB_rename( testfile1, testfile2 ) == -1 );
     /* remove both files */
-    remove( filename1 + 6 );
-    remove( filename2 );
-    /* check that they're gone */
-    TESTCASE( fopen( filename1 + 6, "r" ) == NULL );
-    TESTCASE( fopen( filename2, "r" ) == NULL );
+    remove( testfile1 );
+    remove( testfile2 );
     return TEST_RESULTS;
 }