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.

svn path=/trunk/; revision=33546
This commit is contained in:
Colin Finck 2008-05-17 09:23:21 +00:00
parent 3b1370bd40
commit 0b51d20053

View file

@ -626,18 +626,18 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
/* check for options anywhere in command line */ /* check for options anywhere in command line */
for (i = 0; i < args; i++) 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*/ /*found a command, but check to make sure it has something after it*/
if (_tcslen (arg[i]) == 2) if (_tcslen (arg[i]) == 2)
{ {
ch = _totupper (arg[i][1]); ch = _totupper (arg[i][1]);
if (ch == 'S') if (ch == _T('S'))
{ {
RD_SUB = TRUE; RD_SUB = TRUE;
} }
else if (ch == 'Q') else if (ch == _T('Q'))
{ {
RD_QUIET = TRUE; RD_QUIET = TRUE;
} }
@ -650,7 +650,7 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
} }
} }
if (dir[0] == '\0') if (dir[0] == _T('\0'))
{ {
/* No folder to remove */ /* No folder to remove */
ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
@ -661,8 +661,8 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
GetFullPathName(dir,MAX_PATH,szFullPath,NULL); GetFullPathName(dir,MAX_PATH,szFullPath,NULL);
/* remove trailing \ if any, but ONLY if dir is not the root dir */ /* remove trailing \ if any, but ONLY if dir is not the root dir */
if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == '\\') if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\'))
szFullPath[_tcslen(szFullPath) - 1] = '\0'; szFullPath[_tcslen(szFullPath) - 1] = _T('\0');
if(RD_SUB) if(RD_SUB)
{ {
@ -702,7 +702,7 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
FindClose (hFile); FindClose (hFile);
} }
/* reovme the \\* */ /* reovme the \\* */
szFullPath[_tcslen(szFullPath) - 2] = '\0'; szFullPath[_tcslen(szFullPath) - 2] = _T('\0');
} }
if (!DeleteFolder(szFullPath)) if (!DeleteFolder(szFullPath))