Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

SET /A improvements:

Browse source 
- Strip quotes from expression
- Use _tcstol instead of _ttoi to parse numbers, allowing hex/octal numbers to be used
- Skip space after an identifier
- Don't echo result when in a batch file

svn path=/trunk/; revision=39618
This commit is contained in:
Jeffrey Morlan 2009-02-16 03:00:27 +00:00
parent 28a87330c4
commit f56130f164
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
reactos/base/shell/cmd/set.c
View file

@ -106,7 +106,9 @@ INT cmd_set (LPTSTR param)
/* the /A does *NOT* have to be followed by a whitespace */
if ( !_tcsnicmp (param, _T("/A"), 2) )
{
BOOL Success = seta_eval ( skip_ws(param+2) );
BOOL Success;
StripQuotes(param);
Success = seta_eval ( skip_ws(param+2) );
if(!Success)
{
/*might seem random but this is what windows xp does */
@ -230,7 +232,7 @@ seta_identval ( LPCTSTR ident, INT* result )
*result = 0;
return FALSE;
}
*result = _ttoi ( identVal );
*result = _tcstol ( identVal, NULL, 0 );
return TRUE;
}
@ -283,18 +285,16 @@ seta_unaryTerm ( LPCTSTR* p_, INT* result )
p = skip_ws ( p + 1 );
if ( !seta_stmt ( &p, &rval ) )
return FALSE;
if ( *p != _T(')') )
if ( *p++ != _T(')') )
{
ConErrResPuts ( STRING_EXPECTED_CLOSE_PAREN );
return FALSE;
}
*result = rval;
p = skip_ws ( p + 1 );
}
else if ( isdigit(*p) )
{
*result = _ttoi ( p );
p = skip_ws ( p + _tcsspn ( p, _T("1234567890") ) );
*result = _tcstol ( p, (LPTSTR *)&p, 0 );
}
else if ( __iscsymf(*p) )
{
@ -309,7 +309,7 @@ seta_unaryTerm ( LPCTSTR* p_, INT* result )
ConErrResPuts ( STRING_EXPECTED_NUMBER_OR_VARIABLE );
return FALSE;
}
*p_ = p;
*p_ = skip_ws ( p );
return TRUE;
}
@ -447,6 +447,7 @@ seta_assignment ( LPCTSTR* p_, INT* result )
PARSE_IDENT(ident,identlen,p);
if ( identlen )
{
p = skip_ws(p);
if ( *p == _T('=') )
op = *p, p = skip_ws(p+1);
else if ( _tcschr ( _T("*/%+-&^|"), *p ) && p[1] == _T('=') )
@ -531,7 +532,8 @@ seta_eval ( LPCTSTR p )
}
if ( !seta_stmt ( &p, &rval ) )
return FALSE;
ConOutPrintf ( _T("%i"), rval );
if ( !bc )
ConOutPrintf ( _T("%i"), rval );
return TRUE;
}