Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

implemented "" remove for the start command. This makes 'start dir1\"dir2a dir2b"\dir3\foo.exe param' work change by Martin Rottensteiner 2005only@pianonote.at irc nick ravelo

Browse source 
svn path=/trunk/; revision=17521
This commit is contained in:
Magnus Olsen 2005-08-24 21:40:01 +00:00
parent 98d9c65720
commit d9f9178f3e
1 changed files with 62 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
reactos/subsys/system/cmd/start.c
View file

@ -17,13 +17,16 @@
#ifdef INCLUDE_CMD_START #ifdef INCLUDE_CMD_START
INT cmd_start (LPTSTR first, LPTSTR rest) INT cmd_start (LPTSTR First, LPTSTR Rest)
{ {
TCHAR szFullName[MAX_PATH]; TCHAR szFullName[MAX_PATH];
TCHAR first[CMDLINE_LENGTH];
TCHAR rest[CMDLINE_LENGTH];
TCHAR param[CMDLINE_LENGTH];
BOOL bWait = FALSE; BOOL bWait = FALSE;
TCHAR *param; param[0] = _T('\0');
if (_tcsncmp (rest, _T("/?"), 2) == 0) if (_tcsncmp (Rest, _T("/?"), 2) == 0)
{ {
ConOutResPaging(TRUE,STRING_START_HELP1); ConOutResPaging(TRUE,STRING_START_HELP1);
return 0; return 0;
@ -31,6 +34,60 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
nErrorLevel = 0; nErrorLevel = 0;
if( !*Rest )
{
// FIXME: use comspec instead
Rest = _T("cmd");
}
_tcscpy(rest,Rest);
/* Parsing the command that gets called by start, and it's parameters */
if(!_tcschr(rest,_T('\"')))
{
INT i = 0;
INT count = _tcslen(rest);
/* find the end of the command and start of the args */
for(i = 0; i < count; i++)
{
if(rest[i] == _T(' '))
{
_tcscpy(param,&rest[i]);
rest[i] = _T('\0');
break;
}
}
}
else
{
INT i = 0;
INT count = _tcslen(rest);
BOOL bInside = FALSE;
/* find the end of the command and put the arguments in param */
for(i = 0; i < count; i++)
{
if(rest[i] == _T('\"'))
bInside = !bInside;
if((rest[i] == _T(' ')) && !bInside)
{
_tcscpy(param,&rest[i]);
rest[i] = _T('\0');
break;
}
}
i = 0;
/* remove any slashes */
while(i < count)
{
if(rest[i] == _T('\"'))
memmove(&rest[i],&rest[i + 1], _tcslen(&rest[i]) * sizeof(TCHAR));
else
i++;
}
}
/* check for a drive change */ /* check for a drive change */
if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first)) if (!_tcscmp (first + 1, _T(":")) && _istalpha (*first))
{ {
@ -46,21 +103,8 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
return 0; return 0;
} }
if( !*rest )
{
// FIXME: use comspec instead
rest = _T("cmd");
}
/* get the PATH environment variable and parse it */ /* get the PATH environment variable and parse it */
/* search the PATH environment variable for the binary */ /* search the PATH environment variable for the binary */
param = _tcschr( rest, _T(' ') ); // skip program name to reach parameters
if( param )
{
*param = 0;
param++;
}
if (!SearchForExecutable (rest, szFullName)) if (!SearchForExecutable (rest, szFullName))
{ {
error_bad_command (); error_bad_command ();