ash: remove carriage returns from strings to be evaluated

The shell could fail to evaluate strings containing carriage
returns.  For example:

   awk 'BEGIN {
      "set -ex\r\npwd\r\n" | getline
   }' </dev/null

The string is passed as an argument to "sh -c".  The "set" built-in
fails because it attempts to treat the carriage return as an option.

Although this is correct behaviour on Unix it may be unhelpful on
Microsoft Windows.

See GitHub issue #138.

1 files changed, 12 insertions, 0 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 50d5ce9d4..6283d3c28 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13614,6 +13614,18 @@ evalstring(char *s, int flags)
         int status;
 
         s = sstrdup(s);
+#if ENABLE_PLATFORM_MINGW32
+        {
+                char *t, *u;
+
+                for (t=u=s; *t; ++t) {
+                        if (*t != '\r') {
+                                *u++ = *t;
+                        }
+                }
+                *u = '\0';
+        }
+#endif
         setinputstring(s);
         setstackmark(&smark);