[ros-diffs] [jmorlan] 39944: Give an error message when trying to DEL a file that doesn't exist (Bug 4244). Patch by Victor Martinez <vicmarcal at hotmail.com>.

Author: jmorlan
Date: Wed Mar 11 05:17:53 2009
New Revision: 39944

URL: http://svn.reactos.org/svn/reactos?rev=39944&view=rev
Log:
Give an error message when trying to DEL a file that doesn't exist (Bug 4244). Patch
by Victor Martinez <vicmarcal at hotmail.com>.

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

Modified: trunk/reactos/base/shell/cmd/del.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=3…
==============================================================================
--- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Wed Mar 11 05:17:53 2009
@@ -199,51 +199,50 @@
         {
                 do
                 {
-                        bExclusion = FALSE;
-
-		        /*if it is going to be excluded by - no need to check attrs*/
-		        if(*dwFlags & DEL_ATTRIBUTES && !bExclusion)
-		        {
-
-			        /*save if file attr check if user doesnt care about that attr anyways*/
-			        if(dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes &
FILE_ATTRIBUTE_ARCHIVE))
+					bExclusion = FALSE;
+
+					/*if it is going to be excluded by - no need to check attrs*/
+					if(*dwFlags & DEL_ATTRIBUTES && !bExclusion)
+					{
+
+						/*save if file attr check if user doesnt care about that attr anyways*/
+					 if(dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes &
FILE_ATTRIBUTE_ARCHIVE))
 				        bExclusion = TRUE;
-			        if(dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes &
FILE_ATTRIBUTE_HIDDEN))
+					 if(dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes &
FILE_ATTRIBUTE_HIDDEN))
 				        bExclusion = TRUE;
-			        if(dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes &
FILE_ATTRIBUTE_SYSTEM))
+					 if(dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes &
FILE_ATTRIBUTE_SYSTEM))
 				        bExclusion = TRUE;
-			        if(dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes &
FILE_ATTRIBUTE_READONLY))
-			                bExclusion = TRUE;
-		                if(dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes
& FILE_ATTRIBUTE_ARCHIVE))
-			                bExclusion = TRUE;
-		                if(dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes &
FILE_ATTRIBUTE_HIDDEN))
-			                bExclusion = TRUE;
-		                if(dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes &
FILE_ATTRIBUTE_SYSTEM))
-			                bExclusion = TRUE;
-		                if(dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes
& FILE_ATTRIBUTE_READONLY))
-			                bExclusion = TRUE;
-	                }
-
-	                if(bExclusion)
+					 if(dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes &
FILE_ATTRIBUTE_READONLY))
+			            bExclusion = TRUE;
+		             if(dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes &
FILE_ATTRIBUTE_ARCHIVE))
+			            bExclusion = TRUE;
+		             if(dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes &
FILE_ATTRIBUTE_HIDDEN))
+			            bExclusion = TRUE;
+		             if(dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes &
FILE_ATTRIBUTE_SYSTEM))
+			            bExclusion = TRUE;
+		             if(dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes &
FILE_ATTRIBUTE_READONLY))
+			            bExclusion = TRUE;
+					}
+					if(bExclusion)
+						continue;
+
+					/* ignore directories */
+					if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 		                continue;
 
-		        /* ignore directories */
-		        if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-		                continue;
-
-
-		        _tcscpy (pFilePart, f.cFileName);
-
-		        /* We cant delete ourselves */
-		        if(!_tcscmp (CMDPath,szFullPath))
-			        continue;
-
-
-		        TRACE("Full filename: %s\n", debugstr_aw(szFullPath));
-
-		        /* ask for deleting */
-		        if (*dwFlags & DEL_PROMPT)
-		        {
+
+					_tcscpy (pFilePart, f.cFileName);
+
+					/* We cant delete ourselves */
+					if(!_tcscmp (CMDPath,szFullPath))
+						continue;
+
+
+					TRACE("Full filename: %s\n", debugstr_aw(szFullPath));
+
+					/* ask for deleting */
+					if (*dwFlags & DEL_PROMPT)
+					{
 		                ConErrResPrintf(STRING_DEL_ERROR5, szFullPath);
 
 		                res = FilePromptYN (STRING_DEL_ERROR6);
@@ -267,19 +266,19 @@
 
 	                if(RemoveFile (szFullPath, *dwFlags, &f))
 		                dwFiles++;
-		        else
+					else
                         {
-		                ErrorMessage (GetLastError(), _T(""));
+							ErrorMessage (GetLastError(), _T(""));
 //                                FindClose(hFile);
 //                                return -1;
-	                }
+						}
                 }
                 while (FindNextFile (hFile, &f));
-	        FindClose (hFile);
-        }
+				FindClose (hFile);
+        } 
+		else error_sfile_not_found(szFullPath);
         return dwFiles;
 }
-
 
 static DWORD
 ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags)