Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/04: [CMD] SET: Fix displaying the environment variables with a given prefix.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe9aa42d5f61fdd2fd450… commit fe9aa42d5f61fdd2fd4501aa7541e09e98207cb7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 17:03:45 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 21:39:18 2020 +0200 [CMD] SET: Fix displaying the environment variables with a given prefix. - Restore any truncated space in the name prefix, before displaying any error message. - When trimming the name prefix from "special" characters (spaces, comma and semicolon), so that e.g. "set ,; ,;FOO" displays all the variables starting by "FOO", save also a pointer to the original name prefix, that we will use for variables lookup as well. This is done, because the SET command allows setting an environment variable whose name actually contains these characters (e.g. "set ,; ,;FOO=42"), however, by trimming the characters, doing "set ,; ,;FOO" would not allow seeing such variables. With the fix, it is now possible to show them. --- base/shell/cmd/set.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index f63de691a2f..0128314ca57 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -168,12 +168,27 @@ INT cmd_set(LPTSTR param) else { /* Display all the environment variables with the given prefix */ - BOOL bFound = FALSE; - + LPTSTR pOrgParam = param; + BOOLEAN bFound = FALSE; + BOOLEAN bRestoreSpace; + + /* + * Trim the prefix from "special" characters (only when displaying the + * environment variables), so that e.g. "SET ,; ,;FOO" will display all + * the variables starting by "FOO". + * The SET command allows as well to set an environment variable whose name + * actually contains these characters (e.g. "SET ,; ,;FOO=42"); however, + * by trimming the characters, doing "SET ,; ,;FOO" would not allow seeing + * such variables. + * Thus, we also save a pointer to the original variable name prefix, that + * we will look it up as well below. + */ while (_istspace(*param) || *param == _T(',') || *param == _T(';')) - param++; + ++param; + /* Just remove the very last space, if present */ p = _tcsrchr(param, _T(' ')); + bRestoreSpace = (p != NULL); if (!p) p = param + _tcslen(param); *p = _T('\0'); @@ -184,7 +199,9 @@ INT cmd_set(LPTSTR param) lpOutput = lpEnv; while (*lpOutput) { - if (!_tcsnicmp(lpOutput, param, p - param)) + /* Look up for both the original and truncated variable name prefix */ + if (!_tcsnicmp(lpOutput, pOrgParam, p - pOrgParam) || + !_tcsnicmp(lpOutput, param, p - param)) { ConOutPuts(lpOutput); ConOutChar(_T('\n')); @@ -195,6 +212,11 @@ INT cmd_set(LPTSTR param) FreeEnvironmentStrings(lpEnv); } + /* Restore the truncated space for correctly + * displaying the error message, if any. */ + if (bRestoreSpace) + *p = _T(' '); + if (!bFound) { ConErrResPrintf(STRING_SET_ENV_ERROR, param);

1 0

[reactos] 48/48: [CMD] REPLACE: Fix a memory leak.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cea82b14c5ff14fc56b6… commit 8cea82b14c5ff14fc56b6d0e5a432fc9e637f490 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 25 01:00:06 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:13 2020 +0200 [CMD] REPLACE: Fix a memory leak. --- base/shell/cmd/replace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/shell/cmd/replace.c b/base/shell/cmd/replace.c index 5929952582f..35c2576168f 100644 --- a/base/shell/cmd/replace.c +++ b/base/shell/cmd/replace.c @@ -437,6 +437,7 @@ INT cmd_replace (LPTSTR param) break; default: invalid_switch(arg[i]); + freep(arg); return 0; } }

1 0

[reactos] 47/48: [CMD] SETLOCAL / ENDLOCAL: Save / Restore as well the current drive and current directory.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cb7e0852260735df364a… commit 1cb7e0852260735df364abb1d993d5d67f22eab6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 18 23:35:56 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:13 2020 +0200 [CMD] SETLOCAL / ENDLOCAL: Save / Restore as well the current drive and current directory. That's an actual fact, done on original MS-DOS COMMAND.COM, FreeCOM, Windows' CMD.EXE, etc., but is strangely undocumented on MSDN documentation. See https://www.dostips.com/forum/viewtopic.php?t=4436 Fixes some cmd_winetests. --- base/shell/cmd/setlocal.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/base/shell/cmd/setlocal.c b/base/shell/cmd/setlocal.c index daf86099050..18cec04b6f0 100644 --- a/base/shell/cmd/setlocal.c +++ b/base/shell/cmd/setlocal.c @@ -9,10 +9,13 @@ #include "precomp.h" +#include <direct.h> // For _getdrive(). + typedef struct _SETLOCAL { struct _SETLOCAL *Prev; LPTSTR Environment; + INT CurDrive; BOOL EnableExtensions; BOOL DelayedExpansion; } SETLOCAL, *PSETLOCAL; @@ -42,6 +45,13 @@ INT cmd_setlocal(LPTSTR param) LPTSTR* arg; INT argc, i; + if (!_tcscmp(param, _T("/?"))) + { + // FIXME + ConOutPuts(_T("SETLOCAL help not implemented yet!\n")); + return 0; + } + /* SETLOCAL only works inside a batch context */ if (!bc) return 0; @@ -53,6 +63,7 @@ INT cmd_setlocal(LPTSTR param) error_out_of_memory(); return 1; } + Saved->Environment = DuplicateEnvironment(); if (!Saved->Environment) { @@ -60,6 +71,12 @@ INT cmd_setlocal(LPTSTR param) cmd_free(Saved); return 1; } + /* + * Save the current drive; the duplicated environment + * contains the corresponding current directory. + */ + Saved->CurDrive = _getdrive(); + Saved->EnableExtensions = bEnableExtensions; Saved->DelayedExpansion = bDelayedExpansion; @@ -94,9 +111,15 @@ INT cmd_endlocal(LPTSTR param) { LPTSTR Environ, Name, Value; PSETLOCAL Saved; + TCHAR drvEnvVar[] = _T("=?:"); + TCHAR szCurrent[MAX_PATH]; - /* ENDLOCAL doesn't take any params */ - UNREFERENCED_PARAMETER(param); + if (!_tcscmp(param, _T("/?"))) + { + // FIXME + ConOutPuts(_T("ENDLOCAL help not implemented yet!\n")); + return 0; + } /* Pop a SETLOCAL struct off of this batch context's stack */ if (!bc || !(Saved = bc->setlocal)) @@ -133,6 +156,14 @@ INT cmd_endlocal(LPTSTR param) Name = Value; } + /* Restore the current drive and its current directory from the environment */ + drvEnvVar[1] = _T('A') + Saved->CurDrive - 1; + if (!GetEnvironmentVariable(drvEnvVar, szCurrent, ARRAYSIZE(szCurrent))) + { + _stprintf(szCurrent, _T("%C:\\"), _T('A') + Saved->CurDrive - 1); + } + _tchdir(szCurrent); // SetRootPath(NULL, szCurrent); + cmd_free(Saved->Environment); cmd_free(Saved); return 0;

1 0

[reactos] 46/48: [CMD] setlocal.c : 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=e8e31267c5a47a12db55e… commit e8e31267c5a47a12db55eb50958542300bf62cb5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:32:39 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:13 2020 +0200 [CMD] setlocal.c : Code style and formatting fixes --- base/shell/cmd/setlocal.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/base/shell/cmd/setlocal.c b/base/shell/cmd/setlocal.c index ca913dc2a6e..daf86099050 100644 --- a/base/shell/cmd/setlocal.c +++ b/base/shell/cmd/setlocal.c @@ -12,10 +12,10 @@ typedef struct _SETLOCAL { struct _SETLOCAL *Prev; + LPTSTR Environment; BOOL EnableExtensions; BOOL DelayedExpansion; - LPTSTR Environment; -} SETLOCAL; +} SETLOCAL, *PSETLOCAL; /* Create a copy of the current environment */ LPTSTR @@ -38,11 +38,11 @@ DuplicateEnvironment(VOID) INT cmd_setlocal(LPTSTR param) { - SETLOCAL *Saved; - LPTSTR *arg; + PSETLOCAL Saved; + LPTSTR* arg; INT argc, i; - /* SETLOCAL only works inside a batch file */ + /* SETLOCAL only works inside a batch context */ if (!bc) return 0; @@ -53,9 +53,6 @@ INT cmd_setlocal(LPTSTR param) error_out_of_memory(); return 1; } - Saved->Prev = bc->setlocal; - Saved->EnableExtensions = bEnableExtensions; - Saved->DelayedExpansion = bDelayedExpansion; Saved->Environment = DuplicateEnvironment(); if (!Saved->Environment) { @@ -63,6 +60,10 @@ INT cmd_setlocal(LPTSTR param) cmd_free(Saved); return 1; } + Saved->EnableExtensions = bEnableExtensions; + Saved->DelayedExpansion = bDelayedExpansion; + + Saved->Prev = bc->setlocal; bc->setlocal = Saved; nErrorLevel = 0; @@ -70,15 +71,13 @@ INT cmd_setlocal(LPTSTR param) arg = splitspace(param, &argc); for (i = 0; i < argc; i++) { - if (!_tcsicmp(arg[i], _T("enableextensions"))) - /* FIXME: not implemented! */ + if (!_tcsicmp(arg[i], _T("ENABLEEXTENSIONS"))) bEnableExtensions = TRUE; - else if (!_tcsicmp(arg[i], _T("disableextensions"))) - /* FIXME: not implemented! */ + else if (!_tcsicmp(arg[i], _T("DISABLEEXTENSIONS"))) bEnableExtensions = FALSE; - else if (!_tcsicmp(arg[i], _T("enabledelayedexpansion"))) + else if (!_tcsicmp(arg[i], _T("ENABLEDELAYEDEXPANSION"))) bDelayedExpansion = TRUE; - else if (!_tcsicmp(arg[i], _T("disabledelayedexpansion"))) + else if (!_tcsicmp(arg[i], _T("DISABLEDELAYEDEXPANSION"))) bDelayedExpansion = FALSE; else { @@ -91,13 +90,15 @@ INT cmd_setlocal(LPTSTR param) return nErrorLevel; } -/* endlocal doesn't take any params */ INT cmd_endlocal(LPTSTR param) { LPTSTR Environ, Name, Value; - SETLOCAL *Saved; + PSETLOCAL Saved; + + /* ENDLOCAL doesn't take any params */ + UNREFERENCED_PARAMETER(param); - /* Pop a SETLOCAL struct off of this batch file's stack */ + /* Pop a SETLOCAL struct off of this batch context's stack */ if (!bc || !(Saved = bc->setlocal)) return 0; bc->setlocal = Saved->Prev; @@ -107,7 +108,7 @@ INT cmd_endlocal(LPTSTR param) /* First, clear out the environment. Since making any changes to the * environment invalidates pointers obtained from GetEnvironmentStrings(), - * we must make a copy of it and get the variable names from that */ + * we must make a copy of it and get the variable names from that. */ Environ = DuplicateEnvironment(); if (Environ) { @@ -122,7 +123,7 @@ INT cmd_endlocal(LPTSTR param) cmd_free(Environ); } - /* Now, restore variables from the copy saved by cmd_setlocal */ + /* Now, restore variables from the copy saved by cmd_setlocal() */ for (Name = Saved->Environment; *Name; Name += _tcslen(Name) + 1) { if (!(Value = _tcschr(Name + 1, _T('='))))

1 0

[reactos] 45/48: [CMD] Implement provisional support for the HIGHESTNUMANODENUMBER environment-like variable.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90159e1e518483481ff70… commit 90159e1e518483481ff700ff1456f603090f3008 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 23:37:50 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:12 2020 +0200 [CMD] Implement provisional support for the HIGHESTNUMANODENUMBER environment-like variable. This variable is available only in Win7+, even if the underlying API GetNumaHighestNodeNumber() is available in Win2003+ --- base/shell/cmd/cmd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 1cc0a0663f5..fbc12154d1b 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -948,6 +948,17 @@ GetEnvVarOrSpecial(LPCTSTR varName) _itot(nErrorLevel, ret, 10); return ret; } +#if (NTDDI_VERSION >= NTDDI_WIN7) + /* Available in Win7+, even if the underlying API is available in Win2003+ */ + /* %HIGHESTNUMANODENUMBER% */ + else if (_tcsicmp(varName, _T("HIGHESTNUMANODENUMBER")) == 0) + { + ULONG NumaNodeNumber = 0; + GetNumaHighestNodeNumber(&NumaNodeNumber); + _itot(NumaNodeNumber, ret, 10); + return ret; + } +#endif return NULL; }

1 0

[reactos] 44/48: [CMD] The "special" environment-like variables are 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=04e0fe0652553b1472d42… commit 04e0fe0652553b1472d4255fa05f87110b1f1870 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 23:27:35 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:12 2020 +0200 [CMD] The "special" environment-like variables are available only when extensions are enabled. The "special" variables are: CD, DATE, TIME, RANDOM, CMDCMDLINE, CMDEXTVERSION, ERRORLEVEL (and on Win7+, HIGHESTNUMANODENUMBER). --- base/shell/cmd/cmd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 3a57c04ef33..1cc0a0663f5 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -902,7 +902,11 @@ GetEnvVarOrSpecial(LPCTSTR varName) if (var) return var; - /* env var doesn't exist, look for a "special" one */ + /* The environment variable doesn't exist, look for + * a "special" one only if extensions are enabled. */ + if (!bEnableExtensions) + return NULL; + /* %CD% */ if (_tcsicmp(varName, _T("CD")) == 0) {

1 0

[reactos] 43/48: [CMD] FOR: Some functionality 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=41a93a4e58d3aa62ae3e2… commit 41a93a4e58d3aa62ae3e28303e8433878169d827 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 23:07:23 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:11 2020 +0200 [CMD] FOR: Some functionality is available only when extensions are enabled. This is basically all the advanced functionality enabled with the /D, /R, /L and /F flags, and the usage of enhanced variables. --- base/shell/cmd/for.c | 32 ++++++++++++++++++++------------ base/shell/cmd/parser.c | 6 ++++++ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index 75b462352cf..67a9240c787 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -500,19 +500,27 @@ ExecuteFor(PARSED_COMMAND *Cmd) Cmd->For.Context = lpNew; fc = lpNew; - if (Cmd->For.Switches & FOR_F) + /* Run the extended FOR syntax only if extensions are enabled */ + if (bEnableExtensions) { - Ret = ForF(Cmd, List, Buffer); - } - else if (Cmd->For.Switches & FOR_LOOP) - { - Ret = ForLoop(Cmd, List, Buffer); - } - else if (Cmd->For.Switches & FOR_RECURSIVE) - { - DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."), - MAX_PATH, Buffer, NULL); - Ret = ForRecursive(Cmd, List, Buffer, &Buffer[Len]); + if (Cmd->For.Switches & FOR_F) + { + Ret = ForF(Cmd, List, Buffer); + } + else if (Cmd->For.Switches & FOR_LOOP) + { + Ret = ForLoop(Cmd, List, Buffer); + } + else if (Cmd->For.Switches & FOR_RECURSIVE) + { + DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."), + MAX_PATH, Buffer, NULL); + Ret = ForRecursive(Cmd, List, Buffer, &Buffer[Len]); + } + else + { + Ret = ForDir(Cmd, List, Buffer, Buffer); + } } else { diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 21bfd2504a9..048c83e3f96 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -494,6 +494,10 @@ static PARSED_COMMAND *ParseFor(void) memset(Cmd, 0, sizeof(PARSED_COMMAND)); Cmd->Type = C_FOR; + /* Skip the extended FOR syntax if extensions are disabled */ + if (!bEnableExtensions) + goto parseForBody; + while (1) { if (_tcsicmp(CurrentToken, _T("/D")) == 0) @@ -543,6 +547,8 @@ static PARSED_COMMAND *ParseFor(void) goto error; } +parseForBody: + /* Variable name should be % and just one other character */ if (CurrentToken[0] != _T('%') || _tcslen(CurrentToken) != 2) goto error;

1 0

[reactos] 42/48: [CMD] IF: Some functionality 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=fedc68aea842c11d45e15… commit fedc68aea842c11d45e158394a7eae1b8e7cab1b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 21:41:07 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:11 2020 +0200 [CMD] IF: Some functionality is available only when extensions are enabled. This functionality is: case insensitivity comparisons (/I); CMDEXTVERSION and DEFINED unary operators; EQU, NEQ, LSS, LEQ, GTR, GEQ generic string comparators. --- base/shell/cmd/cmd.c | 4 ++-- base/shell/cmd/cmd.h | 23 ++++++++++++++++++----- base/shell/cmd/if.c | 8 ++++---- base/shell/cmd/parser.c | 32 ++++++++++++++++++++++++-------- 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 4bbffa9faf1..3a57c04ef33 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -934,8 +934,8 @@ GetEnvVarOrSpecial(LPCTSTR varName) /* %CMDEXTVERSION% */ else if (_tcsicmp(varName, _T("CMDEXTVERSION")) == 0) { - /* Set version number to 2 */ - _itot(2, ret, 10); + /* Set version number to CMDEXTVERSION */ + _itot(CMDEXTVERSION, ret, 10); return ret; } /* %ERRORLEVEL% */ diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index d7bce5c139e..c7a9f4db8b8 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -28,6 +28,9 @@ #include "cmdver.h" #include "cmddbg.h" +/* Version of the Command Extensions */ +#define CMDEXTVERSION 2 + #define BREAK_BATCHFILE 1 #define BREAK_OUTOFBATCH 2 /* aka. BREAK_ENDOFBATCHFILES */ #define BREAK_INPUT 3 @@ -232,11 +235,21 @@ INT CommandHistory(LPTSTR param); #endif /* Prototypes for IF.C */ -#define IFFLAG_NEGATE 1 /* NOT */ -#define IFFLAG_IGNORECASE 2 /* /I */ -enum { IF_CMDEXTVERSION, IF_DEFINED, IF_ERRORLEVEL, IF_EXIST, - IF_STRINGEQ, /* == */ - IF_EQU, IF_GTR, IF_GEQ, IF_LSS, IF_LEQ, IF_NEQ }; +#define IFFLAG_NEGATE 1 /* NOT */ +#define IFFLAG_IGNORECASE 2 /* /I - Extended */ +enum { + /** Unary operators **/ + /* Standard */ + IF_ERRORLEVEL, IF_EXIST, + /* Extended */ + IF_CMDEXTVERSION, IF_DEFINED, + + /** Binary operators **/ + /* Standard */ + IF_STRINGEQ, /* == */ + /* Extended */ + IF_EQU, IF_NEQ, IF_LSS, IF_LEQ, IF_GTR, IF_GEQ +}; INT ExecuteIf(struct _PARSED_COMMAND *Cmd); /* Prototypes for INTERNAL.C */ diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index c7882ad2fec..e74298ad612 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -82,7 +82,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) return 1; } - if (Cmd->If.Operator == IF_CMDEXTVERSION) + if (bEnableExtensions && (Cmd->If.Operator == IF_CMDEXTVERSION)) { /* IF CMDEXTVERSION n: check if Command Extensions version * is greater or equal to n */ @@ -93,9 +93,9 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) cmd_free(Right); return 1; } - result = (2 >= n); + result = (CMDEXTVERSION >= n); } - else if (Cmd->If.Operator == IF_DEFINED) + else if (bEnableExtensions && (Cmd->If.Operator == IF_DEFINED)) { /* IF DEFINED var: check if environment variable exists */ result = (GetEnvVarOrSpecial(Right) != NULL); @@ -167,7 +167,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) /* IF str1 == str2 */ result = (StringCmp(Left, Right) == 0); } - else + else if (bEnableExtensions) { result = GenericCmp(StringCmp, Left, Right); switch (Cmd->If.Operator) diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 20310c77830..21bfd2504a9 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -24,19 +24,26 @@ static const TCHAR RedirString[][3] = { _T("<"), _T(">"), _T(">>") }; static const TCHAR *const IfOperatorString[] = { - _T("cmdextversion"), - _T("defined"), + /* Standard */ _T("errorlevel"), _T("exist"), -#define IF_MAX_UNARY IF_EXIST + + /* Extended */ + _T("cmdextversion"), + _T("defined"), +#define IF_MAX_UNARY IF_DEFINED + + /* Standard */ _T("=="), + + /* Extended */ _T("equ"), - _T("gtr"), - _T("geq"), + _T("neq"), _T("lss"), _T("leq"), - _T("neq"), -#define IF_MAX_COMPARISON IF_NEQ + _T("gtr"), + _T("geq"), +#define IF_MAX_COMPARISON IF_GEQ }; static BOOL IsSeparator(TCHAR Char) @@ -389,7 +396,7 @@ static PARSED_COMMAND *ParseIf(void) memset(Cmd, 0, sizeof(PARSED_COMMAND)); Cmd->Type = C_IF; - if (_tcsicmp(CurrentToken, _T("/I")) == 0) + if (bEnableExtensions && (_tcsicmp(CurrentToken, _T("/I")) == 0)) { Cmd->If.Flags |= IFFLAG_IGNORECASE; ParseToken(0, STANDARD_SEPS); @@ -406,6 +413,10 @@ static PARSED_COMMAND *ParseIf(void) /* Check for unary operators */ for (; Cmd->If.Operator <= IF_MAX_UNARY; Cmd->If.Operator++) { + /* Skip the extended operators if the extensions are disabled */ + if (!bEnableExtensions && (Cmd->If.Operator >= IF_CMDEXTVERSION)) + continue; + if (_tcsicmp(CurrentToken, IfOperatorString[Cmd->If.Operator]) == 0) { if (ParseToken(0, STANDARD_SEPS) != TOK_NORMAL) @@ -427,8 +438,13 @@ static PARSED_COMMAND *ParseIf(void) goto condition_done; } + // Cmd->If.Operator == IF_MAX_UNARY + 1; for (; Cmd->If.Operator <= IF_MAX_COMPARISON; Cmd->If.Operator++) { + /* Skip the extended operators if the extensions are disabled */ + if (!bEnableExtensions && (Cmd->If.Operator >= IF_EQU)) // (Cmd->If.Operator > IF_STRINGEQ) + continue; + if (_tcsicmp(CurrentToken, IfOperatorString[Cmd->If.Operator]) == 0) { if (ParseToken(0, STANDARD_SEPS) != TOK_NORMAL)

1 0

[reactos] 41/48: [CMD] DATE: Simplify the input loop, based on the TIME command.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

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

1 0

[reactos] 40/48: [CMD] DATE: 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=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))

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