From 8d02010ff7208e24b1d7eaf71031e811ed5c9b6b Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Thu, 18 Mar 2004 04:01:32 +0000
Subject: [PATCH] Fixed handling of "echo."

---
 programs/wcmd/builtins.c | 10 ++++++----
 programs/wcmd/wcmdmain.c |  7 +------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c
index e1ca392cee4..760de85dfa3 100644
--- a/programs/wcmd/builtins.c
+++ b/programs/wcmd/builtins.c
@@ -212,16 +212,18 @@ void WCMD_echo (const char *command) {
 static const char *eon = "Echo is ON\n", *eoff = "Echo is OFF\n";
 int count;
 
+  if ((command[0] == '.') && (command[1] == 0)) {
+    WCMD_output (newline);
+    return;
+  }
+  if (command[0]==' ')
+    command++;
   count = strlen(command);
   if (count == 0) {
     if (echo_mode) WCMD_output (eon);
     else WCMD_output (eoff);
     return;
   }
-  if ((count == 1) && (command[0] == '.')) {
-    WCMD_output (newline);
-    return;
-  }
   if (lstrcmpi(command, "ON") == 0) {
     echo_mode = 1;
     return;
diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c
index 36ae25e5e65..2def204e480 100644
--- a/programs/wcmd/wcmdmain.c
+++ b/programs/wcmd/wcmdmain.c
@@ -384,12 +384,7 @@ void WCMD_process_command (char *command)
         WCMD_directory ();
         break;
       case WCMD_ECHO:
-        /* Use the unstripped version of the following data - step over the space */
-        /* but only if a parameter follows                                        */
-        if (strlen(&whichcmd[count]) > 0)
-          WCMD_echo(&whichcmd[count+1]);
-        else
-          WCMD_echo(&whichcmd[count]);
+        WCMD_echo(&whichcmd[count]);
         break;
       case WCMD_FOR:
         WCMD_for (p);