Change rename() to set errno to EXDEV if a rename is attempted across volumes.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8883 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 3 deletions

diff --git a/firmware/common/file.c b/firmware/common/file.c
index 90fab6db99..f37fb0ae7f 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -340,10 +340,17 @@ int rename(const char* path, const char* newpath)
     file = &openfiles[fd];
     rc = fat_rename(&file->fatfile, &dir->fatdir, nameptr,
                     file->size, file->attr);
+#ifdef HAVE_MULTIVOLUME
+    if ( rc == -1) {
+	DEBUGF("Failed renaming file across volumnes: %d\n", rc);
+	errno = EXDEV;
+	return -6;
+    }
+#endif
     if ( rc < 0 ) {
         DEBUGF("Failed renaming file: %d\n", rc);
         errno = EIO;
-        return rc * 10 - 6;
+        return rc * 10 - 7;
     }
 
 #ifdef HAVE_DIRCACHE
@@ -353,13 +360,13 @@ int rename(const char* path, const char* newpath)
     rc = close(fd);
     if (rc<0) {
         errno = EIO;
-        return rc * 10 - 7;
+        return rc * 10 - 8;
     }
 
     rc = closedir(dir);
     if (rc<0) {
         errno = EIO;
-        return rc * 10 - 8;
+        return rc * 10 - 9;
     }
 
     return 0;