Revert the _T('x') to 'x' changes from my previous commit.
authorColin Finck <colin@reactos.org>
Sat, 17 May 2008 09:23:21 +0000 (09:23 +0000)
committerColin Finck <colin@reactos.org>
Sat, 17 May 2008 09:23:21 +0000 (09:23 +0000)
Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd.

svn path=/trunk/; revision=33546

reactos/base/shell/cmd/internal.c

index b36ba2e..8771b3e 100644 (file)
@@ -626,18 +626,18 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
        /* 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 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
                }
        }
 
-       if (dir[0] == '\0')
+       if (dir[0] == _T('\0'))
        {
                /* No folder to remove */
                ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING);
@@ -661,8 +661,8 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
        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 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
                        FindClose (hFile);
                }
                /* reovme the \\* */
-               szFullPath[_tcslen(szFullPath) - 2] = '\0';
+               szFullPath[_tcslen(szFullPath) - 2] = _T('\0');
        }
 
        if (!DeleteFolder(szFullPath))