ash: prevent issue with ctrl-c and echo in loop

Interrupting a loop like this:

   while true; do echo hello; done

with ctrl-c caused the shell to exit.  Turning off interrupts around
the calls to echo_main() and printf_main() improves matters, though
isn't a complete cure.

1 files changed, 23 insertions, 0 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 14712ef54..bab6138da 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10815,12 +10815,35 @@ static int ulimitcmd(int, char **) FAST_FUNC;
 #define BUILTIN_SPEC_REG_ASSG   "7"
 
 /* Stubs for calling non-FAST_FUNC's */
+#if !ENABLE_PLATFORM_MINGW32
 #if ENABLE_ASH_ECHO
 static int FAST_FUNC echocmd(int argc, char **argv)   { return echo_main(argc, argv); }
 #endif
 #if ENABLE_ASH_PRINTF
 static int FAST_FUNC printfcmd(int argc, char **argv) { return printf_main(argc, argv); }
 #endif
+#else
+#if ENABLE_ASH_ECHO
+static int FAST_FUNC echocmd(int argc, char **argv)
+{
+        int ret;
+        INT_OFF;
+        ret = echo_main(argc, argv);
+        INT_ON;
+        return ret;
+}
+#endif
+#if ENABLE_ASH_PRINTF
+static int FAST_FUNC printfcmd(int argc, char **argv)
+{
+        int ret;
+        INT_OFF;
+        ret = printf_main(argc, argv);
+        INT_ON;
+        return ret;
+}
+#endif
+#endif
 #if ENABLE_ASH_TEST || BASH_TEST2
 static int FAST_FUNC testcmd(int argc, char **argv)   { return test_main(argc, argv); }
 #endif