PVOID, ULONG, PULONG);
typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PULONG);
-BOOL bExit = FALSE; /* indicates EXIT was typed */
-BOOL bCanExit = TRUE; /* indicates if this shell is exitable */
+BOOL bExit = FALSE; /* Indicates EXIT was typed */
+BOOL bCanExit = TRUE; /* Indicates if this shell is exitable */
BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */
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 */
+static BOOL fSingleCommand = 0; /* When we are executing something passed on the command line after /C or /K */
INT nErrorLevel = 0; /* Errorlevel of last launched external program */
CRITICAL_SECTION ChildProcessRunningLock;
BOOL bDisableBatchEcho = FALSE;
BOOL bEnableExtensions = TRUE;
BOOL bDelayedExpansion = FALSE;
-BOOL bTitleSet = FALSE;
DWORD dwChildProcessId = 0;
LPTSTR lpOriginalEnvironment;
HANDLE CMD_ModuleHandle;
+BOOL bTitleSet = FALSE; /* Indicates whether the console title has been changed and needs to be restored later */
+TCHAR szCurTitle[MAX_PATH];
+
static NtQueryInformationProcessProc NtQueryInformationProcessPtr = NULL;
static NtReadVirtualMemoryProc NtReadVirtualMemoryPtr = NULL;
}
+static VOID
+SetConTitle(LPCTSTR pszTitle)
+{
+ TCHAR szNewTitle[MAX_PATH];
+
+ if (!pszTitle)
+ return;
+
+ /* Don't do anything if we run inside a batch file, or we are just running a single command */
+ if (bc || (fSingleCommand == 1))
+ return;
+
+ /* Save the original console title and build a new one */
+ GetConsoleTitle(szCurTitle, ARRAYSIZE(szCurTitle));
+ StringCchPrintf(szNewTitle, ARRAYSIZE(szNewTitle),
+ _T("%s - %s"), szCurTitle, pszTitle);
+ bTitleSet = TRUE;
+ ConSetTitle(szNewTitle);
+}
+
+static VOID
+ResetConTitle(VOID)
+{
+ /* Restore the original console title */
+ if (!bc && bTitleSet)
+ {
+ ConSetTitle(szCurTitle);
+ bTitleSet = FALSE;
+ }
+}
/*
- * This command (in first) was not found in the command table
+ * This command (in First) was not found in the command table
*
- * Full - buffer to hold whole command line
+ * Full - output buffer to hold whole command line
* First - first word on command line
* Rest - rest of command line
*/
static INT
Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
{
- TCHAR szFullName[MAX_PATH];
TCHAR *first, *rest, *dot;
- TCHAR szWindowTitle[MAX_PATH];
- TCHAR szNewTitle[MAX_PATH*2];
DWORD dwExitCode = 0;
TCHAR *FirstEnd;
+ TCHAR szFullName[MAX_PATH];
TCHAR szFullCmdLine[CMDLINE_LENGTH];
TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest));
}
/* Copy the new first/rest into the buffer */
- first = Full;
rest = &Full[FirstEnd - First + 1];
_tcscpy(rest, FirstEnd);
_tcscat(rest, Rest);
+ first = Full;
*FirstEnd = _T('\0');
_tcscpy(first, First);
{
BOOL working = TRUE;
if (!SetCurrentDirectory(first))
- /* Guess they changed disc or something, handle that gracefully and get to root */
{
+ /* Guess they changed disc or something, handle that gracefully and get to root */
TCHAR str[4];
str[0]=first[0];
str[1]=_T(':');
return 1;
}
- /* Save the original console title and build a new one */
- GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle));
- bTitleSet = FALSE;
- _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest);
- ConSetTitle(szNewTitle);
+ /* Set the new console title */
+ FirstEnd = first + (FirstEnd - First); /* Point to the separating NULL in the full built string */
+ *FirstEnd = _T(' ');
+ SetConTitle(Full);
/* check if this is a .BAT or .CMD file */
dot = _tcsrchr (szFullName, _T('.'));
{
while (*rest == _T(' '))
rest++;
+
+ *FirstEnd = _T('\0');
TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest));
dwExitCode = Batch(szFullName, first, rest, Cmd);
}
STARTUPINFO stui;
/* build command line for CreateProcess(): FullName + " " + rest */
- BOOL quoted = !!_tcschr(First, ' ');
+ BOOL quoted = !!_tcschr(First, _T(' '));
_tcscpy(szFullCmdLine, quoted ? _T("\"") : _T(""));
_tcsncat(szFullCmdLine, First, CMDLINE_LENGTH - _tcslen(szFullCmdLine) - 1);
_tcsncat(szFullCmdLine, quoted ? _T("\"") : _T(""), CMDLINE_LENGTH - _tcslen(szFullCmdLine) - 1);
TRACE ("[EXEC: %s]\n", debugstr_aw(szFullCmdLine));
/* fill startup info */
- memset (&stui, 0, sizeof (STARTUPINFO));
- stui.cb = sizeof (STARTUPINFO);
+ memset(&stui, 0, sizeof(stui));
+ stui.cb = sizeof(stui);
+ stui.lpTitle = Full;
stui.dwFlags = STARTF_USESHOWWINDOW;
stui.wShowWindow = SW_SHOWDEFAULT;
NULL,
NULL,
TRUE,
- 0, /* CREATE_NEW_PROCESS_GROUP */
+ 0,
NULL,
NULL,
&stui,
SW_SHOWNORMAL);
}
+ *FirstEnd = _T('\0');
+
if (prci.hProcess != NULL)
{
- if (bc != NULL || bWaitForCommand || IsConsoleProcess(prci.hProcess))
+ if (bc != NULL || fSingleCommand != 0 || IsConsoleProcess(prci.hProcess))
{
/* when processing a batch file or starting console processes: execute synchronously */
EnterCriticalSection(&ChildProcessRunningLock);
}
/* Restore the original console title */
- if (!bTitleSet)
- ConSetTitle(szWindowTitle);
+ ResetConTitle();
return dwExitCode;
}
/* Skip over whitespace to rest of line, exclude 'echo' command */
if (_tcsicmp(cmdptr->name, _T("echo")) != 0)
+ {
while (_istspace(*param))
param++;
+ }
+
+ /* Set the new console title */
+ SetConTitle(com);
+
ret = cmdptr->func(param);
+
+ /* Restore the original console title */
+ ResetConTitle();
+
cmd_free(com);
return ret;
}
return FALSE;
}
- if (CheckCtrlBreak(BREAK_INPUT))
- {
+ if (readline[0] == _T('\0'))
ConOutChar(_T('\n'));
+
+ if (CheckCtrlBreak(BREAK_INPUT))
return FALSE;
- }
+
+ if (readline[0] == _T('\0'))
+ return FALSE;
+
ip = readline;
}
else
while (!bCanExit || !bExit)
{
+ /* Reset the Ctrl-Break / Ctrl-C state */
+ bCtrlBreak = FALSE;
+
Cmd = ParseCommand(NULL);
if (!Cmd)
continue;
{
DWORD dwWritten;
INPUT_RECORD rec;
- static BOOL SelfGenerated = FALSE;
if ((dwCtrlType != CTRL_C_EVENT) &&
(dwCtrlType != CTRL_BREAK_EVENT))
{
return FALSE;
}
- else
- {
- if (SelfGenerated)
- {
- SelfGenerated = FALSE;
- return TRUE;
- }
- }
if (!TryEnterCriticalSection(&ChildProcessRunningLock))
{
- SelfGenerated = TRUE;
- GenerateConsoleCtrlEvent (dwCtrlType, 0);
+ /* Child process is running and will have received the control event */
return TRUE;
}
else
LeaveCriticalSection(&ChildProcessRunningLock);
}
+ bCtrlBreak = TRUE;
+
rec.EventType = KEY_EVENT;
rec.Event.KeyEvent.bKeyDown = TRUE;
rec.Event.KeyEvent.wRepeatCount = 1;
1,
&dwWritten);
- bCtrlBreak = TRUE;
/* FIXME: Handle batch files */
- //ConOutPrintf(_T("^C"));
+ // ConOutPrintf(_T("^C"));
return TRUE;
}
HMODULE NtDllModule;
TCHAR commandline[CMDLINE_LENGTH];
TCHAR ModuleName[_MAX_PATH + 1];
- INT nExitCode;
+ // INT nExitCode;
HANDLE hIn, hOut;
else if (option == _T('C') || option == _T('K') || option == _T('R'))
{
/* Remainder of command line is a command to be run */
+ fSingleCommand = ((option == _T('K')) << 1) | 1;
break;
}
else if (option == _T('D'))
{
/* Do the /C or /K command */
GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip);
- bWaitForCommand = TRUE;
- nExitCode = ParseCommandLine(commandline);
- bWaitForCommand = FALSE;
- if (option != _T('K'))
+ /* nExitCode = */ ParseCommandLine(commandline);
+ if (fSingleCommand == 1)
{
- nErrorLevel = nExitCode;
+ // nErrorLevel = nExitCode;
bExit = TRUE;
}
+ fSingleCommand = 0;
}
}
projects / reactos.git / blobdiff