Synchronize with trunk.

[reactos.git] / base / shell / cmd / echo.c

diff --git a/base/shell/cmd/echo.c b/base/shell/cmd/echo.c
index 5cf90fd..e3678b6 100644 (file)
--- a/base/shell/cmd/echo.c
+++ b/base/shell/cmd/echo.c
@@ -22,8 +22,8 @@
  *    13-Jul-2000 (Eric Kohl)
  *        Implemented 'echo.' and 'echoerr.'.
  *
- *    28-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
- *        Remove all hardcode string to En.rc
+ *    28-Apr-2005 (Magnus Olsen <magnus@greatlord.com>)
+ *        Remove all hardcoded strings in En.rc
  */
 
 #include "precomp.h"
@@ -31,105 +31,105 @@
 BOOL
 OnOffCommand(LPTSTR param, LPBOOL flag, INT message)
 {
-       TCHAR *p2;
-       if (_tcsnicmp(param, D_OFF, sizeof(D_OFF)/sizeof(TCHAR) - 1) == 0)
-       {
-               p2 = param + sizeof(D_OFF)/sizeof(TCHAR) - 1;
-               while (_istspace(*p2))
-                       p2++;
-               if (*p2 == _T('\0'))
-               {
-                       *flag = FALSE;
-                       return TRUE;
-               }
-       }
-       else if (_tcsnicmp(param, D_ON, sizeof(D_ON)/sizeof(TCHAR) - 1) == 0)
-       {
-               p2 = param + sizeof(D_ON)/sizeof(TCHAR) - 1;
-               while (_istspace(*p2))
-                       p2++;
-               if (*p2 == _T('\0'))
-               {
-                       *flag = TRUE;
-                       return TRUE;
-               }
-       }
-       else if (*param == _T('\0'))
-       {
-               ConOutResPrintf(message, *flag ? D_ON : D_OFF);
-               return TRUE;
-       }
-       return FALSE;
+    TCHAR *p2;
+    if (_tcsnicmp(param, D_OFF, sizeof(D_OFF)/sizeof(TCHAR) - 1) == 0)
+    {
+        p2 = param + sizeof(D_OFF)/sizeof(TCHAR) - 1;
+        while (_istspace(*p2))
+            p2++;
+        if (*p2 == _T('\0'))
+        {
+            *flag = FALSE;
+            return TRUE;
+        }
+    }
+    else if (_tcsnicmp(param, D_ON, sizeof(D_ON)/sizeof(TCHAR) - 1) == 0)
+    {
+        p2 = param + sizeof(D_ON)/sizeof(TCHAR) - 1;
+        while (_istspace(*p2))
+            p2++;
+        if (*p2 == _T('\0'))
+        {
+            *flag = TRUE;
+            return TRUE;
+        }
+    }
+    else if (*param == _T('\0'))
+    {
+        ConOutResPrintf(message, *flag ? D_ON : D_OFF);
+        return TRUE;
+    }
+    return FALSE;
 }
 
 INT CommandEcho (LPTSTR param)
 {
-       LPTSTR p1;
-
-       TRACE ("CommandEcho: '%s'\n", debugstr_aw(param));
-
-                /* skip all spaces for the check of '/?', 'ON' and 'OFF' */
-                p1 = param;
-                while(_istspace(*p1))
-                        p1++;
-
-               if (!_tcsncmp (p1, _T("/?"), 2))
-               {
-                       ConOutResPaging(TRUE,STRING_ECHO_HELP4);
-                       return 0;
-               }
-
-       if (!OnOffCommand(p1, &bEcho, STRING_ECHO_HELP5))
-       {
-               /* skip the first character */
-               ConOutPuts(param + 1);
-               ConOutPuts(_T("\r\n"));
-       }
-       return 0;
+    LPTSTR p1;
+
+    TRACE ("CommandEcho: '%s'\n", debugstr_aw(param));
+
+    /* skip all spaces for the check of '/?', 'ON' and 'OFF' */
+    p1 = param;
+    while(_istspace(*p1))
+            p1++;
+
+    if (!_tcsncmp (p1, _T("/?"), 2))
+    {
+        ConOutResPaging(TRUE,STRING_ECHO_HELP4);
+        return 0;
+    }
+
+    if (!OnOffCommand(p1, &bEcho, STRING_ECHO_HELP5))
+    {
+        /* skip the first character */
+        ConOutPuts(param + 1);
+        ConOutChar(_T('\n'));
+    }
+    return 0;
 }
 
 INT CommandEchos (LPTSTR param)
 {
-       TRACE ("CommandEchos: '%s'\n", debugstr_aw(param));
+    TRACE ("CommandEchos: '%s'\n", debugstr_aw(param));
 
-       if (!_tcsncmp (param, _T("/?"), 2))
-       {
-               ConOutResPuts(STRING_ECHO_HELP1);
-               return 0;
-       }
+    if (!_tcsncmp (param, _T("/?"), 2))
+    {
+        ConOutResPuts(STRING_ECHO_HELP1);
+        return 0;
+    }
 
-       ConOutPrintf (_T("%s"), param);
-       return 0;
+    ConOutPrintf (_T("%s"), param);
+    return 0;
 }
 
 
 INT CommandEchoerr (LPTSTR param)
 {
-       TRACE ("CommandEchoerr: '%s'\n", debugstr_aw(param));
+    TRACE ("CommandEchoerr: '%s'\n", debugstr_aw(param));
 
-       if (!_tcsncmp (param, _T("/?"), 2))
-       {
-               ConOutResPuts(STRING_ECHO_HELP2);
-               return 0;
-       }
+    if (!_tcsncmp (param, _T("/?"), 2))
+    {
+        ConOutResPuts(STRING_ECHO_HELP2);
+        return 0;
+    }
 
-       ConErrPuts (param);
-       return 0;
+    ConErrPuts (param);
+    return 0;
 }
 
 
 INT CommandEchoserr (LPTSTR param)
 {
-       TRACE ("CommandEchoserr: '%s'\n", debugstr_aw(param));
+    TRACE ("CommandEchoserr: '%s'\n", debugstr_aw(param));
 
-       if (!_tcsncmp (param, _T("/?"), 2))
-       {
-               ConOutResPuts(STRING_ECHO_HELP3);
-               return 0;
-       }
+    if (!_tcsncmp (param, _T("/?"), 2))
+    {
+        ConOutResPuts(STRING_ECHO_HELP3);
+        return 0;
+    }
 
-       ConErrPrintf (_T("%s"), param);
-       return 0;
+    ConErrPrintf (_T("%s"), param);
+    return 0;
 }
 
 /* EOF */