mirror of
https://github.com/reactos/reactos.git
synced 2024-12-30 19:14:31 +00:00
Implement start execute support for bat/cmd file. woking in windows
svn path=/trunk/; revision=17526
This commit is contained in:
parent
8f881e2d04
commit
519f1108ad
1 changed files with 43 additions and 15 deletions
|
@ -24,6 +24,12 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
|
||||||
TCHAR rest[CMDLINE_LENGTH];
|
TCHAR rest[CMDLINE_LENGTH];
|
||||||
TCHAR param[CMDLINE_LENGTH];
|
TCHAR param[CMDLINE_LENGTH];
|
||||||
BOOL bWait = FALSE;
|
BOOL bWait = FALSE;
|
||||||
|
BOOL bBat = FALSE;
|
||||||
|
BOOL bCreate = FALSE;
|
||||||
|
TCHAR szFullCmdLine [CMDLINE_LENGTH];
|
||||||
|
PROCESS_INFORMATION prci;
|
||||||
|
STARTUPINFO stui;
|
||||||
|
|
||||||
param[0] = _T('\0');
|
param[0] = _T('\0');
|
||||||
|
|
||||||
if (_tcsncmp (Rest, _T("/?"), 2) == 0)
|
if (_tcsncmp (Rest, _T("/?"), 2) == 0)
|
||||||
|
@ -115,29 +121,40 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
|
||||||
if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) ||
|
if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) ||
|
||||||
!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd")))
|
!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd")))
|
||||||
{
|
{
|
||||||
|
bBat = TRUE;
|
||||||
|
memset(szFullCmdLine,0,CMDLINE_LENGTH * sizeof(TCHAR));
|
||||||
|
|
||||||
|
/* FIXME : use comspec instead */
|
||||||
|
if (!SearchForExecutable (_T("CMD"), szFullCmdLine))
|
||||||
|
{
|
||||||
|
error_bad_command ();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)],_T("\" /K "), 5 * sizeof(TCHAR));
|
||||||
|
memcpy(&szFullCmdLine[_tcslen(szFullCmdLine)], szFullName, _tcslen(szFullName) * sizeof(TCHAR));
|
||||||
|
memcpy(&szFullCmdLine[1], &szFullCmdLine[2], _tcslen(szFullCmdLine) * sizeof(TCHAR));
|
||||||
|
szFullCmdLine[0] = _T('\"');
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest);
|
DebugPrintf (_T("[BATCH: %s %s]\n"), szFullName, rest);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ConErrResPuts(STRING_START_ERROR1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* exec the program */
|
|
||||||
TCHAR szFullCmdLine [CMDLINE_LENGTH];
|
|
||||||
PROCESS_INFORMATION prci;
|
|
||||||
STARTUPINFO stui;
|
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
DebugPrintf (_T("[EXEC: %s %s]\n"), szFullName, rest);
|
DebugPrintf (_T("[EXEC: %s %s]\n"), szFullName, rest);
|
||||||
#endif
|
#endif
|
||||||
/* build command line for CreateProcess() */
|
/* build command line for CreateProcess() */
|
||||||
|
if (bBat == FALSE)
|
||||||
|
{
|
||||||
_tcscpy (szFullCmdLine, first);
|
_tcscpy (szFullCmdLine, first);
|
||||||
if( param )
|
if( param )
|
||||||
{
|
{
|
||||||
_tcscat(szFullCmdLine, _T(" ") );
|
_tcscat(szFullCmdLine, _T(" ") );
|
||||||
_tcscat (szFullCmdLine, param);
|
_tcscat (szFullCmdLine, param);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* fill startup info */
|
/* fill startup info */
|
||||||
memset (&stui, 0, sizeof (STARTUPINFO));
|
memset (&stui, 0, sizeof (STARTUPINFO));
|
||||||
|
@ -145,8 +162,19 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
|
||||||
stui.dwFlags = STARTF_USESHOWWINDOW;
|
stui.dwFlags = STARTF_USESHOWWINDOW;
|
||||||
stui.wShowWindow = SW_SHOWDEFAULT;
|
stui.wShowWindow = SW_SHOWDEFAULT;
|
||||||
|
|
||||||
if (CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE,
|
if (bBat == TRUE)
|
||||||
CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci))
|
{
|
||||||
|
bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE,
|
||||||
|
CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE,
|
||||||
|
DETACHED_PROCESS, NULL, NULL, &stui, &prci);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bCreate)
|
||||||
{
|
{
|
||||||
if (bWait)
|
if (bWait)
|
||||||
{
|
{
|
||||||
|
@ -166,7 +194,7 @@ INT cmd_start (LPTSTR First, LPTSTR Rest)
|
||||||
ErrorMessage(GetLastError (),
|
ErrorMessage(GetLastError (),
|
||||||
_T("Error executing CreateProcess()!!\n"));
|
_T("Error executing CreateProcess()!!\n"));
|
||||||
}
|
}
|
||||||
}
|
// }
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue