Fix rename.
authorMichael J. Spencer <bigcheesegs@gmail.com>
Sun, 16 Jan 2011 22:18:41 +0000 (22:18 +0000)
committerMichael J. Spencer <bigcheesegs@gmail.com>
Sun, 16 Jan 2011 22:18:41 +0000 (22:18 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123604 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Support/Unix/PathV2.inc

index 056708a7b0b1358ff9bb43ea615ec201108c0265..03ff28367e44c5e653f6080e5e89e43aaec714f5 100644 (file)
@@ -230,8 +230,17 @@ error_code rename(const Twine &from, const Twine &to) {
   StringRef f = from.toNullTerminatedStringRef(from_storage);
   StringRef t = to.toNullTerminatedStringRef(to_storage);
 
-  if (::rename(f.begin(), t.begin()) == -1)
-    return error_code(errno, system_category());
+  if (::rename(f.begin(), t.begin()) == -1) {
+    // If it's a cross device link, copy then delete, otherwise return the error
+    if (errno == EXDEV) {
+      if (error_code ec = copy_file(from, to, copy_option::overwrite_if_exists))
+        return ec;
+      bool Existed;
+      if (error_code ec = remove(from, Existed))
+        return ec;
+    } else
+      return error_code(errno, system_category());
+  }
 
   return success;
 }