From e7af303b2632afda99db2ebaf2ebee5fcbe1b13e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 4 Jan 2014 16:20:00 +0000
Subject: [PATCH] Don't delete the target if copy failed because the target was
 read-only.  PR 53095

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1555363 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  4 ++++
 .../org/apache/tools/ant/taskdefs/Copy.java   |  8 +++++--
 .../apache/tools/ant/util/ResourceUtils.java  | 12 ++++++++--
 src/tests/antunit/taskdefs/copy-test.xml      | 22 +++++++++++++++++++
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 79ce9baa2..887822072 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -64,6 +64,10 @@ Fixed bugs:
  * reading of compiler args has become more defensive
    Bugzilla Report 53754
 
+ * <copy> without force="true" would not only fail to overwrite a
+   read-only file as expected but also remove the existing file.
+   Bugzilla Report 53095
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 2d72ed69f..2bc99c22a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -898,7 +898,9 @@ public class Copy extends Task {
                         String msg = "Failed to copy " + fromFile + " to " + toFile
                             + " due to " + getDueTo(ioe);
                         File targetFile = new File(toFile);
-                        if (targetFile.exists() && !targetFile.delete()) {
+                        if (!(ioe instanceof
+                              ResourceUtils.ReadOnlyTargetFileException)
+                            && targetFile.exists() && !targetFile.delete()) {
                             msg += " and I couldn't delete the corrupt " + toFile;
                         }
                         if (failonerror) {
@@ -980,7 +982,9 @@ public class Copy extends Task {
                             + " to " + toFile
                             + " due to " + getDueTo(ioe);
                         File targetFile = new File(toFile);
-                        if (targetFile.exists() && !targetFile.delete()) {
+                        if (!(ioe instanceof
+                              ResourceUtils.ReadOnlyTargetFileException)
+                            && targetFile.exists() && !targetFile.delete()) {
                             msg += " and I couldn't delete the corrupt " + toFile;
                         }
                         if (failonerror) {
diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java
index e4562db55..a9d26d0a9 100644
--- a/src/main/org/apache/tools/ant/util/ResourceUtils.java
+++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java
@@ -406,8 +406,7 @@ public class ResourceUtils {
         }
         if (destFile != null && destFile.isFile() && !destFile.canWrite()) {
             if (!force) {
-                throw new IOException("can't write to read-only destination "
-                                      + "file " + destFile);
+                throw new ReadOnlyTargetFileException(destFile);
             } else if (!FILE_UTILS.tryHardToDelete(destFile)) {
                 throw new IOException("failed to delete read-only "
                                       + "destination file " + destFile);
@@ -785,4 +784,13 @@ public class ResourceUtils {
     public static interface ResourceSelectorProvider {
         ResourceSelector getTargetSelectorForSource(Resource source);
     }
+
+    /**
+     * @since Ant 1.9.4
+     */
+    public static class ReadOnlyTargetFileException extends IOException {
+        public ReadOnlyTargetFileException(File destFile) {
+            super("can't write to read-only destination file " + destFile);
+        }
+    }
 }
diff --git a/src/tests/antunit/taskdefs/copy-test.xml b/src/tests/antunit/taskdefs/copy-test.xml
index 6f0d5dfe1..51c6277c1 100644
--- a/src/tests/antunit/taskdefs/copy-test.xml
+++ b/src/tests/antunit/taskdefs/copy-test.xml
@@ -446,4 +446,26 @@ public class NullByteStreamResource extends Resource {
     <au:assertResourceDoesntContain resource="${input}/somefile"
                                     value="default contents"/>
   </target>
+
+  <target name="testCopyDoesntDeleteReadonlyTargetWhenCopyFails"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53095">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+    <touch file="${input}/somefile"/>
+    <touch file="${output}/somefile"/>
+    <exec executable="chmod" osfamily="unix">
+      <arg value="-w"/>
+      <arg file="${output}/somefile"/>
+    </exec>
+    <exec executable="attrib" osfamily="dos">
+      <arg value="+r"/>
+      <arg file="${output}/somefile"/>
+    </exec>
+    <au:expectfailure>
+      <copy todir="${output}" file="${input}/somefile"
+            overwrite="true"/>
+    </au:expectfailure>
+    <au:assertFileExists file="${input}/somefile"/>
+    <au:assertFileExists file="${output}/somefile"/>
+  </target>
 </project>