[ros-diffs] [cwittich] 32078: fix a problem with length calculation handle vars with exclamation marks instead of % like !errorlevel!

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Feb  2 00:25:21 2008
New Revision: 32078

URL: http://svn.reactos.org/svn/reactos?rev=32078&view=rev
Log:
fix a problem with length calculation
handle vars with exclamation marks instead of %
like !errorlevel!

Modified:
    trunk/reactos/base/shell/cmd/cmd.c

Modified: trunk/reactos/base/shell/cmd/cmd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=32078&r1=32077&r2=32078&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c (original)
+++ trunk/reactos/base/shell/cmd/cmd.c Sat Feb  2 00:25:21 2008
@@ -1186,7 +1186,7 @@
 				if (i > 0)
 				{
 					if (StringPart[1] < 0)
-						StringPart[1] = _tcslen(ret + StringPart[0]) + StringPart[1];
+						StringPart[1] = _tcslen(ret + StringPart[0]) - 1 + StringPart[1];
 					_tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]);
 					_tcscpy(ret, ReturnValue);
 				}
@@ -1285,12 +1285,19 @@
 	static UINT retlen = 0;
 	LPTSTR p, tmp;
 	UINT size;
+	TCHAR c;
 
 	if ( varNameLen )
 		*varNameLen = 0;
 	SetLastError(0);
-	if ( *varName++ != '%' )
+	c = *varName;
+
+	if ( (*varName != '!') && (*varName++ != '%') )
 		return NULL;
+
+	if (c == _T('!'))
+		varName++;
+
 	switch ( *varName )
 	{
 	case _T('~'):
@@ -1388,7 +1395,7 @@
 			*varNameLen = 1;
 		return ret;
 	}
-	p = _tcschr ( varName, _T('%') );
+	p = _tcschr ( varName, c );
 	if ( !p )
 	{
 		SetLastError ( ERROR_INVALID_PARAMETER );
@@ -1448,7 +1455,7 @@
 		bModeSetA = FALSE;
 		while (*ip)
 		{
-			if ( *ip == _T('%') )
+			if ( (*ip == _T('%')) || (*ip == _T('!')) )
 			{
 				UINT envNameLen;
 				LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA );