ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- cmd_mkdir: Give an error message if the directory already exists (Bug 3961)

Browse Source 
- Also, allow multiple directories to be created by one invocation

svn path=/trunk/; revision=38289
This commit is contained in:
Jeffrey Morlan
2008-12-22 23:50:53 +00:00
parent a3bf2399ff
commit 8bb3a3af67
1 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/shell/cmd/internal.c
+29 -38
View File
@@ -431,6 +431,12 @@ MakeFullPath(TCHAR * DirPath)
TCHAR *p = DirPath;
INT n;
if (CreateDirectory(DirPath, NULL))
return TRUE;
else if (GetLastError() != ERROR_PATH_NOT_FOUND)
return FALSE;
/* got ERROR_PATH_NOT_FOUND, so try building it up one component at a time */
if (p[0] && p[1] == _T(':'))
p += 2;
while (*p == _T('\\'))
@@ -445,8 +451,6 @@ MakeFullPath(TCHAR * DirPath)
(GetLastError() != ERROR_ALREADY_EXISTS))
return FALSE;
} while (p != NULL);
if (GetLastError() == ERROR_ALREADY_EXISTS)
SetLastError(ERROR_SUCCESS);
return TRUE;
}
@@ -457,55 +461,42 @@ MakeFullPath(TCHAR * DirPath)
*/
INT cmd_mkdir (LPTSTR param)
{
LPTSTR dir; /* pointer to the directory to change to */
LPTSTR *p = NULL;
INT argc;
nErrorLevel = 0;
LPTSTR *p;
INT argc, i;
if (!_tcsncmp (param, _T("/?"), 2))
{
ConOutResPaging(TRUE,STRING_MKDIR_HELP);
return 0;
}
p = split (param, &argc, FALSE);
if (argc > 1)
{
/*JPP 20-Jul-1998 use standard error message */
error_too_many_parameters (param);
freep (p);
return 1;
}
else
dir = p[0];
if (!dir)
p = split (param, &argc, FALSE);
if (argc == 0)
{
ConErrResPuts (STRING_ERROR_REQ_PARAM_MISSING);
ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
nErrorLevel = 1;
if(p != NULL)
freep (p);
freep(p);
return 1;
}
if (!MakeFullPath(dir))
{
if(GetLastError() == ERROR_PATH_NOT_FOUND)
{
ConErrResPuts(STRING_MD_ERROR2);
}
else
{
ErrorMessage (GetLastError(), _T("MD"));
}
nErrorLevel = 1;
freep (p);
return 1;
}
nErrorLevel = 0;
for (i = 0; i < argc; i++)
{
if (!MakeFullPath(p[i]))
{
if(GetLastError() == ERROR_PATH_NOT_FOUND)
{
ConErrResPuts(STRING_MD_ERROR2);
}
else
{
ErrorMessage (GetLastError(), _T("MD"));
}
nErrorLevel = 1;
}
}
freep (p);
return 0;
return nErrorLevel;
}
#endif