[ros-diffs] [cfinck] 30696: When someone tries to copy a file over itself, show an error message. We already had such a check in the code, but after Brandon's copy.c rewrite in r16561, it never got called. I removed the old check now and put a new one at the right position. See issue #2827 for more details.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Fri Nov 23 18:53:57 2007
New Revision: 30696

URL: http://svn.reactos.org/svn/reactos?rev=30696&view=rev
Log:
When someone tries to copy a file over itself, show an error message.

We already had such a check in the code, but after Brandon's copy.c rewrite in r16561, it never got called.
I removed the old check now and put a new one at the right position.

See issue #2827 for more details.

Modified:
    trunk/reactos/base/shell/cmd/copy.c

Modified: trunk/reactos/base/shell/cmd/copy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=30696&r1=30695&r2=30696&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/copy.c (original)
+++ trunk/reactos/base/shell/cmd/copy.c Fri Nov 23 18:53:57 2007
@@ -173,16 +173,6 @@
 	}
 	else if (!append)
 	{
-		if (!_tcscmp (dest, source))
-		{
-			LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE);
-			ConOutPrintf(szMsg, source);
-
-			CloseHandle (hFileSrc);
-            nErrorLevel = 1;
-			return 0;
-		}
-
 #ifdef _DEBUG
 		DebugPrintf (_T("SetFileAttributes (%s, FILE_ATTRIBUTE_NORMAL);\n"), dest);
 #endif
@@ -830,7 +820,13 @@
 
 			/* Check to see if the file is the same file */
 			if(!bTouch && !_tcscmp (tmpSrcPath, tmpDestPath))
-				continue;
+            {
+			    LoadString(CMD_ModuleHandle, STRING_COPY_ERROR2, szMsg, RC_STRING_MAX_SIZE);
+			    ConOutPrintf(szMsg);
+
+                nErrorLevel = 1;
+                break;
+            }
 
 			/* Handle any overriding / prompting that needs to be done */
 			if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch)