Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] Wait for commands to exit when run with /C or /K. CORE-12402 #resolve

Browse source 
svn path=/trunk/; revision=73321
This commit is contained in:
Mark Jansen 2016-11-18 19:53:40 +00:00
parent bc95e1f73c
commit cef870285c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/base/shell/cmd/cmd.c
View file

@ -157,6 +157,7 @@ BOOL bExit = FALSE; /* indicates EXIT was typed */
BOOL bCanExit = TRUE; /* indicates if this shell is exitable */ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */
BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */
BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */
static BOOL bWaitForCommand = FALSE; /* When we are executing something passed on the commandline after /c or /k */
INT nErrorLevel = 0; /* Errorlevel of last launched external program */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */
CRITICAL_SECTION ChildProcessRunningLock; CRITICAL_SECTION ChildProcessRunningLock;
BOOL bUnicodeOutput = FALSE; BOOL bUnicodeOutput = FALSE;
@ -442,7 +443,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
if (prci.hProcess != NULL) if (prci.hProcess != NULL)
{ {
if (bc != NULL || IsConsoleProcess(prci.hProcess)) if (bc != NULL || bWaitForCommand || IsConsoleProcess(prci.hProcess))
{ {
/* when processing a batch file or starting console processes: execute synchronously */ /* when processing a batch file or starting console processes: execute synchronously */
EnterCriticalSection(&ChildProcessRunningLock); EnterCriticalSection(&ChildProcessRunningLock);
@ -1761,7 +1762,9 @@ Initialize()
{ {
/* Do the /C or /K command */ /* Do the /C or /K command */
GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip);
bWaitForCommand = TRUE;
nExitCode = ParseCommandLine(commandline); nExitCode = ParseCommandLine(commandline);
bWaitForCommand = FALSE;
if (option != _T('K')) if (option != _T('K'))
{ {
nErrorLevel = nExitCode; nErrorLevel = nExitCode;