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

(hopefully) last bugfix to set /a - assignment works again

Browse source 
svn path=/trunk/; revision=17916
This commit is contained in:
Royce Mitchell III 2005-09-18 17:52:28 +00:00
parent f28d0d895f
commit 9cd240b08f
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reactos/subsys/system/cmd/set.c
View file

@ -408,36 +408,22 @@ seta_assignment ( LPCTSTR* p_, INT* result )
if ( identlen )
{
if ( *p == _T('=') )
op = *p, p++;
op = *p, p = skip_ws(p+1);
else if ( _tcschr ( _T("*/%+-&^|"), *p ) && p[1] == _T('=') )
op = *p, p += 2;
op = *p, p = skip_ws(p+2);
else if ( _tcschr ( _T("<>"), *p ) && *p == p[1] && p[2] == _T('=') )
op = *p, p += 3;
else
{
_tprintf ( _T("Missing operand.\n") );
return FALSE;
}
p = skip_ws ( p );
op = *p, p = skip_ws(p+3);
}
/* allow to chain multiple assignments, such as: a=b=1 */
if ( ident && op )
{
if ( !seta_assignment ( &p, &exprval ) )
return FALSE;
}
else
{
if ( !seta_expr ( &p, &exprval ) )
return FALSE;
}
if ( identlen )
{
INT identval;
LPTSTR buf;
if ( !seta_assignment ( &p, &exprval ) )
return FALSE;
if ( !seta_identval ( ident, &identval ) )
identval = 0;
switch ( op )
@ -460,6 +446,13 @@ seta_assignment ( LPCTSTR* p_, INT* result )
SetEnvironmentVariable ( ident, buf ); // TODO FIXME - check return value
exprval = identval;
}
else
{
/* restore p in case we found an ident but not an op */
p = *p_;
if ( !seta_expr ( &p, &exprval ) )
return FALSE;
}
*result = exprval;
*p_ = p;