Implement escape char in console. "^"

[reactos.git] / reactos / subsys / system / cmd / echo.c

diff --git a/reactos/subsys/system/cmd/echo.c b/reactos/subsys/system/cmd/echo.c
index d03558c..c4081f2 100644 (file)
--- a/reactos/subsys/system/cmd/echo.c
+++ b/reactos/subsys/system/cmd/echo.c
@@ -26,13 +26,14 @@
  *        Remove all hardcode string to En.rc
  */
 
-#include "precomp.h"
+#include <precomp.h>
 #include "resource.h"
 
 
 INT CommandEcho (LPTSTR cmd, LPTSTR param)
 {
        TCHAR szMsg[RC_STRING_MAX_SIZE];
+       INT i = 0;
 
 #ifdef _DEBUG
        DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param);
@@ -40,7 +41,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
 
        if (!_tcsncmp (param, _T("/?"), 2))
        {
-               ConOutResPuts(STRING_ECHO_HELP4);
+               ConOutResPaging(TRUE,STRING_ECHO_HELP4);
                return 0;
        }
 
@@ -58,7 +59,20 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
                else if (_tcsicmp (param, D_ON) == 0)
                        bEcho = TRUE;
                else if (*param)
+               {
+                       while(i < _tcslen(param))
+                       {
+                               if(param[i] == _T('^'))
+                               {
+                                       memmove(&param[i],&param[i + 1], _tcslen(&param[i]) * sizeof(TCHAR));
+                                       //skip past the char being escaped
+                                       i++;
+                               }
+                               else
+                                       i++;
+                       }
                        ConOutPuts (param);
+               }
                else
                {
                        LoadString(CMD_ModuleHandle, STRING_ECHO_HELP5, szMsg, RC_STRING_MAX_SIZE);