Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 41/48: [CMD] DATE: Simplify the input loop, based on the TIME command.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80844dc18586d4a11bec4… commit 80844dc18586d4a11bec4509edd324293eaf19f7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 18:23:57 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:10 2020 +0200 [CMD] DATE: Simplify the input loop, based on the TIME command. Set also the ERRORLEVEL in case of error. --- base/shell/cmd/date.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/base/shell/cmd/date.c b/base/shell/cmd/date.c index 0cecf8d9292..5f509b28f5b 100644 --- a/base/shell/cmd/date.c +++ b/base/shell/cmd/date.c @@ -212,9 +212,9 @@ INT cmd_date(LPTSTR param) return 0; } - if (nDateString == -1) + while (TRUE) { - while (TRUE) + if (nDateString == -1) { PrintDateString(); ConInString(szDate, ARRAYSIZE(szDate)); @@ -229,30 +229,21 @@ INT cmd_date(LPTSTR param) freep(arg); return 0; } - ConErrResPuts(STRING_DATE_ERROR); } - } - else - { - if (!ParseDate(arg[nDateString])) + else { - while (TRUE) + if (ParseDate(arg[nDateString])) { - ConErrResPuts(STRING_DATE_ERROR); - - PrintDateString(); - ConInString(szDate, ARRAYSIZE(szDate)); - - while (*szDate && szDate[_tcslen(szDate) - 1] < _T(' ')) - szDate[_tcslen(szDate) - 1] = _T('\0'); - - if (ParseDate(szDate)) - { - freep(arg); - return 0; - } + freep(arg); + return 0; } + + /* Force input the next time around */ + nDateString = -1; } + + ConErrResPuts(STRING_DATE_ERROR); + nErrorLevel = 1; } freep(arg);

4 years, 2 months

[reactos] 40/48: [CMD] DATE: The /T option is available only when extensions are enabled.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1518933519846044a4f2… commit a1518933519846044a4f268337209fef9b8dfee8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 18:03:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:10 2020 +0200 [CMD] DATE: The /T option is available only when extensions are enabled. --- base/shell/cmd/date.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/date.c b/base/shell/cmd/date.c index 97cb4221411..0cecf8d9292 100644 --- a/base/shell/cmd/date.c +++ b/base/shell/cmd/date.c @@ -196,7 +196,7 @@ INT cmd_date(LPTSTR param) /* Check for options */ for (i = 0; i < argc; i++) { - if (_tcsicmp(arg[i], _T("/t")) == 0) + if (bEnableExtensions && (_tcsicmp(arg[i], _T("/T")) == 0)) bPrompt = FALSE; if ((*arg[i] != _T('/')) && (nDateString == -1))

4 years, 2 months

[reactos] 39/48: [CMD] TIME: The /T option is available only when extensions are enabled.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=682875d070d7475b3f07d… commit 682875d070d7475b3f07d56ef30f3dcf06d2c052 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 17:48:13 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:09 2020 +0200 [CMD] TIME: The /T option is available only when extensions are enabled. And merge two string buffers into one. --- base/shell/cmd/time.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/base/shell/cmd/time.c b/base/shell/cmd/time.c index 16bb9aae58b..c53abbf11bf 100644 --- a/base/shell/cmd/time.c +++ b/base/shell/cmd/time.c @@ -135,8 +135,7 @@ INT cmd_time(LPTSTR param) INT argc; INT i; INT nTimeString = -1; - TCHAR szTime[20]; - TCHAR s[40]; + TCHAR szTime[40]; if (!_tcsncmp(param, _T("/?"), 2)) { @@ -152,7 +151,7 @@ INT cmd_time(LPTSTR param) /* Check for options */ for (i = 0; i < argc; i++) { - if (_tcsicmp(arg[i], _T("/t")) == 0) + if (bEnableExtensions && (_tcsicmp(arg[i], _T("/T")) == 0)) { /* Display current time in short format */ SYSTEMTIME st; @@ -178,14 +177,14 @@ INT cmd_time(LPTSTR param) if (nTimeString == -1) { ConOutResPuts(STRING_TIME_HELP2); - ConInString(s, ARRAYSIZE(s)); + ConInString(szTime, ARRAYSIZE(szTime)); - TRACE("\'%s\'\n", debugstr_aw(s)); + TRACE("\'%s\'\n", debugstr_aw(szTime)); - while (*s && s[_tcslen(s) - 1] < _T(' ')) - s[_tcslen(s) - 1] = _T('\0'); + while (*szTime && szTime[_tcslen(szTime) - 1] < _T(' ')) + szTime[_tcslen(szTime) - 1] = _T('\0'); - if (ParseTime(s)) + if (ParseTime(szTime)) { freep(arg); return 0;

4 years, 2 months

[reactos] 38/48: [CMD] Some code style and formatting fixes

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aab632644f7bd4538158d… commit aab632644f7bd4538158d4c0167bc224f242b70a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:31:12 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:09 2020 +0200 [CMD] Some code style and formatting fixes --- base/shell/cmd/date.c | 71 +++++++++++++++++++++++++++------------------------ base/shell/cmd/time.c | 53 ++++++++++++++++++-------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/base/shell/cmd/date.c b/base/shell/cmd/date.c index 7704cde50a7..97cb4221411 100644 --- a/base/shell/cmd/date.c +++ b/base/shell/cmd/date.c @@ -173,30 +173,32 @@ ParseDate (LPTSTR s) } -INT cmd_date (LPTSTR param) +INT cmd_date(LPTSTR param) { - LPTSTR *arg; - INT argc; - INT i; - BOOL bPrompt = TRUE; - INT nDateString = -1; - - if (!_tcsncmp (param, _T("/?"), 2)) + LPTSTR* arg; + INT argc; + INT i; + BOOL bPrompt = TRUE; + INT nDateString = -1; + TCHAR szDate[40]; + + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_DATE_HELP4); + ConOutResPaging(TRUE, STRING_DATE_HELP4); return 0; } nErrorLevel = 0; - /* build parameter array */ - arg = split (param, &argc, FALSE, FALSE); + /* Build the parameter array */ + arg = split(param, &argc, FALSE, FALSE); - /* check for options */ + /* Check for options */ for (i = 0; i < argc; i++) { - if (_tcsicmp (arg[i], _T("/t")) == 0) + if (_tcsicmp(arg[i], _T("/t")) == 0) bPrompt = FALSE; + if ((*arg[i] != _T('/')) && (nDateString == -1)) nDateString = i; } @@ -206,24 +208,25 @@ INT cmd_date (LPTSTR param) if (!bPrompt) { - freep (arg); + freep(arg); return 0; } if (nDateString == -1) { - while (TRUE) /* forever loop */ + while (TRUE) { - TCHAR s[40]; - - PrintDateString (); - ConInString (s, 40); - TRACE ("\'%s\'\n", debugstr_aw(s)); - while (*s && s[_tcslen (s) - 1] < _T(' ')) - s[_tcslen (s) - 1] = _T('\0'); - if (ParseDate (s)) + PrintDateString(); + ConInString(szDate, ARRAYSIZE(szDate)); + + TRACE("\'%s\'\n", debugstr_aw(szDate)); + + while (*szDate && szDate[_tcslen(szDate) - 1] < _T(' ')) + szDate[_tcslen(szDate) - 1] = _T('\0'); + + if (ParseDate(szDate)) { - freep (arg); + freep(arg); return 0; } ConErrResPuts(STRING_DATE_ERROR); @@ -231,28 +234,28 @@ INT cmd_date (LPTSTR param) } else { - if (!ParseDate (arg[nDateString])) + if (!ParseDate(arg[nDateString])) { - while (TRUE) /* forever loop */ + while (TRUE) { - TCHAR s[40]; ConErrResPuts(STRING_DATE_ERROR); - PrintDateString (); - ConInString (s, 40); + PrintDateString(); + ConInString(szDate, ARRAYSIZE(szDate)); + + while (*szDate && szDate[_tcslen(szDate) - 1] < _T(' ')) + szDate[_tcslen(szDate) - 1] = _T('\0'); - while (*s && s[_tcslen (s) - 1] < _T(' ')) - s[_tcslen (s) - 1] = _T('\0'); - if (ParseDate (s)) + if (ParseDate(szDate)) { - freep (arg); + freep(arg); return 0; } } } } - freep (arg); + freep(arg); return 0; } #endif /* INCLUDE_CMD_DATE */ diff --git a/base/shell/cmd/time.c b/base/shell/cmd/time.c index 9ce3cc26ce4..16bb9aae58b 100644 --- a/base/shell/cmd/time.c +++ b/base/shell/cmd/time.c @@ -129,32 +129,33 @@ static BOOL ParseTime (LPTSTR s) } -INT cmd_time (LPTSTR param) +INT cmd_time(LPTSTR param) { - LPTSTR *arg; - INT argc; - INT i; - INT nTimeString = -1; - - if (!_tcsncmp (param, _T("/?"), 2)) + LPTSTR* arg; + INT argc; + INT i; + INT nTimeString = -1; + TCHAR szTime[20]; + TCHAR s[40]; + + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_TIME_HELP1); + ConOutResPaging(TRUE, STRING_TIME_HELP1); return 0; } nErrorLevel = 0; - /* build parameter array */ - arg = split (param, &argc, FALSE, FALSE); + /* Build the parameter array */ + arg = split(param, &argc, FALSE, FALSE); - /* check for options */ + /* Check for options */ for (i = 0; i < argc; i++) { - if (_tcsicmp (arg[i], _T("/t")) == 0) + if (_tcsicmp(arg[i], _T("/t")) == 0) { /* Display current time in short format */ SYSTEMTIME st; - TCHAR szTime[20]; GetLocalTime(&st); FormatTime(szTime, &st); ConOutPuts(szTime); @@ -172,45 +173,41 @@ INT cmd_time (LPTSTR param) ConOutPrintf(_T(": %s\n"), GetTimeString()); } - while (1) + while (TRUE) { if (nTimeString == -1) { - TCHAR s[40]; - ConOutResPuts(STRING_TIME_HELP2); + ConInString(s, ARRAYSIZE(s)); - ConInString (s, 40); + TRACE("\'%s\'\n", debugstr_aw(s)); - TRACE ("\'%s\'\n", debugstr_aw(s)); - - while (*s && s[_tcslen (s) - 1] < _T(' ')) + while (*s && s[_tcslen(s) - 1] < _T(' ')) s[_tcslen(s) - 1] = _T('\0'); - if (ParseTime (s)) + if (ParseTime(s)) { - freep (arg); + freep(arg); return 0; } } else { - if (ParseTime (arg[nTimeString])) + if (ParseTime(arg[nTimeString])) { - freep (arg); + freep(arg); return 0; } - /* force input the next time around. */ + /* Force input the next time around */ nTimeString = -1; } ConErrResPuts(STRING_TIME_ERROR1); - nErrorLevel = 1; + nErrorLevel = 1; } - freep (arg); - + freep(arg); return 0; }

4 years, 2 months

[reactos] 37/48: [CMD] Simplify GetRootPath() and mark its InPath parameter pointer to const string.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47d7de4b7bc35ba745dc0… commit 47d7de4b7bc35ba745dc007f6ba0bb442b52c788 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 23:31:50 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:08 2020 +0200 [CMD] Simplify GetRootPath() and mark its InPath parameter pointer to const string. --- base/shell/cmd/cmd.h | 7 ++++++- base/shell/cmd/internal.c | 9 +++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index f547389024e..d7bce5c139e 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -269,7 +269,12 @@ INT CommandMemory (LPTSTR); INT cmd_mklink(LPTSTR); /* Prototypes for MISC.C */ -INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size); +INT +GetRootPath( + IN LPCTSTR InPath, + OUT LPTSTR OutPath, + IN INT size); + BOOL SetRootPath(TCHAR *oldpath,TCHAR *InPath); TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 0dc3eaba2bd..7e8a7367c02 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -150,7 +150,7 @@ */ INT GetRootPath( - IN LPTSTR InPath, + IN LPCTSTR InPath, OUT LPTSTR OutPath, IN INT size) { @@ -162,14 +162,11 @@ GetRootPath( { t = (InPath[0] - _T('0')) + 28; } - - if ((InPath[0] >= _T('a')) && (InPath[0] <= _T('z'))) + else if ((InPath[0] >= _T('a')) && (InPath[0] <= _T('z'))) { t = (InPath[0] - _T('a')) + 1; - InPath[0] = t + _T('A') - 1; } - - if ((InPath[0] >= _T('A')) && (InPath[0] <= _T('Z'))) + else if ((InPath[0] >= _T('A')) && (InPath[0] <= _T('Z'))) { t = (InPath[0] - _T('A')) + 1; }

4 years, 2 months

[reactos] 36/48: [CMD] CHDIR: Adjust ERROR_FILE_NOT_FOUND into ERROR_PATH_NOT_FOUND if _tchdir() fails.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f43ee81573273dde924f6… commit f43ee81573273dde924f6cbbcad5e7e424e8f27c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 16:23:01 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:08 2020 +0200 [CMD] CHDIR: Adjust ERROR_FILE_NOT_FOUND into ERROR_PATH_NOT_FOUND if _tchdir() fails. --- base/shell/cmd/internal.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 3f2c1b6b233..0dc3eaba2bd 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -184,6 +184,7 @@ GetRootPath( BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) { + DWORD dwLastError; TCHAR OutPath[MAX_PATH]; TCHAR OutPathTemp[MAX_PATH]; @@ -191,7 +192,10 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) /* Retrieve the full path name from the (possibly relative) InPath */ if (GetFullPathName(InPath, ARRAYSIZE(OutPathTemp), OutPathTemp, NULL) == 0) + { + dwLastError = GetLastError(); goto Fail; + } /* Convert the full path to its correct case. * Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32 */ @@ -200,7 +204,12 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) /* Use _tchdir(), since unlike SetCurrentDirectory() it updates * the current-directory-on-drive environment variables. */ if (_tchdir(OutPath) != 0) + { + dwLastError = GetLastError(); + if (dwLastError == ERROR_FILE_NOT_FOUND) + dwLastError = ERROR_PATH_NOT_FOUND; goto Fail; + } /* Keep the original drive in ordinary CD/CHDIR (without /D switch) */ if (oldpath != NULL && _tcsncicmp(OutPath, oldpath, 2) != 0) @@ -209,7 +218,7 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) return TRUE; Fail: - ConErrFormatMessage(GetLastError()); + ConErrFormatMessage(dwLastError); nErrorLevel = 1; return FALSE; }

4 years, 2 months

[reactos] 35/48: [CMD] It is not the job of ErrorMessage() to set the errorlevel! It is set only by the commands that want it.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9871becced0b05812b3c7… commit 9871becced0b05812b3c750c2aa43fe4a20a2985 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 00:03:23 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:08 2020 +0200 [CMD] It is not the job of ErrorMessage() to set the errorlevel! It is set only by the commands that want it. --- base/shell/cmd/error.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index be422f33cf4..6995f188d89 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -36,8 +36,6 @@ ErrorMessage( if (dwErrorCode == ERROR_SUCCESS) return; - nErrorLevel = 1; - *szMessage = 0; if (szFormat) {

4 years, 2 months

[reactos] 34/48: [CMD] MOVE: Set the errorlevel on failure. CORE-14261

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b960a1c2146a96d3ee74… commit 3b960a1c2146a96d3ee74184f2e10fe3ec45243b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 11 23:50:36 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:07 2020 +0200 [CMD] MOVE: Set the errorlevel on failure. CORE-14261 --- base/shell/cmd/move.c | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/base/shell/cmd/move.c b/base/shell/cmd/move.c index dd7143d2cc0..d355914ae93 100644 --- a/base/shell/cmd/move.c +++ b/base/shell/cmd/move.c @@ -158,16 +158,16 @@ INT cmd_move (LPTSTR param) { /* there must be at least one pathspec */ error_req_param_missing(); - freep(arg); - return 1; + nErrorLevel = 1; + goto Quit; } if (nFiles > 2) { /* there are more than two pathspecs */ error_too_many_parameters(param); - freep(arg); - return 1; + nErrorLevel = 1; + goto Quit; } /* If no destination is given, default to current directory */ @@ -178,8 +178,8 @@ INT cmd_move (LPTSTR param) { /* '*'/'?' in dest, this doesnt happen. give folder name instead*/ error_invalid_parameter_format(pszDest); - freep(arg); - return 1; + nErrorLevel = 1; + goto Quit; } if (_tcschr(arg[i], _T('*')) != NULL || _tcschr(arg[i], _T('?')) != NULL) { @@ -199,9 +199,9 @@ INT cmd_move (LPTSTR param) hFile = FindFirstFile (arg[i], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) { - ErrorMessage (GetLastError (), arg[i]); - freep (arg); - return 1; + ErrorMessage(GetLastError(), arg[i]); + nErrorLevel = 1; + goto Quit; } /* check for special cases "." and ".." and if found skip them */ @@ -216,8 +216,8 @@ INT cmd_move (LPTSTR param) /* what? we don't have anything to move? */ error_file_not_found(); FindClose(hFile); - freep(arg); - return 1; + nErrorLevel = 1; + goto Quit; } OnlyOneFile = TRUE; @@ -247,9 +247,9 @@ INT cmd_move (LPTSTR param) hFile = FindFirstFile (arg[i], &findBuffer); if (hFile == INVALID_HANDLE_VALUE) { - ErrorMessage (GetLastError (), arg[i]); - freep (arg); - return 1; + ErrorMessage(GetLastError(), arg[i]); + nErrorLevel = 1; + goto Quit; } /* check for special cases "." and ".." and if found skip them */ @@ -264,8 +264,8 @@ INT cmd_move (LPTSTR param) /* huh? somebody removed files and/or folders which were there */ error_file_not_found(); FindClose(hFile); - freep(arg); - return 1; + nErrorLevel = 1; + goto Quit; } /* check if source and destination paths are on different volumes */ @@ -340,8 +340,8 @@ INT cmd_move (LPTSTR param) /* We are not allowed to have existing source and destination dir when there is wildcard in source */ error_syntax(NULL); FindClose(hFile); - freep(arg); - return 1; + nErrorLevel = 1; + goto Quit; } if (!(dwMoveStatusFlags & (MOVE_DEST_IS_FILE | MOVE_DEST_IS_DIR))) { @@ -360,8 +360,8 @@ INT cmd_move (LPTSTR param) /*source has many files but there is only one destination file*/ error_invalid_parameter_format(pszDest); FindClose(hFile); - freep (arg); - return 1; + nErrorLevel = 1; + goto Quit; } /*checks to make sure user wanted/wants the override*/ @@ -495,10 +495,16 @@ INT cmd_move (LPTSTR param) } } } + if (MoveStatus) + { ConOutResPrintf(STRING_MOVE_ERROR1); + } else + { ConOutResPrintf(STRING_MOVE_ERROR2); + nErrorLevel = 1; + } } while ((!OnlyOneFile || dwMoveStatusFlags & MOVE_SRC_CURRENT_IS_DIR ) && !(dwMoveStatusFlags & MOVE_SOURCE_IS_DIR) && @@ -508,8 +514,9 @@ INT cmd_move (LPTSTR param) if(hDestFile && hDestFile != INVALID_HANDLE_VALUE) FindClose(hDestFile); - freep (arg); - return 0; +Quit: + freep(arg); + return nErrorLevel; } #endif /* INCLUDE_CMD_MOVE */

4 years, 2 months

[reactos] 33/48: [CMD] RMDIR: Improve some aspects of the /S option.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae649656dbc174358cb87… commit ae649656dbc174358cb87b1b1e63b9e72fc58f93 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 11 23:15:20 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:07 2020 +0200 [CMD] RMDIR: Improve some aspects of the /S option. - First, the option and the APIs called by it can work directly on paths relative to the current directory. So there is no need to call GetFullPathName(), with the risk of going over MAX_PATH if the current path is quite long (or nested) but the RMDIR is called on a (short-length) relative sub-directory. - Append a path-separator (backslash), only if the specified directory does not have one already, and, that it does not specify a current directory via the "drive-root" method, e.g. "C:" without any trailing backslash. - In case there are errors during deletion of sub-directories or sub-files, print the error but continue deleting the other sub-dirs or files. - Monitor the Ctrl-C breaker as well, and stop deleting if it has been triggered. - When removing file/directory read-only attribute, just remove this attribute, but keep the other ones. - When deleting the directory, first try to do it directly; if it fails with access denied, check whether it was read-only, and if so, remove this attribute and retry deletion, otherwise fails. - When recursively deleting a drive root directory, ultimately resolve the dir pattern and check whether it's indeed a drive root, e.g. "C:\\", and if so, just return success. Indeed, calling RemoveDirectory() on such drive roots will return ERROR_ACCESS_DENIED otherwise, but we want to succeed even if, of course, we won't actually "delete" the drive root. --- base/shell/cmd/internal.c | 108 +++++++++++++++++++++++++++++++++------------- 1 file changed, 79 insertions(+), 29 deletions(-) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 3de6368583f..3f2c1b6b233 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -377,43 +377,68 @@ INT cmd_mkdir (LPTSTR param) /* * RD / RMDIR */ -BOOL DeleteFolder(LPTSTR FileName) +BOOL DeleteFolder(LPTSTR Directory) { - TCHAR Base[MAX_PATH]; - TCHAR TempFileName[MAX_PATH]; + LPTSTR pFileName; HANDLE hFile; WIN32_FIND_DATA f; + DWORD dwAttribs; + TCHAR szFullPath[MAX_PATH]; - _tcscpy(Base, FileName); - _tcscat(Base, _T("\\*")); - - hFile = FindFirstFile(Base, &f); - Base[_tcslen(Base) - 1] = _T('\0'); + _tcscpy(szFullPath, Directory); + pFileName = &szFullPath[_tcslen(szFullPath)]; + /* + * Append a path separator if we don't have one already, and if this a drive root + * path is not specified (paths like "C:" mean the current directory on drive C:). + */ + if (*szFullPath && *(pFileName - 1) != _T(':') && *(pFileName - 1) != _T('\\')) + *pFileName++ = _T('\\'); + _tcscpy(pFileName, _T("*")); + + hFile = FindFirstFile(szFullPath, &f); if (hFile != INVALID_HANDLE_VALUE) { do { + /* Check Breaker */ + if (bCtrlBreak) + break; + if (!_tcscmp(f.cFileName, _T(".")) || !_tcscmp(f.cFileName, _T(".."))) { continue; } - _tcscpy(TempFileName, Base); - _tcscat(TempFileName, f.cFileName); + _tcscpy(pFileName, f.cFileName); - if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + dwAttribs = f.dwFileAttributes; + + if (dwAttribs & FILE_ATTRIBUTE_DIRECTORY) { - DeleteFolder(TempFileName); + if (!DeleteFolder(szFullPath)) + { + /* Couldn't delete the file, print out the error */ + ErrorMessage(GetLastError(), szFullPath); + + /* Continue deleting files/subfolders */ + } } else { - /* Force file deletion */ - SetFileAttributes(TempFileName, FILE_ATTRIBUTE_NORMAL); - if (!DeleteFile(TempFileName)) + /* Force file deletion even if it's read-only */ + if (dwAttribs & FILE_ATTRIBUTE_READONLY) + SetFileAttributes(szFullPath, dwAttribs & ~FILE_ATTRIBUTE_READONLY); + + if (!DeleteFile(szFullPath)) { - FindClose(hFile); - return 0; + /* Couldn't delete the file, print out the error */ + ErrorMessage(GetLastError(), szFullPath); + + /* Restore file attributes */ + SetFileAttributes(szFullPath, dwAttribs); + + /* Continue deleting files/subfolders */ } } @@ -421,9 +446,42 @@ BOOL DeleteFolder(LPTSTR FileName) FindClose(hFile); } - /* Force directory deletion even if it's read-only */ - SetFileAttributes(FileName, FILE_ATTRIBUTE_NORMAL); - return RemoveDirectory(FileName); + /* Ignore directory deletion if the user pressed Ctrl-C */ + if (bCtrlBreak) + return TRUE; + + /* + * Detect whether we are trying to delete a pure root drive (e.g. "C:\\", but not "C:"); + * if so, just return success. Otherwise the RemoveDirectory() call below would fail + * and return ERROR_ACCESS_DENIED. + */ + if (GetFullPathName(Directory, ARRAYSIZE(szFullPath), szFullPath, NULL) == 3 && + szFullPath[1] == _T(':') && szFullPath[2] == _T('\\')) + { + return TRUE; + } + + /* First attempt to delete the directory */ + if (RemoveDirectory(Directory)) + return TRUE; + + /* + * It failed; if it was due to an denied access, check whether it was + * due to the directory being read-only. If so, remove its attribute + * and retry deletion. + */ + if (GetLastError() == ERROR_ACCESS_DENIED) + { + /* Force directory deletion even if it's read-only */ + dwAttribs = GetFileAttributes(Directory); + if (dwAttribs & FILE_ATTRIBUTE_READONLY) + { + SetFileAttributes(Directory, dwAttribs & ~FILE_ATTRIBUTE_READONLY); + return RemoveDirectory(Directory); + } + } + + return FALSE; } INT cmd_rmdir(LPTSTR param) @@ -437,7 +495,6 @@ INT cmd_rmdir(LPTSTR param) TCHAR ch; BOOL bRecurseDir = FALSE; BOOL bQuiet = FALSE; - TCHAR szFullPath[MAX_PATH]; if (!_tcsncmp(param, _T("/?"), 2)) { @@ -498,14 +555,7 @@ INT cmd_rmdir(LPTSTR param) bQuiet = TRUE; } - /* Get the folder name */ - GetFullPathName(arg[i], ARRAYSIZE(szFullPath), 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'); - - res = DeleteFolder(szFullPath); + res = DeleteFolder(arg[i]); } else {

4 years, 2 months

[reactos] 32/48: [CMD] RMDIR: Force directory deletion even if it's read-only, only when recursing over subdirectories (via the /S option).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f9b4a2e9f09e1de31ca3… commit 2f9b4a2e9f09e1de31ca39f1fb734fee859bcb17 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 11 20:34:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:06 2020 +0200 [CMD] RMDIR: Force directory deletion even if it's read-only, only when recursing over subdirectories (via the /S option). --- base/shell/cmd/internal.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 95416b4278b..3de6368583f 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -408,6 +408,7 @@ BOOL DeleteFolder(LPTSTR FileName) } else { + /* Force file deletion */ SetFileAttributes(TempFileName, FILE_ATTRIBUTE_NORMAL); if (!DeleteFile(TempFileName)) { @@ -420,6 +421,8 @@ BOOL DeleteFolder(LPTSTR FileName) FindClose(hFile); } + /* Force directory deletion even if it's read-only */ + SetFileAttributes(FileName, FILE_ATTRIBUTE_NORMAL); return RemoveDirectory(FileName); } @@ -506,6 +509,7 @@ INT cmd_rmdir(LPTSTR param) } else { + /* Without /S, do not force directory deletion even if it's read-only */ res = RemoveDirectory(arg[i]); }

4 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2020