[ros-diffs] [cfinck] 33546: Revert the _T('x') to 'x' changes from my previous commit. Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd.

cfinck at svn.reactos.org cfinck at svn.reactos.org
Sat May 17 11:23:21 CEST 2008


Author: cfinck
Date: Sat May 17 04:23:21 2008
New Revision: 33546

URL: http://svn.reactos.org/svn/reactos?rev=33546&view=rev
Log:
Revert the _T('x') to 'x' changes from my previous commit.
Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd.

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

Modified: trunk/reactos/base/shell/cmd/internal.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?rev=33546&r1=33545&r2=33546&view=diff
==============================================================================
--- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat May 17 04:23:21 2008
@@ -626,18 +626,18 @@
 	/* check for options anywhere in command line */
 	for (i = 0; i < args; i++)
 	{
-		if (*arg[i] == '/')
+		if (*arg[i] == _T('/'))
 		{
 			/*found a command, but check to make sure it has something after it*/
 			if (_tcslen (arg[i]) == 2)
 			{
 				ch = _totupper (arg[i][1]);
 
-				if (ch == 'S')
+				if (ch == _T('S'))
 				{
 					RD_SUB = TRUE;
 				}
-				else if (ch == 'Q')
+				else if (ch == _T('Q'))
 				{
 					RD_QUIET = TRUE;
 				}
@@ -650,7 +650,7 @@
 		}
 	}
 
-	if (dir[0] == '\0')
+	if (dir[0] == _T('\0'))
 	{
 		/* No folder to remove */
 		ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
@@ -661,8 +661,8 @@
 	GetFullPathName(dir,MAX_PATH,szFullPath,NULL);
 
 	/* remove trailing \ if any, but ONLY if dir is not the root dir */
-	if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == '\\')
-		szFullPath[_tcslen(szFullPath) - 1] = '\0';
+	if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\'))
+		szFullPath[_tcslen(szFullPath) - 1] = _T('\0');
 
 	if(RD_SUB)
 	{
@@ -702,7 +702,7 @@
 			FindClose (hFile);
 		}
 		/* reovme the \\* */
-		szFullPath[_tcslen(szFullPath) - 2] = '\0';
+		szFullPath[_tcslen(szFullPath) - 2] = _T('\0');
 	}
 
 	if (!DeleteFolder(szFullPath))



More information about the Ros-diffs mailing list