Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd_rmdir: Implement ability to remove multiple directories with one command.

Browse source 
svn path=/trunk/; revision=38946
This commit is contained in:
Jeffrey Morlan 2009-01-19 17:29:21 +00:00
parent f601277c56
commit fd6ed40845
1 changed files with 41 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
reactos/base/shell/cmd/internal.c
View file

@ -542,16 +542,15 @@ BOOL DeleteFolder(LPTSTR FileName)
}
INT cmd_rmdir (LPTSTR param)
{
TCHAR dir[MAX_PATH]; /* pointer to the directory to change to */
TCHAR ch;
INT args;
LPTSTR *arg = NULL;
INT dirCount;
LPTSTR *arg;
INT i;
BOOL RD_SUB = FALSE;
BOOL RD_QUIET = FALSE;
HANDLE hFile;
WIN32_FIND_DATA f;
INT res;
INT nError = 0;
TCHAR szFullPath[MAX_PATH];
if (!_tcsncmp (param, _T("/?"), 2))
@ -560,19 +559,8 @@ INT cmd_rmdir (LPTSTR param)
return 0;
}
nErrorLevel = 0;
arg = split (param, &args, FALSE);
if (args == 0)
{
/* only command given */
error_req_param_missing ();
freep (arg);
return 1;
}
dir[0] = 0;
dirCount = 0;
/* check for options anywhere in command line */
for (i = 0; i < args; i++)
@ -596,76 +584,61 @@ INT cmd_rmdir (LPTSTR param)
}
else
{
/* get the folder name */
_tcscpy(dir,arg[i]);
dirCount++;
}
}
if (dir[0] == _T('\0'))
if (dirCount == 0)
{
/* No folder to remove */
ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
error_req_param_missing();
freep(arg);
return 1;
}
GetFullPathName(dir,MAX_PATH,szFullPath,NULL);
/* remove trailing \ if any, but ONLY if dir is not the root dir */
if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\'))
szFullPath[_tcslen(szFullPath) - 1] = _T('\0');
if(RD_SUB)
for (i = 0; i < args; i++)
{
/* ask if they want to delete evrything in the folder */
if (!RD_QUIET)
{
res = FilePromptYNA (STRING_DEL_HELP2);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
{
freep(arg);
nErrorLevel = 1;
return 1;
}
}
if (*arg[i] == _T('/'))
continue;
}
else
{
/* check for files in the folder */
_tcscat(szFullPath,_T("\\*"));
hFile = FindFirstFile(szFullPath, &f);
if (hFile != INVALID_HANDLE_VALUE)
if (RD_SUB)
{
do
/* ask if they want to delete evrything in the folder */
if (!RD_QUIET)
{
if (!_tcscmp(f.cFileName,_T(".")) ||
!_tcscmp(f.cFileName,_T("..")))
res = FilePromptYNA (STRING_DEL_HELP2);
if (res == PROMPT_NO || res == PROMPT_BREAK)
{
nError = 1;
continue;
ConOutResPuts(STRING_RMDIR_HELP2);
freep(arg);
FindClose (hFile);
nErrorLevel = 1;
return 1;
} while (FindNextFile (hFile, &f));
FindClose (hFile);
}
/* reovme the \\* */
szFullPath[_tcslen(szFullPath) - 2] = _T('\0');
}
}
if (res == PROMPT_ALL)
RD_QUIET = TRUE;
}
/* get the folder name */
GetFullPathName(arg[i],MAX_PATH,szFullPath,NULL);
if (!DeleteFolder(szFullPath))
{
/* Couldnt delete the folder, clean up and print out the error */
ErrorMessage (GetLastError(), _T("RD"));
freep (arg);
nErrorLevel = 1;
return 1;
/* remove trailing \ if any, but ONLY if dir is not the root dir */
if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\'))
szFullPath[_tcslen(szFullPath) - 1] = _T('\0');
res = DeleteFolder(szFullPath);
}
else
{
res = RemoveDirectory(arg[i]);
}
if (!res)
{
/* Couldn't delete the folder, print out the error */
nError = GetLastError();
ErrorMessage(nError, _T("RD"));
}
}
freep (arg);
return 0;
return nError;
}
#endif