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

- Implement SHIFT /n.

Browse source 
- Make prompt code $T and %TIME% have the hours space-padded, not zero-padded.
- Allow delayed expansion in the parameter of IF ERRORLEVEL.

svn path=/trunk/; revision=40084
This commit is contained in:
Jeffrey Morlan 2009-03-18 03:52:58 +00:00
parent 466a9064a2
commit 3a52766a90
5 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/shell/cmd/batch.c
View file

@ -91,7 +91,7 @@ LPTSTR FindArg(TCHAR Char, BOOL *IsParam0)
if (n < 0 || n > 9) if (n < 0 || n > 9)
return NULL; return NULL;
n += bc->shiftlevel; n = bc->shiftlevel[n];
*IsParam0 = (n == 0); *IsParam0 = (n == 0);
pp = bc->params; pp = bc->params;
@ -207,6 +207,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd
{ {
BATCH_CONTEXT new; BATCH_CONTEXT new;
LPFOR_CONTEXT saved_fc; LPFOR_CONTEXT saved_fc;
INT i;
HANDLE hFile; HANDLE hFile;
SetLastError(0); SetLastError(0);
@ -260,7 +261,8 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd
bc->hBatchFile = hFile; bc->hBatchFile = hFile;
SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN);
bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->bEcho = bEcho; /* Preserve echo across batch calls */
bc->shiftlevel = 0; for (i = 0; i < 10; i++)
bc->shiftlevel[i] = i;
bc->params = BatchParams (firstword, param); bc->params = BatchParams (firstword, param);
// //

2
reactos/base/shell/cmd/batch.h
View file

@ -14,7 +14,7 @@ typedef struct tagBATCHCONTEXT
TCHAR BatchFilePath[MAX_PATH]; TCHAR BatchFilePath[MAX_PATH];
LPTSTR params; LPTSTR params;
LPTSTR raw_params; /* Holds the raw params given by the input */ LPTSTR raw_params; /* Holds the raw params given by the input */
INT shiftlevel; INT shiftlevel[10];
BOOL bEcho; /* Preserve echo flag across batch calls */ BOOL bEcho; /* Preserve echo flag across batch calls */
REDIRECTION *RedirList; REDIRECTION *RedirList;
PARSED_COMMAND *current; PARSED_COMMAND *current;

2
reactos/base/shell/cmd/if.c
View file

@ -103,7 +103,7 @@ BOOL ExecuteIf(PARSED_COMMAND *Cmd)
else if (Cmd->If.Operator == IF_ERRORLEVEL) else if (Cmd->If.Operator == IF_ERRORLEVEL)
{ {
/* IF ERRORLEVEL n: check if last exit code is greater or equal to n */ /* IF ERRORLEVEL n: check if last exit code is greater or equal to n */
INT n = _tcstol(Cmd->If.RightArg, &param, 10); INT n = _tcstol(Right, &param, 10);
if (*param != _T('\0')) if (*param != _T('\0'))
{ {
error_syntax(Right); error_syntax(Right);

2
reactos/base/shell/cmd/locale.c
View file

@ -76,7 +76,7 @@ GetTimeString(VOID)
static TCHAR szTime[12]; static TCHAR szTime[12];
SYSTEMTIME t; SYSTEMTIME t;
GetLocalTime(&t); GetLocalTime(&t);
_stprintf(szTime, _T("%02d%c%02d%c%02d%c%02d"), _stprintf(szTime, _T("%2d%c%02d%c%02d%c%02d"),
t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator, t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator,
t.wSecond, cDecimalSeparator, t.wMilliseconds / 10); t.wSecond, cDecimalSeparator, t.wMilliseconds / 10);
return szTime; return szTime;

23
reactos/base/shell/cmd/shift.c
View file

@ -38,7 +38,7 @@
INT cmd_shift (LPTSTR param) INT cmd_shift (LPTSTR param)
{ {
INT i = 0;
TRACE ("cmd_shift: (\'%s\')\n", debugstr_aw(param)); TRACE ("cmd_shift: (\'%s\')\n", debugstr_aw(param));
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
@ -58,11 +58,26 @@ INT cmd_shift (LPTSTR param)
if (!_tcsicmp (param, _T("down"))) if (!_tcsicmp (param, _T("down")))
{ {
if (bc->shiftlevel) if (bc->shiftlevel[0])
bc->shiftlevel--; for (; i <= 9; i++)
bc->shiftlevel[i]--;
} }
else /* shift up */ else /* shift up */
bc->shiftlevel++; {
if (*param == _T('/'))
{
if (param[1] < '0' || param[1] > '9')
{
error_invalid_switch(param[1]);
return 1;
}
i = param[1] - '0';
}
for (; i < 9; i++)
bc->shiftlevel[i] = bc->shiftlevel[i + 1];
bc->shiftlevel[i]++;
}
return 0; return 0;
} }