From b7df3e541a49a1cb72862c4015b6a883a63e1e29 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Fri, 2 Dec 2016 15:06:09 +1100
Subject: extmod/vfs_fat: Implement POSIX behaviour of rename, allow to
 overwrite.

If the destination of os.rename() exists then it will be overwritten if it
is a file.  This is the POSIX behaviour, which is also the CPython
behaviour, and so we follow suit.

See issue #2598 for discussion.
---
 extmod/vfs_fat.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'extmod')

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 6e827fc66..bd88bcf1b 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -121,6 +121,12 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_
     const char *old_path = mp_obj_str_get_str(path_in);
     const char *new_path = mp_obj_str_get_str(path_out);
     FRESULT res = f_rename(old_path, new_path);
+    if (res == FR_EXIST) {
+        // if new_path exists then try removing it (but only if it's a file)
+        fat_vfs_remove_internal(path_out, 0); // 0 == file attribute
+        // try to rename again
+        res = f_rename(old_path, new_path);
+    }
     if (res == FR_OK) {
         return mp_const_none;
     } else {
-- 
cgit v1.2.3