Merge branch 'busybox' into merge

Conflicts:
	Makefile.flags

3 files changed, 32 insertions, 7 deletions

diff --git a/shell/ash.c b/shell/ash.c
index a79099bc5..065678ea5 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7794,6 +7794,12 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
                  *
                  * That is, do not use $SHELL, user's shell, or /bin/sh;
                  * just call ourselves.
+                 *
+                 * Note that bash reads ~80 chars of the file, and if it sees
+                 * a zero byte before it sees newline, it doesn't try to
+                 * interpret it, but fails with "cannot execute binary file"
+                 * message and exit code 126. For one, this prevents attempts
+                 * to interpret foreign ELF binaries as shell scripts.
                  */
                 char **ap;
                 char **new;
@@ -7824,9 +7830,7 @@ shellexec(char **argv, const char *path, int idx)
         int e;
         char **envp;
         int exerrno;
-#if ENABLE_FEATURE_SH_STANDALONE
-        int applet_no = -1;
-#endif
+        int applet_no = -1; /* used only by FEATURE_SH_STANDALONE */
 
         clearredir(/*drop:*/ 1);
         envp = listvars(VEXPORT, VUNSET, /*end:*/ NULL);
@@ -7836,8 +7840,16 @@ shellexec(char **argv, const char *path, int idx)
 #endif
         ) {
                 tryexec(IF_FEATURE_SH_STANDALONE(applet_no,) argv[0], argv, envp);
+                if (applet_no >= 0) {
+                        /* We tried execing ourself, but it didn't work.
+                         * Maybe /proc/self/exe doesn't exist?
+                         * Try $PATH search.
+                         */
+                        goto try_PATH;
+                }
                 e = errno;
         } else {
+ try_PATH:
                 e = ENOENT;
                 while ((cmdname = path_advance(&path, argv[0])) != NULL) {
                         if (--idx < 0 && pathopt == NULL) {
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 6ff867413..f9b59c263 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -123,15 +123,22 @@ int cttyhack_main(int argc UNUSED_PARAM, char **argv)
                          * TIOCGSERIAL check, which assumes that all
                          * serial lines follow /dev/ttySn convention -
                          * which is not always the case.
-                         * Therefore, we use this methos first:
+                         * Therefore, we use this method first:
                          */
                         int s = open_read_close("/sys/class/tty/console/active",
                                 console + 5, sizeof(console) - 5);
                         if (s > 0) {
-                                /* found active console via sysfs (Linux 2.6.38+)
-                                 * sysfs string looks like "ttyS0\n" so zap the newline:
+                                char *last;
+                                /* Found active console via sysfs (Linux 2.6.38+).
+                                 * It looks like "[tty0 ]ttyS0\n" so zap the newline:
                                  */
                                 console[4 + s] = '\0';
+                                /* If there are multiple consoles,
+                                 * take the last one:
+                                 */
+                                last = strrchr(console + 5, ' ');
+                                if (last)
+                                        overlapping_strcpy(console + 5, last + 1);
                                 break;
                         }
 
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 4329ca05c..0ffe21e0b 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -138,7 +138,13 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                 old_tty = tty;
                 if (nchars) {
                         tty.c_lflag &= ~ICANON;
-                        tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
+                        // Setting it to more than 1 breaks poll():
+                        // it blocks even if there's data. !??
+                        //tty.c_cc[VMIN] = nchars < 256 ? nchars : 255;
+                        /* reads would block only if < 1 char is available */
+                        tty.c_cc[VMIN] = 1;
+                        /* no timeout (reads block forever) */
+                        tty.c_cc[VTIME] = 0;
                 }
                 if (read_flags & BUILTIN_READ_SILENT) {
                         tty.c_lflag &= ~(ECHO | ECHOK | ECHONL);