Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 39/48: [CMD] TIME: The /T option is available only when extensions are enabled.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

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;

1 0

[reactos] 38/48: [CMD] Some code style and formatting fixes
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

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; }

1 0

[reactos] 37/48: [CMD] Simplify GetRootPath() and mark its InPath parameter pointer to const string.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

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; }

1 0

[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 19 Aug '20

19 Aug '20

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; }

1 0

[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 19 Aug '20

19 Aug '20

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) {

1 0

[reactos] 34/48: [CMD] MOVE: Set the errorlevel on failure. CORE-14261
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

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 */

1 0

[reactos] 33/48: [CMD] RMDIR: Improve some aspects of the /S option.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

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 {

1 0

[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 19 Aug '20

19 Aug '20

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]); }

1 0

[reactos] 31/48: [CMD] PATH, SET: Fix the returned error message when an environment variable does not exist.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c175d4999fb66d86111e… commit 7c175d4999fb66d86111e45d694f934d2735a61f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 5 23:39:06 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] PATH, SET: Fix the returned error message when an environment variable does not exist. Translators, please update the translations! --- base/shell/cmd/lang/cs-CZ.rc | 2 +- base/shell/cmd/lang/de-DE.rc | 2 +- base/shell/cmd/lang/el-GR.rc | 2 +- base/shell/cmd/lang/en-US.rc | 2 +- base/shell/cmd/lang/es-ES.rc | 2 +- base/shell/cmd/lang/fr-FR.rc | 2 +- base/shell/cmd/lang/hu-HU.rc | 2 +- base/shell/cmd/lang/id-ID.rc | 2 +- base/shell/cmd/lang/it-IT.rc | 2 +- base/shell/cmd/lang/ja-JP.rc | 2 +- base/shell/cmd/lang/no-NO.rc | 2 +- base/shell/cmd/lang/pl-PL.rc | 2 +- base/shell/cmd/lang/ro-RO.rc | 2 +- base/shell/cmd/lang/ru-RU.rc | 2 +- base/shell/cmd/lang/sk-SK.rc | 2 +- base/shell/cmd/lang/sq-AL.rc | 2 +- base/shell/cmd/lang/sv-SE.rc | 2 +- base/shell/cmd/lang/tr-TR.rc | 2 +- base/shell/cmd/lang/uk-UA.rc | 2 +- base/shell/cmd/lang/zh-CN.rc | 2 +- base/shell/cmd/lang/zh-TW.rc | 2 +- base/shell/cmd/path.c | 2 +- base/shell/cmd/resource.h | 2 +- base/shell/cmd/set.c | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 3499a2641a9..0f788899104 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -523,7 +523,7 @@ title new title\n" STRING_ERROR_CANNOTPIPE "Chyba! Nelze vytvořit rouru! Nelze vytvořit dočasný soubor!\n" STRING_ERROR_D_PAUSEMSG "Pokračujte stisknutím libovolné klávesy . . . " STRING_ERROR_DRIVER_NOT_READY "Jednotka není připravena" - STRING_PATH_ERROR "CMD: Ne v prostředí '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Neplatný přepínač - %s\n" STRING_REPLACE_ERROR2 "Cesta nenalezena - %s\n" STRING_REPLACE_ERROR3 "Název souboru, adresáře nebo popisek svazku je neplatný.\n" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 94cb49924e3..e9afa7eefb3 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -519,7 +519,7 @@ Titel neuer Titel" STRING_ERROR_CANNOTPIPE "Fehler: Pipen nicht möglich! Temporäre Datei kann nicht geöffnet werden!\n" STRING_ERROR_D_PAUSEMSG "Drücken Sie eine beliebige Taste . . . " STRING_ERROR_DRIVER_NOT_READY "Laufwerk ist nicht bereit" - STRING_PATH_ERROR "CMD: Nicht in Umgebung '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Ungültiger Parameter - %s\n" STRING_REPLACE_ERROR2 "Pfad wurde nicht gefunden - %s\n" STRING_REPLACE_ERROR3 "Der Dateiname, Ordnername oder die Syntax der Volumenbezeichung sind inkorrekt.\n" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 10a48f409e1..1714f763af1 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -522,7 +522,7 @@ title new title\n" STRING_ERROR_CANNOTPIPE "Σφάλμα! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG "Πατήστε οποιοδήποτε πλήκτρο για συνέχεια . . . " STRING_ERROR_DRIVER_NOT_READY "Ο δίσκος δεν είναι έτοιμος" - STRING_PATH_ERROR "CMD: Not in environment '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" STRING_REPLACE_ERROR2 "Δε βρέθηκε το μονοπάτι - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index e5d0ea5056a..2286203a633 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -518,7 +518,7 @@ title new title\n" STRING_ERROR_CANNOTPIPE "Error! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG "Press any key to continue . . . " STRING_ERROR_DRIVER_NOT_READY "Drive not ready" - STRING_PATH_ERROR "CMD: Not in environment '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" STRING_REPLACE_ERROR2 "Path not found - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 786b5f7e974..cf18bec6044 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -524,7 +524,7 @@ title Nuevo título\n" STRING_ERROR_CANNOTPIPE "¡Error! ¡No se puede apilar! ¡No se puede abrir el archivo temporal!\n" STRING_ERROR_D_PAUSEMSG "Pulse una tecla para continuar ... " STRING_ERROR_DRIVER_NOT_READY "La unidad no está lista" - STRING_PATH_ERROR "CMD: No está en el entorno '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Argumento no válido - %s\n" STRING_REPLACE_ERROR2 "Ruta no encontrada - %s\n" STRING_REPLACE_ERROR3 "La sintaxis del nombre de archivo, carpeta o volúmen es incorrecta.\n" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 7a681fdf5b3..92a32cf1fa2 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -534,7 +534,7 @@ titre titre de la fenêtre" STRING_ERROR_CANNOTPIPE "Erreur ! Impossible de chaîner ! Échec à l'ouverture du fichier temporaire!\n" STRING_ERROR_D_PAUSEMSG "Appuyez sur une touche pour continuer . . . " STRING_ERROR_DRIVER_NOT_READY "Lecteur non prêt" - STRING_PATH_ERROR "CMD : Pas dans l'environnement '%s'\n" + STRING_SET_ENV_ERROR "Variable d'environnement '%s' non définie\n" STRING_REPLACE_ERROR1 "Commutateur invalide - %s\n" STRING_REPLACE_ERROR2 "Chemin introuvable - %s\n" STRING_REPLACE_ERROR3 "La syntaxe du nom de fichier, du répertoire, ou du nom de volume est incorrecte.\n" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index d73faa7c2cc..003cf0d6c96 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -503,7 +503,7 @@ title new title\n" STRING_ERROR_CANNOTPIPE "Error! Cannot pipe! Cannot open temporary állomány!\n" STRING_ERROR_D_PAUSEMSG "A folytatáshoz nyomj meg egy billentyût . . . " STRING_ERROR_DRIVER_NOT_READY "A meghajtó nem áll készen" - STRING_PATH_ERROR "CMD: Not in environment '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" STRING_REPLACE_ERROR2 "Path not found - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 2f7ce290d59..befdb9a16a2 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -517,7 +517,7 @@ title judul baru\n" STRING_ERROR_CANNOTPIPE "Salah! Tidak bisa melakukan pipe! Tidak bisa membuka file temporal!\n" STRING_ERROR_D_PAUSEMSG "Tekan tombol untuk melanjutkan . . . " STRING_ERROR_DRIVER_NOT_READY "Drive tidak siap" - STRING_PATH_ERROR "CMD: Tidak dalam lingkungan '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" STRING_REPLACE_ERROR2 "Path not found - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index e3485640449..e02ad50cbd0 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -527,7 +527,7 @@ titolo il nuovo titolo\n" STRING_ERROR_CANNOTPIPE "Errore! Impossibile ridirigere! Impossibile aprire un file temporaneo!\n" STRING_ERROR_D_PAUSEMSG "Premi un tasto per continuare . . . " STRING_ERROR_DRIVER_NOT_READY "Disco non pronto" - STRING_PATH_ERROR "CMD: Non nell'ambiente '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Parametro non valido - %s\n" STRING_REPLACE_ERROR2 "Percorso non trovato - %s\n" STRING_REPLACE_ERROR3 "Il nome del file, della cartella o della etichetta di volume è errato.\n" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index a0581742431..3bd1a7ea396 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -525,7 +525,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_ERROR_CANNOTPIPE "エラー! パイプできません! 一時ファイルを開けません!\n" STRING_ERROR_D_PAUSEMSG "続行するには何かキーを押してください . . . " STRING_ERROR_DRIVER_NOT_READY "ドライブの準備ができていません。" - STRING_PATH_ERROR "CMD: Not in environment '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" STRING_REPLACE_ERROR2 "Path not found - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 7cb1bb65431..c8577d88c55 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -516,7 +516,7 @@ tittel ny tittel\n" STRING_ERROR_CANNOTPIPE "Feil! Kan ikke bruke datakanal! Kan ikke åpne midlertidig fil!\n" STRING_ERROR_D_PAUSEMSG "Trykk en tast for å fortsette . . . " STRING_ERROR_DRIVER_NOT_READY "Stasjonen er ikke klar" - STRING_PATH_ERROR "CMD: Ikke i miljøet '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Invalid switch - %s\n" STRING_REPLACE_ERROR2 "Mappen ble ikke funnet - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 49d89386170..626696c546b 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -523,7 +523,7 @@ title nowy tytuł okna\n" STRING_ERROR_CANNOTPIPE "Błąd potoków! Nie można otworzyć pliku tymczasowego.\n" STRING_ERROR_D_PAUSEMSG "Naciśnij dowolny klawisz, aby kontynuować . . . " STRING_ERROR_DRIVER_NOT_READY "Napęd nie jest gotowy" - STRING_PATH_ERROR "CMD: Poza środowiskiem '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Nieprawidłowy parametr - %s\n" STRING_REPLACE_ERROR2 "Ścieżka nie została odnaleziona - %s\n" STRING_REPLACE_ERROR3 "Nazwa pliku, katalogu lub napędu nie jest prawidłowa.\n" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index a9349427dc8..2013f65d8d8 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -551,7 +551,7 @@ titlu Noul titlu.\n" STRING_ERROR_CANNOTPIPE "Eroare! Nu datele nu pot fi canalizate! Nu fișierul temporar nu a putut fi deschis!\n" STRING_ERROR_D_PAUSEMSG "Tastați pentru a continua... " STRING_ERROR_DRIVER_NOT_READY "Unitatea de stocare nu e utilizabilă" - STRING_PATH_ERROR "CMD: «%s» inexistentă în mediu\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Argument eronat - %s\n" STRING_REPLACE_ERROR2 "Calea nu este găsită - %s\n" STRING_REPLACE_ERROR3 "Numele fișierului, directorului sau eticheta volumului este incorectă.\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 64c217e547d..554b7e028ef 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -528,7 +528,7 @@ RESTORE восстанавливает окно\n\ STRING_ERROR_CANNOTPIPE "Ошибка! Невозможно использовать pipe! Невозможно создать временный файл!\n" STRING_ERROR_D_PAUSEMSG "Для продолжения нажмите любую клавишу . . . " STRING_ERROR_DRIVER_NOT_READY "Устройство не готово" - STRING_PATH_ERROR "CMD: Не в среде окружения '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Неверный ключ - %s\n" STRING_REPLACE_ERROR2 "Путь не найден - %s\n" STRING_REPLACE_ERROR3 "Имя файла, папки или метка диска неверная.\n" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 3bb33e7c01a..c0a5673bd44 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -524,7 +524,7 @@ title new title\n" STRING_ERROR_CANNOTPIPE "Chyba! Cannot pipe! Cannot open temporary file!\n" STRING_ERROR_D_PAUSEMSG "Pokračujte stlačením ľubovoľného klávesu ... " STRING_ERROR_DRIVER_NOT_READY "Jednotka nie je pripravená" - STRING_PATH_ERROR "CMD: Not in environment '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Neplatný prepínač - %s\n" STRING_REPLACE_ERROR2 "Cesta sa nenašla - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index f31217025f0..42e2d5736f5 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -522,7 +522,7 @@ title titull i ri\n" STRING_ERROR_CANNOTPIPE "Error! Nuk mund të pipoj! Nuk mund të hape dokumentet e perkohshem!\n" STRING_ERROR_D_PAUSEMSG "Shtypni një buton për të vazhduar . . . " STRING_ERROR_DRIVER_NOT_READY "Drive nuk është gati" - STRING_PATH_ERROR "CMD: Jo në mjedis '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Qeles invalid - %s\n" STRING_REPLACE_ERROR2 "Rruga nuk u gjet - %s\n" STRING_REPLACE_ERROR3 "Dokumenti, emri i direktorise, ose syntaksi i etiketes volumetrike eshte gabim.\n" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 41c5131f015..b9d857299f5 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -516,7 +516,7 @@ tittel ny tittel\n" STRING_ERROR_CANNOTPIPE "Fel! Kan inte bruke datakanal! Kan inte åpne midlertidig fil!\n" STRING_ERROR_D_PAUSEMSG "Tryck på valfri tangent för att fortsätta . . . " STRING_ERROR_DRIVER_NOT_READY "enheten är inte klar" - STRING_PATH_ERROR "CMD: Inte i miljön '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Felaktig växel - %s\n" STRING_REPLACE_ERROR2 "Mappen ble inte funnet - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 44810d8fef2..326bc16e907 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -523,7 +523,7 @@ başlık Yeni başlık\n" STRING_ERROR_CANNOTPIPE "Yanlışlık! Borulanamıyor! Geçici kütük açılamıyor!\n" STRING_ERROR_D_PAUSEMSG "Sürdürmek için bir düğmeye basınız . . . " STRING_ERROR_DRIVER_NOT_READY "Sürücü anık değil." - STRING_PATH_ERROR "CMD: ""%s"" ortamda yok.\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Geçersiz seçenek - %s\n" STRING_REPLACE_ERROR2 "Yol bulunamadı - %s\n" STRING_REPLACE_ERROR3 "Kütük adı, dizin adı ya da birim etiketi yazımı yanlış.\n" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 2b6a6e85348..4b34f727177 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -528,7 +528,7 @@ title новий заголовок\n" STRING_ERROR_CANNOTPIPE "Помилка! Неможливо використати pipe! Неможливо вiдкрити тимчасовий файл!\n" STRING_ERROR_D_PAUSEMSG "Натиснiть будь-яку клавiшу для продовження . . . " STRING_ERROR_DRIVER_NOT_READY "Пристрій не готовий" - STRING_PATH_ERROR "CMD: Не в середовищi '%s'\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "Невiрний ключ - %s\n" STRING_REPLACE_ERROR2 "Шлях не знайдено - %s\n" STRING_REPLACE_ERROR3 "Синтаксис iменi файлу, теки чи мiтки диску некоректнi.\n" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index 724459ca8f4..7562413928b 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -488,7 +488,7 @@ RESTORE 恢复窗口\n\ STRING_ERROR_CANNOTPIPE "错误！无法创建管道！不能打开临时文件！\n" STRING_ERROR_D_PAUSEMSG "按任意键继续... " STRING_ERROR_DRIVER_NOT_READY "驱动器未就绪" - STRING_PATH_ERROR "CMD: 不在环境 '%s' 中\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "无效开关 - %s\n" STRING_REPLACE_ERROR2 "路径未找到 - %s\n" STRING_REPLACE_ERROR3 "文件名、目录名或卷标语法不正确。\n" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index d4e37356d5b..4d59c824948 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -489,7 +489,7 @@ RESTORE 恢復視窗\n\ STRING_ERROR_CANNOTPIPE "錯誤！無法創建管道！不能開啟臨時檔案！\n" STRING_ERROR_D_PAUSEMSG "按任意鍵繼續... " STRING_ERROR_DRIVER_NOT_READY "驅動器未就緒" - STRING_PATH_ERROR "CMD: 不在環境 '%s' 中\n" + STRING_SET_ENV_ERROR "Environment variable '%s' is not defined\n" STRING_REPLACE_ERROR1 "無效開關 - %s\n" STRING_REPLACE_ERROR2 "路徑未找到 - %s\n" STRING_REPLACE_ERROR3 "檔名、目錄名或卷標語法不正確。\n" diff --git a/base/shell/cmd/path.c b/base/shell/cmd/path.c index c00851dae40..1faed8ea29c 100644 --- a/base/shell/cmd/path.c +++ b/base/shell/cmd/path.c @@ -60,7 +60,7 @@ INT cmd_path (LPTSTR param) if (dwBuffer == 0) { cmd_free(pszBuffer); - ConOutResPrintf(STRING_VOL_HELP2, _T("PATH")); + ConErrResPrintf(STRING_SET_ENV_ERROR, _T("PATH")); return 0; } else if (dwBuffer > ENV_BUFFER_SIZE) diff --git a/base/shell/cmd/resource.h b/base/shell/cmd/resource.h index 933d5677408..7836cfb96b8 100644 --- a/base/shell/cmd/resource.h +++ b/base/shell/cmd/resource.h @@ -52,7 +52,7 @@ #define STRING_GOTO_ERROR2 341 #define STRING_MOVE_ERROR1 342 #define STRING_MOVE_ERROR2 343 -#define STRING_PATH_ERROR 345 +#define STRING_SET_ENV_ERROR 345 #define STRING_REN_ERROR1 346 #define STRING_TIME_ERROR1 348 #define STRING_TYPE_ERROR1 349 diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index 7a4a5d4c408..f63de691a2f 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -197,7 +197,7 @@ INT cmd_set(LPTSTR param) if (!bFound) { - ConErrResPrintf(STRING_PATH_ERROR, param); + ConErrResPrintf(STRING_SET_ENV_ERROR, param); nErrorLevel = 1; return 1; }

1 0

[reactos] 30/48: [CMD] Use kernel32!lstrcmp(i) when comparing strings with the IF command.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e09a6a3ffd92c565e206… commit 6e09a6a3ffd92c565e20664a023add74eaa55ecf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 1 02:42:04 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:05 2020 +0200 [CMD] Use kernel32!lstrcmp(i) when comparing strings with the IF command. Use kernel32!lstrcmp(i) instead of CRT!_tcs(i)cmp, so as to use the correct current thread locale information when comparing user-specific strings. As a result, the following comparison: 'b LSS B' will return TRUE, instead of FALSE as it would be by using the CRT functions (and by naively considering the lexicographical order in ANSI). This behaviour has been introduced in Windows 2000 onwards. --- base/shell/cmd/if.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index 830ec459c8a..c7882ad2fec 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -32,7 +32,7 @@ #include "precomp.h" -static INT GenericCmp(INT (*StringCmp)(LPCTSTR, LPCTSTR), +static INT GenericCmp(INT (WINAPI *StringCmp)(LPCTSTR, LPCTSTR), LPCTSTR Left, LPCTSTR Right) { TCHAR *end; @@ -152,14 +152,20 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) } else { - /* Do case-insensitive string comparisons if /I specified */ - INT (*StringCmp)(LPCTSTR, LPCTSTR) = - (Cmd->If.Flags & IFFLAG_IGNORECASE) ? _tcsicmp : _tcscmp; + /* + * Do case-insensitive string comparisons if /I specified. + * + * Since both strings are user-specific, use kernel32!lstrcmp(i) + * instead of CRT!_tcs(i)cmp, so as to use the correct + * current thread locale information. + */ + INT (WINAPI *StringCmp)(LPCTSTR, LPCTSTR) = + (Cmd->If.Flags & IFFLAG_IGNORECASE) ? lstrcmpi : lstrcmp; if (Cmd->If.Operator == IF_STRINGEQ) { /* IF str1 == str2 */ - result = StringCmp(Left, Right) == 0; + result = (StringCmp(Left, Right) == 0); } else { @@ -168,9 +174,9 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) { case IF_EQU: result = (result == 0); break; case IF_NEQ: result = (result != 0); break; - case IF_LSS: result = (result < 0); break; + case IF_LSS: result = (result < 0); break; case IF_LEQ: result = (result <= 0); break; - case IF_GTR: result = (result > 0); break; + case IF_GTR: result = (result > 0); break; case IF_GEQ: result = (result >= 0); break; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs