Merge busybox into merge

Fix conflicts in reset and ash.

Redefine the new safe_read_key() as a reference to read_key().

Disable SHA256_HWACCEL.

1 files changed, 1 insertions, 0 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index fff356c04..399d5e684 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -218,6 +218,7 @@ shell_builtin_read(struct builtin_read_params *params)
                  */
                 errno = 0;
                 pfd[0].events = POLLIN;
+//TODO race with a signal arriving just before the poll!
                 if (poll(pfd, 1, timeout) <= 0) {
                         /* timed out, or EINTR */
                         err = errno;