[PATCH v2 2/2] cmd: Don't attempt to copy a file to itself.

[Joe Souza]

From: Joe Souza

---
 programs/cmd/builtins.c | 17 ++++++++++++++---
 programs/cmd/cmd.rc     |  1 +
 programs/cmd/wcmd.h     |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index ef84bee64ac..7d560143be2 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1041,6 +1041,7 @@ RETURN_CODE WCMD_copy(WCHAR * args)
         WCHAR outname[MAX_PATH];
         BOOL  overwrite;
         BOOL  appendtofirstfile = FALSE;
+        BOOL  issamefile;

/* Skip . and .., and directories */
         if (!srcisdevice && fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
@@ -1060,13 +1061,23 @@ RETURN_CODE WCMD_copy(WCHAR * args)
             overwrite = TRUE;
           }

+          issamefile = WCMD_IsSameFile(srcpath, outname);
+
           WINE_TRACE("Copying from : '%s'\n", wine_dbgstr_w(srcpath));
           WINE_TRACE("Copying to : '%s'\n", wine_dbgstr_w(outname));
           WINE_TRACE("Flags: srcbinary(%d), dstbinary(%d), over(%d), prompt(%d)\n",
                      thiscopy->binarycopy, destination->binarycopy, overwrite, prompt);

+          if (!anyconcats && issamefile) {
+            WCMD_output_asis(srcpath);
+            WCMD_output_asis(L"\r\n");
+            WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOCOPYTOSELF));
+            return_code = ERROR_INVALID_FUNCTION;
+            break;
+          }
+
           if (!writtenoneconcat) {
-            appendtofirstfile = anyconcats && WCMD_IsSameFile(srcpath, outname);
+            appendtofirstfile = anyconcats && issamefile;
           }

/* Prompt before overwriting */
@@ -1098,7 +1109,7 @@ RETURN_CODE WCMD_copy(WCHAR * args)
               WCMD_output_asis(srcpath);
               WCMD_output_asis(L"\r\n");
             }
-            if (anyconcats && WCMD_IsSameFile(srcpath, outname)) {
+            if (anyconcats && issamefile) {
               /* behavior is as Unix 'touch' (change last-written time only) */
               HANDLE file = CreateFileW(srcpath, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
                                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -1168,7 +1179,7 @@ RETURN_CODE WCMD_copy(WCHAR * args)
     }
   }

-  if (numcopied) {
+  if (numcopied || return_code) {
     WCMD_output(WCMD_LoadMessage(WCMD_NUMCOPIED), numcopied);
   }

diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc
index 29d105fa7a2..322673aab30 100644
--- a/programs/cmd/cmd.rc
+++ b/programs/cmd/cmd.rc
@@ -407,4 +407,5 @@ Enter HELP <command> for further information on any of the above commands.\n"
   WCMD_ENDOFLINE, "End of line"
   WCMD_ENDOFFILE, "End of file"
   WCMD_NUMCOPIED, "%t%1!u! file(s) copied\n"
+  WCMD_NOCOPYTOSELF, "File cannot be copied to itself.\n"
 }
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
index 6810598142c..ba18b942c5d 100644
--- a/programs/cmd/wcmd.h
+++ b/programs/cmd/wcmd.h
@@ -477,3 +477,4 @@ extern WCHAR version_string[];
 #define WCMD_ENDOFLINE        1048
 #define WCMD_ENDOFFILE        1049
 #define WCMD_NUMCOPIED        1050
+#define WCMD_NOCOPYTOSELF     1051