X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=platform%2Fexample%2Ffunctions%2F_PDCLIB%2Frename.c;h=08f08742a2f40c2e2bc63972a397dbb425f984a9;hb=2b793d7f6e3a8e37229e761ef4c92961bd0f686a;hp=849f872946476beae89d24f890e20f34f1a4721f;hpb=2ae38c6b53d59bd40c10c377da3e306b7132a512;p=pdclib

diff --git a/platform/example/functions/_PDCLIB/rename.c b/platform/example/functions/_PDCLIB/rename.c
index 849f872..08f0874 100644
--- a/platform/example/functions/_PDCLIB/rename.c
+++ b/platform/example/functions/_PDCLIB/rename.c
@@ -1,15 +1,19 @@
-/* $Id$ */
-
 /* _PDCLIB_rename( const char *, const char * )
 
    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>
+
 #ifndef REGTEST
-#include <unistd.h>
 #include <_PDCLIB_glue.h>
 
+#include </usr/include/errno.h>
+
+extern int unlink( const char * pathname );
+extern int link( const char * old, const char * new );
+
 int _PDCLIB_rename( const char * old, const char * new )
 {
     /* Note that the behaviour if new file exists is implementation-defined.
@@ -19,55 +23,116 @@ int _PDCLIB_rename( const char * old, const char * new )
     */
     if ( link( old, new ) == 0 )
     {
-        return unlink( old );
+        if ( unlink( old ) == EOF )
+        {
+            switch ( errno )
+            {
+                /* See the comments on implementation-defined errno values in
+                   <_PDCLIB_config.h>.
+                */
+                case EACCES:
+                case EFAULT:
+                case EIO:
+                case EISDIR:
+                case ELOOP:
+                case ENAMETOOLONG:
+                case ENOENT:
+                case ENOMEM:
+                case ENOTDIR:
+                case EPERM:
+                case EROFS:
+                    _PDCLIB_errno = _PDCLIB_ERROR;
+                    break;
+                default:
+                    /* This should be something like EUNKNOWN. */
+                    _PDCLIB_errno = _PDCLIB_ERROR;
+                    break;
+            }
+            return -1;
+        }
+        else
+        {
+            return 0;
+        }
     }
     else
     {
-        return -1;
+        switch ( errno )
+        {
+            /* See the comments on implementation-defined errno values in
+               <_PDCLIB_config.h>.
+            */
+            case EACCES:
+            case EEXIST:
+            case EFAULT:
+            case EIO:
+            case ELOOP:
+            case EMLINK:
+            case ENAMETOOLONG:
+            case ENOENT:
+            case ENOMEM:
+            case ENOSPC:
+            case ENOTDIR:
+            case EPERM:
+            case EROFS:
+            case EXDEV:
+                _PDCLIB_errno = _PDCLIB_ERROR;
+                break;
+            default:
+                /* This should be something like EUNKNOWN. */
+                _PDCLIB_errno = _PDCLIB_ERROR;
+                break;
+        }
+        return EOF;
     }
 }
 
 #endif
 
 #ifdef TEST
-/* TODO: Work around the following undef */
-#undef SEEK_SET
 #include <_PDCLIB_test.h>
 
 #include <stdlib.h>
 
 int main( void )
 {
-    char filename1[] = "touch testfile1";
-    char filename2[] = "testfile2";
+#ifndef REGTEST
+    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( ( file = fopen( testfile1, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* 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( ( file = fopen( testfile2, "r" ) ) != NULL );
+    TESTCASE( fclose( file ) == 0 );
     /* 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 );
+#endif
     return TEST_RESULTS;
 }