Merge branch 'busybox' into merge

37 files changed, 466 insertions, 107 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 2ab46576c..7448b668a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -282,6 +282,12 @@ typedef long arith_t;
 # define IF_NOT_FEATURE_SH_STANDALONE(...) __VA_ARGS__
 #endif
 
+#ifndef F_DUPFD_CLOEXEC
+# define F_DUPFD_CLOEXEC F_DUPFD
+#endif
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
 #ifndef PIPE_BUF
 # define PIPE_BUF 4096           /* amount of buffering in a pipe */
 #endif
@@ -4196,12 +4202,13 @@ setjobctl(int on)
                                         goto out;
                 }
                 /* fd is a tty at this point */
-                fd = fcntl(fd, F_DUPFD, 10);
+                fd = fcntl(fd, F_DUPFD_CLOEXEC, 10);
                 if (ofd >= 0) /* if it is "/dev/tty", close. If 0/1/2, don't */
                         close(ofd);
                 if (fd < 0)
                         goto out; /* F_DUPFD failed */
-                close_on_exec_on(fd);
+                if (F_DUPFD_CLOEXEC == F_DUPFD) /* if old libc (w/o F_DUPFD_CLOEXEC) */
+                        close_on_exec_on(fd);
                 while (1) { /* while we are in the background */
                         pgrp = tcgetpgrp(fd);
                         if (pgrp < 0) {
@@ -5791,13 +5798,14 @@ savefd(int from)
         int newfd;
         int err;
 
-        newfd = fcntl(from, F_DUPFD, 10);
+        newfd = fcntl(from, F_DUPFD_CLOEXEC, 10);
         err = newfd < 0 ? errno : 0;
         if (err != EBADF) {
                 if (err)
                         ash_msg_and_raise_perror("%d", from);
                 close(from);
-                fcntl(newfd, F_SETFD, FD_CLOEXEC);
+                if (F_DUPFD_CLOEXEC == F_DUPFD)
+                        close_on_exec_on(newfd);
         }
 
         return newfd;
@@ -5815,12 +5823,15 @@ dup2_or_raise(int from, int to)
         return newfd;
 }
 static int
-fcntl_F_DUPFD(int fd, int avoid_fd)
+dup_CLOEXEC(int fd, int avoid_fd)
 {
         int newfd;
  repeat:
-        newfd = fcntl(fd, F_DUPFD, avoid_fd + 1);
-        if (newfd < 0) {
+        newfd = fcntl(fd, F_DUPFD_CLOEXEC, avoid_fd + 1);
+        if (newfd >= 0) {
+                if (F_DUPFD_CLOEXEC == F_DUPFD) /* if old libc (w/o F_DUPFD_CLOEXEC) */
+                        close_on_exec_on(newfd);
+        } else { /* newfd < 0 */
                 if (errno == EBUSY)
                         goto repeat;
                 if (errno == EINTR)
@@ -5833,7 +5844,7 @@ xdup_CLOEXEC_and_close(int fd, int avoid_fd)
 {
         int newfd;
  repeat:
-        newfd = fcntl(fd, F_DUPFD, avoid_fd + 1);
+        newfd = fcntl(fd, F_DUPFD_CLOEXEC, avoid_fd + 1);
         if (newfd < 0) {
                 if (errno == EBUSY)
                         goto repeat;
@@ -5844,7 +5855,8 @@ xdup_CLOEXEC_and_close(int fd, int avoid_fd)
                         return fd;
                 ash_msg_and_raise_perror("%d", newfd);
         }
-        fcntl(newfd, F_SETFD, FD_CLOEXEC);
+        if (F_DUPFD_CLOEXEC == F_DUPFD)
+                close_on_exec_on(newfd);
         close(fd);
         return newfd;
 }
@@ -5936,7 +5948,7 @@ save_fd_on_redirect(int fd, int avoid_fd, struct redirtab *sq)
         for (i = 0; sq->two_fd[i].orig_fd != EMPTY; i++) {
                 /* If we collide with an already moved fd... */
                 if (fd == sq->two_fd[i].moved_to) {
-                        new_fd = fcntl_F_DUPFD(fd, avoid_fd);
+                        new_fd = dup_CLOEXEC(fd, avoid_fd);
                         sq->two_fd[i].moved_to = new_fd;
                         TRACE(("redirect_fd %d: already busy, moving to %d\n", fd, new_fd));
                         if (new_fd < 0) /* what? */
@@ -5951,7 +5963,7 @@ save_fd_on_redirect(int fd, int avoid_fd, struct redirtab *sq)
         }
 
         /* If this fd is open, we move and remember it; if it's closed, new_fd = CLOSED (-1) */
-        new_fd = fcntl_F_DUPFD(fd, avoid_fd);
+        new_fd = dup_CLOEXEC(fd, avoid_fd);
         TRACE(("redirect_fd %d: previous fd is moved to %d (-1 if it was closed)\n", fd, new_fd));
         if (new_fd < 0) {
                 if (errno != EBADF)
@@ -7559,7 +7571,7 @@ varvalue(char *name, int varflags, int flags, int *quotedp)
         case '-':
                 expdest = makestrspace(NOPTS, expdest);
                 for (i = NOPTS - 1; i >= 0; i--) {
-                        if (optlist[i]) {
+                        if (optlist[i] && optletters(i)) {
                                 USTPUTC(optletters(i), expdest);
                                 len++;
                         }
@@ -7806,13 +7818,13 @@ hasmeta(const char *p)
                 p = strpbrk(p, chars);
                 if (!p)
                         break;
-                switch ((unsigned char) *p) {
+                switch ((unsigned char)*p) {
                 case CTLQUOTEMARK:
                         for (;;) {
                                 p++;
-                                if (*p == CTLQUOTEMARK)
+                                if ((unsigned char)*p == CTLQUOTEMARK)
                                         break;
-                                if (*p == CTLESC)
+                                if ((unsigned char)*p == CTLESC)
                                         p++;
                                 if (*p == '\0') /* huh? */
                                         return 0;
@@ -11262,7 +11274,7 @@ setinputfile(const char *fname, int flags)
         int fd;
 
         INT_OFF;
-        fd = open(fname, O_RDONLY);
+        fd = open(fname, O_RDONLY | O_CLOEXEC);
         if (fd < 0) {
                 if (flags & INPUT_NOFILE_OK)
                         goto out;
@@ -11271,8 +11283,9 @@ setinputfile(const char *fname, int flags)
         }
         if (fd < 10)
                 fd = savefd(fd);
-        else
+        else if (O_CLOEXEC == 0) /* old libc */
                 close_on_exec_on(fd);
+
         setinputfd(fd, flags & INPUT_PUSH_FILE);
  out:
         INT_ON;
@@ -12595,6 +12608,12 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                         break;
 #endif
                 case CBQUOTE:   /* '`' */
+                        if (checkkwd & CHKEOFMARK) {
+                                quotef = 1;
+                                USTPUTC('`', out);
+                                break;
+                        }
+
                         PARSEBACKQOLD();
                         break;
                 case CENDFILE:
@@ -12727,7 +12746,7 @@ parseredir: {
         np = stzalloc(sizeof(struct nfile));
         if (c == '>') {
                 np->nfile.fd = 1;
-                c = pgetc();
+                c = pgetc_eatbnl();
                 if (c == '>')
                         np->type = NAPPEND;
                 else if (c == '|')
@@ -12749,7 +12768,7 @@ parseredir: {
 #endif
         else { /* c == '<' */
                 /*np->nfile.fd = 0; - stzalloc did it */
-                c = pgetc();
+                c = pgetc_eatbnl();
                 switch (c) {
                 case '<':
                         if (sizeof(struct nfile) != sizeof(struct nhere)) {
@@ -12759,7 +12778,7 @@ parseredir: {
                         np->type = NHERE;
                         heredoc = stzalloc(sizeof(struct heredoc));
                         heredoc->here = np;
-                        c = pgetc();
+                        c = pgetc_eatbnl();
                         if (c == '-') {
                                 heredoc->striptabs = 1;
                         } else {
@@ -12989,23 +13008,13 @@ parsebackq: {
                         int pc;
 
                         setprompt_if(needprompt, 2);
-                        pc = pgetc();
+                        pc = pgetc_eatbnl();
                         switch (pc) {
                         case '`':
                                 goto done;
 
                         case '\\':
-                                pc = pgetc();
-                                if (pc == '\n') {
-                                        nlprompt();
-                                        /*
-                                         * If eating a newline, avoid putting
-                                         * the newline into the new character
-                                         * stream (via the STPUTC after the
-                                         * switch).
-                                         */
-                                        continue;
-                                }
+                                pc = pgetc(); /* or pgetc_eatbnl()? why (example)? */
                                 if (pc != '\\' && pc != '`' && pc != '$'
                                  && (!dblquote || pc != '"')
                                 ) {
@@ -13137,7 +13146,7 @@ xxreadtoken(void)
         }
         setprompt_if(needprompt, 2);
         for (;;) {                      /* until token or start of word found */
-                c = pgetc();
+                c = pgetc_eatbnl();
                 if (c == ' ' || c == '\t' IF_ASH_ALIAS( || c == PEOA))
                         continue;
 
@@ -13146,11 +13155,7 @@ xxreadtoken(void)
                                 continue;
                         pungetc();
                 } else if (c == '\\') {
-                        if (pgetc() != '\n') {
-                                pungetc();
-                                break; /* return readtoken1(...) */
-                        }
-                        nlprompt();
+                        break; /* return readtoken1(...) */
                 } else {
                         const char *p;
 
@@ -13165,7 +13170,7 @@ xxreadtoken(void)
                                         break; /* return readtoken1(...) */
 
                                 if ((int)(p - xxreadtoken_chars) >= xxreadtoken_singles) {
-                                        int cc = pgetc();
+                                        int cc = pgetc_eatbnl();
                                         if (cc == c) {    /* double occurrence? */
                                                 p += xxreadtoken_doubles + 1;
                                         } else {
@@ -13197,7 +13202,7 @@ xxreadtoken(void)
         }
         setprompt_if(needprompt, 2);
         for (;;) {      /* until token or start of word found */
-                c = pgetc();
+                c = pgetc_eatbnl();
                 switch (c) {
                 case ' ': case '\t':
                 IF_ASH_ALIAS(case PEOA:)
@@ -13207,30 +13212,23 @@ xxreadtoken(void)
                                 continue;
                         pungetc();
                         continue;
-                case '\\':
-                        if (pgetc() == '\n') {
-                                nlprompt();
-                                continue;
-                        }
-                        pungetc();
-                        goto breakloop;
                 case '\n':
                         nlnoprompt();
                         RETURN(TNL);
                 case PEOF:
                         RETURN(TEOF);
                 case '&':
-                        if (pgetc() == '&')
+                        if (pgetc_eatbnl() == '&')
                                 RETURN(TAND);
                         pungetc();
                         RETURN(TBACKGND);
                 case '|':
-                        if (pgetc() == '|')
+                        if (pgetc_eatbnl() == '|')
                                 RETURN(TOR);
                         pungetc();
                         RETURN(TPIPE);
                 case ';':
-                        if (pgetc() == ';')
+                        if (pgetc_eatbnl() == ';')
                                 RETURN(TENDCASE);
                         pungetc();
                         RETURN(TSEMI);
@@ -13238,11 +13236,9 @@ xxreadtoken(void)
                         RETURN(TLP);
                 case ')':
                         RETURN(TRP);
-                default:
-                        goto breakloop;
                 }
+                break;
         }
- breakloop:
         return readtoken1(c, BASESYNTAX, (char *)NULL, 0);
 #undef RETURN
 }
diff --git a/shell/ash_test/ash-heredoc/heredoc_backquote1.right b/shell/ash_test/ash-heredoc/heredoc_backquote1.right
new file mode 100644
index 000000000..0be2a3296
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backquote1.right
@@ -0,0 +1,5 @@
+heredoc1
+Ok1:0
+heredoc2
+EO`false`F
+Ok2:0
diff --git a/shell/ash_test/ash-heredoc/heredoc_backquote1.tests b/shell/ash_test/ash-heredoc/heredoc_backquote1.tests
new file mode 100755
index 000000000..ec3d8fe1d
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backquote1.tests
@@ -0,0 +1,10 @@
+cat <<EO`true`F
+heredoc1
+EO`true`F
+echo Ok1:$?
+
+cat <<EO`true`F
+heredoc2
+EO`false`F
+EO`true`F
+echo Ok2:$?
diff --git a/shell/ash_test/ash-heredoc/heredoc_backslash1.right b/shell/ash_test/ash-heredoc/heredoc_backslash1.right
new file mode 100644
index 000000000..6a6114821
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backslash1.right
@@ -0,0 +1,43 @@
+Quoted heredoc:
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+
+Unquoted heredoc:
+a       b
+a\
+        b
+ 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+        -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
+cEOF2
+
+Quoted -heredoc:
+a\
+b
+a\\
+b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+
+Unquoted -heredoc:
+a       b
+a\
+b
+ 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+-qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
+cEOF4
+
+Done: 0
diff --git a/shell/ash_test/ash-heredoc/heredoc_backslash1.tests b/shell/ash_test/ash-heredoc/heredoc_backslash1.tests
new file mode 100755
index 000000000..501af5490
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_backslash1.tests
@@ -0,0 +1,70 @@
+# Test for correct handling of backslashes.
+# Note that some lines in each heredoc start with a tab.
+
+a=qwerty
+
+echo Quoted heredoc:
+cat <<"EOF1"
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+EOF1
+echo
+
+echo Unquoted heredoc:
+cat <<EOF2
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
+c\
+EOF2
+EOF2
+echo
+
+echo Quoted -heredoc:
+cat <<-"EOF3"
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+        EOF3
+# In -heredoc case the marker is detected even if it is indented.
+echo
+
+echo Unquoted -heredoc:
+cat <<-EOF4
+a\
+        b
+a\\
+        b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+        -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
+c\
+EOF4
+        EOF4
+# The marker is not detected if preceding line ends in backslash.
+# TODO: marker should be detected even if it is split by line continuation:
+# EOF\
+# 4
+# but currently hush doesn't do it. (Tab before "4" is not allowed, though.)
+echo
+
+echo "Done: $?"
diff --git a/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.right b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.right
new file mode 100644
index 000000000..fdb7ebd03
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.right
@@ -0,0 +1,8 @@
+heredoc0
+Ok0:0
+heredoc1
+Ok1:0
+heredoc2
+Ok2:0
+heredoc3
+Ok4:0
diff --git a/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.tests b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.tests
new file mode 100755
index 000000000..584edd0e4
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_bkslash_newline1.tests
@@ -0,0 +1,25 @@
+cat <\
+<\
+EOF
+heredoc0
+EOF
+echo Ok0:$?
+
+cat <<\
+ EOF
+heredoc1
+EOF
+echo Ok1:$?
+
+cat <<\
+- EOF
+heredoc2
+        EOF
+echo Ok2:$?
+
+cat <\
+<\
+- EOF
+heredoc3
+        EOF
+echo Ok4:$?
diff --git a/shell/ash_test/ash-parsing/bkslash_newline1.right b/shell/ash_test/ash-parsing/bkslash_newline1.right
new file mode 100644
index 000000000..97ea0c197
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline1.right
@@ -0,0 +1,4 @@
+and1
+and2
+or1
+ok
diff --git a/shell/ash_test/ash-parsing/bkslash_newline1.tests b/shell/ash_test/ash-parsing/bkslash_newline1.tests
new file mode 100755
index 000000000..6e374c4fb
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline1.tests
@@ -0,0 +1,8 @@
+echo and1 &\
+& echo and2
+
+echo or1 |\
+| echo NOT SHOWN
+
+case w in a) echo SKIP;\
+; w) echo ok;; esac;
diff --git a/shell/ash_test/ash-parsing/bkslash_newline2.right b/shell/ash_test/ash-parsing/bkslash_newline2.right
new file mode 100644
index 000000000..c863c5453
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline2.right
@@ -0,0 +1,4 @@
+Line with one backslash:
+\
+
+Ok:0
diff --git a/shell/ash_test/ash-parsing/bkslash_newline2.tests b/shell/ash_test/ash-parsing/bkslash_newline2.tests
new file mode 100755
index 000000000..47d63042d
--- /dev/null
+++ b/shell/ash_test/ash-parsing/bkslash_newline2.tests
@@ -0,0 +1,4 @@
+echo Line with one backslash:
+echo '\
+'
+echo Ok:$?
diff --git a/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.right b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.right
new file mode 100644
index 000000000..2aead7129
--- /dev/null
+++ b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.right
@@ -0,0 +1 @@
+\/a\/bc\/def\/file
diff --git a/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.tests b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.tests
new file mode 100755
index 000000000..64ca0c170
--- /dev/null
+++ b/shell/ash_test/ash-quoting/dollar_repl_slash_bash2.tests
@@ -0,0 +1,2 @@
+var="/a/bc/def/file"
+echo "${var//\//\\/}"
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.right b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.tests b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.tests
new file mode 100755
index 000000000..544c810e3
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_1.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+busybox find /proc/self/fd >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.right b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.tests b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.tests
new file mode 100755
index 000000000..43777cade
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_2.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.right b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.tests b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.tests
new file mode 100755
index 000000000..0a21173bd
--- /dev/null
+++ b/shell/ash_test/ash-redir/redir_children_should_not_see_saved_fd_3.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; true; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/ash_test/ash-vars/var_LINENO1.right b/shell/ash_test/ash-vars/var_LINENO1.right
new file mode 100644
index 000000000..31e1a4478
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO1.right
@@ -0,0 +1,8 @@
+2:2
+3:3
+4:4
+5:5
+2:2
+3:3
+4:4
+5:5
diff --git a/shell/ash_test/ash-vars/var_LINENO1.tests b/shell/ash_test/ash-vars/var_LINENO1.tests
new file mode 100755
index 000000000..775861e64
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO1.tests
@@ -0,0 +1,6 @@
+env | grep ^LINENO
+echo 2:$LINENO
+echo 3:$LINENO >&2 \
+| { sleep 0.1; echo 4:$LINENO; }
+echo 5:$LINENO
+test "$1" || . ./var_LINENO1.tests norepeat
diff --git a/shell/hush.c b/shell/hush.c
index 6e64efb70..06fe0e405 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1501,12 +1501,15 @@ static void free_strings(char **strings)
         free(strings);
 }
 
-static int fcntl_F_DUPFD(int fd, int avoid_fd)
+static int dup_CLOEXEC(int fd, int avoid_fd)
 {
         int newfd;
  repeat:
-        newfd = fcntl(fd, F_DUPFD, avoid_fd + 1);
-        if (newfd < 0) {
+        newfd = fcntl(fd, F_DUPFD_CLOEXEC, avoid_fd + 1);
+        if (newfd >= 0) {
+                if (F_DUPFD_CLOEXEC == F_DUPFD) /* if old libc (w/o F_DUPFD_CLOEXEC) */
+                        fcntl(newfd, F_SETFD, FD_CLOEXEC);
+        } else { /* newfd < 0 */
                 if (errno == EBUSY)
                         goto repeat;
                 if (errno == EINTR)
@@ -2691,6 +2694,42 @@ static int i_peek2(struct in_str *i)
         return ch;
 }
 
+static int i_getch_and_eat_bkslash_nl(struct in_str *input)
+{
+        for (;;) {
+                int ch, ch2;
+
+                ch = i_getch(input);
+                if (ch != '\\')
+                        return ch;
+                ch2 = i_peek(input);
+                if (ch2 != '\n')
+                        return ch;
+                /* backslash+newline, skip it */
+                i_getch(input);
+        }
+}
+
+/* Note: this function _eats_ \<newline> pairs, safe to use plain
+ * i_getch() after it instead of i_getch_and_eat_bkslash_nl().
+ */
+static int i_peek_and_eat_bkslash_nl(struct in_str *input)
+{
+        for (;;) {
+                int ch, ch2;
+
+                ch = i_peek(input);
+                if (ch != '\\')
+                        return ch;
+                ch2 = i_peek2(input);
+                if (ch2 != '\n')
+                        return ch;
+                /* backslash+newline, skip it */
+                i_getch(input);
+                i_getch(input);
+        }
+}
+
 static void setup_file_in_str(struct in_str *i, FILE *f)
 {
         memset(i, 0, sizeof(*i));
@@ -3119,7 +3158,7 @@ static int glob_brace(char *pattern, o_string *o, int n)
                                 return o_save_ptr_helper(o, n);
                         }
                         if (gr == GLOB_NOSPACE)
-                                bb_error_msg_and_die(bb_msg_memory_exhausted);
+                                bb_die_memory_exhausted();
                         /* GLOB_ABORTED? Only happens with GLOB_ERR flag,
                          * but we didn't specify it. Paranoia again. */
                         bb_error_msg_and_die("glob error %d on '%s'", gr, pattern);
@@ -3221,7 +3260,7 @@ static int perform_glob(o_string *o, int n)
                         goto literal;
                 }
                 if (gr == GLOB_NOSPACE)
-                        bb_error_msg_and_die(bb_msg_memory_exhausted);
+                        bb_die_memory_exhausted();
                 /* GLOB_ABORTED? Only happens with GLOB_ERR flag,
                  * but we didn't specify it. Paranoia again. */
                 bb_error_msg_and_die("glob error %d on '%s'", gr, pattern);
@@ -3812,16 +3851,28 @@ static int done_word(o_string *word, struct parse_context *ctx)
         if (ctx->pending_redirect) {
                 /* We do not glob in e.g. >*.tmp case. bash seems to glob here
                  * only if run as "bash", not "sh" */
-                /* http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+                /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
                  * "2.7 Redirection
-                 * ...the word that follows the redirection operator
-                 * shall be subjected to tilde expansion, parameter expansion,
-                 * command substitution, arithmetic expansion, and quote
-                 * removal. Pathname expansion shall not be performed
+                 * If the redirection operator is "<<" or "<<-", the word
+                 * that follows the redirection operator shall be
+                 * subjected to quote removal; it is unspecified whether
+                 * any of the other expansions occur. For the other
+                 * redirection operators, the word that follows the
+                 * redirection operator shall be subjected to tilde
+                 * expansion, parameter expansion, command substitution,
+                 * arithmetic expansion, and quote removal.
+                 * Pathname expansion shall not be performed
                  * on the word by a non-interactive shell; an interactive
                  * shell may perform it, but shall do so only when
                  * the expansion would result in one word."
                  */
+//bash does not do parameter/command substitution or arithmetic expansion
+//for _heredoc_ redirection word: these constructs look for exact eof marker
+// as written:
+// <<EOF$t
+// <<EOF$((1))
+// <<EOF`true`  [this case also makes heredoc "quoted", a-la <<"EOF". Probably bash-4.3.43 bug]
+
                 ctx->pending_redirect->rd_filename = xstrdup(word->data);
                 /* Cater for >\file case:
                  * >\a creates file a; >\\a, >"\a", >"\\a" create file \a
@@ -4011,7 +4062,7 @@ static int parse_redirect(struct parse_context *ctx,
                 if (dup_num == REDIRFD_SYNTAX_ERR)
                         return 1;
         } else {
-                int ch = i_peek(input);
+                int ch = i_peek_and_eat_bkslash_nl(input);
                 dup_num = (ch == '-'); /* HEREDOC_SKIPTABS bit is 1 */
                 if (dup_num) { /* <<-... */
                         ch = i_getch(input);
@@ -4021,7 +4072,7 @@ static int parse_redirect(struct parse_context *ctx,
         }
 
         if (style == REDIRECT_OVERWRITE && dup_num == REDIRFD_TO_FILE) {
-                int ch = i_peek(input);
+                int ch = i_peek_and_eat_bkslash_nl(input);
                 if (ch == '|') {
                         /* >|FILE redirect ("clobbering" >).
                          * Since we do not support "set -o noclobber" yet,
@@ -4189,6 +4240,7 @@ static int fetch_heredocs(int heredoc_cnt, struct parse_context *ctx, struct in_
 
                                         redir->rd_type = REDIRECT_HEREDOC2;
                                         /* redir->rd_dup is (ab)used to indicate <<- */
+bb_error_msg("redir->rd_filename:'%s'",  redir->rd_filename);
                                         p = fetch_till_str(&ctx->as_string, input,
                                                         redir->rd_filename, redir->rd_dup);
                                         if (!p) {
@@ -4340,39 +4392,6 @@ static int parse_group(o_string *dest, struct parse_context *ctx,
         /* command remains "open", available for possible redirects */
 }
 
-static int i_getch_and_eat_bkslash_nl(struct in_str *input)
-{
-        for (;;) {
-                int ch, ch2;
-
-                ch = i_getch(input);
-                if (ch != '\\')
-                        return ch;
-                ch2 = i_peek(input);
-                if (ch2 != '\n')
-                        return ch;
-                /* backslash+newline, skip it */
-                i_getch(input);
-        }
-}
-
-static int i_peek_and_eat_bkslash_nl(struct in_str *input)
-{
-        for (;;) {
-                int ch, ch2;
-
-                ch = i_peek(input);
-                if (ch != '\\')
-                        return ch;
-                ch2 = i_peek2(input);
-                if (ch2 != '\n')
-                        return ch;
-                /* backslash+newline, skip it */
-                i_getch(input);
-                i_getch(input);
-        }
-}
-
 #if ENABLE_HUSH_TICK || ENABLE_FEATURE_SH_MATH || ENABLE_HUSH_DOLLAR_OPS
 /* Subroutines for copying $(...) and `...` things */
 static int add_till_backquote(o_string *dest, struct in_str *input, int in_dquote);
@@ -4974,8 +4993,14 @@ static struct pipe *parse_stream(char **pstring,
                 nommu_addchr(&ctx.as_string, ch);
 
                 next = '\0';
-                if (ch != '\n')
+                if (ch != '\n') {
                         next = i_peek(input);
+                        /* Can't use i_peek_and_eat_bkslash_nl(input) here:
+                         *  echo '\
+                         *  '
+                         * will break.
+                         */
+                }
 
                 is_special = "{}<>;&|()#'" /* special outside of "str" */
                                 "\\$\"" IF_HUSH_TICK("`") /* always special */
@@ -5178,6 +5203,8 @@ static struct pipe *parse_stream(char **pstring,
                                 goto parse_error;
                         }
                         redir_style = REDIRECT_OVERWRITE;
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '>') {
                                 redir_style = REDIRECT_APPEND;
                                 ch = i_getch(input);
@@ -5198,6 +5225,8 @@ static struct pipe *parse_stream(char **pstring,
                                 goto parse_error;
                         }
                         redir_style = REDIRECT_INPUT;
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '<') {
                                 redir_style = REDIRECT_HEREDOC;
                                 heredoc_cnt++;
@@ -5365,7 +5394,7 @@ static struct pipe *parse_stream(char **pstring,
                         /* Eat multiple semicolons, detect
                          * whether it means something special */
                         while (1) {
-                                ch = i_peek(input);
+                                ch = i_peek_and_eat_bkslash_nl(input);
                                 if (ch != ';')
                                         break;
                                 ch = i_getch(input);
@@ -5387,6 +5416,8 @@ static struct pipe *parse_stream(char **pstring,
                         if (done_word(&dest, &ctx)) {
                                 goto parse_error;
                         }
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '&') {
                                 ch = i_getch(input);
                                 nommu_addchr(&ctx.as_string, ch);
@@ -5403,6 +5434,8 @@ static struct pipe *parse_stream(char **pstring,
                         if (ctx.ctx_res_w == RES_MATCH)
                                 break; /* we are in case's "word | word)" */
 #endif
+                        if (next == '\\')
+                                next = i_peek_and_eat_bkslash_nl(input);
                         if (next == '|') { /* || */
                                 ch = i_getch(input);
                                 nommu_addchr(&ctx.as_string, ch);
@@ -6123,7 +6156,7 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
                         } else
                         /* If EXP_FLAG_SINGLEWORD, we handle assignment 'a=....$@.....'
                          * and in this case should treat it like '$*' - see 'else...' below */
-                        if (first_ch == ('@'|0x80)  /* quoted $@ */
+                        if (first_ch == (char)('@'|0x80)  /* quoted $@ */
                          && !(output->o_expflags & EXP_FLAG_SINGLEWORD) /* not v="$@" case */
                         ) {
                                 while (1) {
@@ -6890,7 +6923,7 @@ static struct squirrel *add_squirrel(struct squirrel *sq, int fd, int avoid_fd)
         if (sq) for (; sq[i].orig_fd >= 0; i++) {
                 /* If we collide with an already moved fd... */
                 if (fd == sq[i].moved_to) {
-                        sq[i].moved_to = fcntl_F_DUPFD(sq[i].moved_to, avoid_fd);
+                        sq[i].moved_to = dup_CLOEXEC(sq[i].moved_to, avoid_fd);
                         debug_printf_redir("redirect_fd %d: already busy, moving to %d\n", fd, sq[i].moved_to);
                         if (sq[i].moved_to < 0) /* what? */
                                 xfunc_die();
@@ -6904,7 +6937,7 @@ static struct squirrel *add_squirrel(struct squirrel *sq, int fd, int avoid_fd)
         }
 
         /* If this fd is open, we move and remember it; if it's closed, moved_to = -1 */
-        moved_to = fcntl_F_DUPFD(fd, avoid_fd);
+        moved_to = dup_CLOEXEC(fd, avoid_fd);
         debug_printf_redir("redirect_fd %d: previous fd is moved to %d (-1 if it was closed)\n", fd, moved_to);
         if (moved_to < 0 && errno != EBADF)
                 xfunc_die();
@@ -7622,6 +7655,10 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
                                  */
                                 close_saved_fds_and_FILE_fds();
 //FIXME: should also close saved redir fds
+//This casuses test failures in
+//redir_children_should_not_see_saved_fd_2.tests
+//redir_children_should_not_see_saved_fd_3.tests
+//if you replace "busybox find" with just "find" in them
                                 /* Without this, "rm -i FILE" can't be ^C'ed: */
                                 switch_off_special_sigs(G.special_sig_mask);
                                 debug_printf_exec("running applet '%s'\n", argv[0]);
@@ -8166,6 +8203,12 @@ static NOINLINE int run_pipe(struct pipe *pi)
                 rcode = 1; /* exitcode if redir failed */
                 if (setup_redirects(command, &squirrel) == 0) {
                         debug_printf_exec(": run_list\n");
+//FIXME: we need to pass squirrel down into run_list()
+//for SH_STANDALONE case, or else this construct:
+// { find /proc/self/fd; true; } >FILE; cmd2
+//has no way of closing saved fd#1 for "find",
+//and in SH_STANDALONE mode, "find" is not execed,
+//therefore CLOEXEC on saved fd does not help.
                         rcode = run_list(command->group) & 0xff;
                 }
                 restore_redirects(squirrel);
@@ -9347,7 +9390,7 @@ int hush_main(int argc, char **argv)
                         G_saved_tty_pgrp = 0;
 
                 /* try to dup stdin to high fd#, >= 255 */
-                G_interactive_fd = fcntl_F_DUPFD(STDIN_FILENO, 254);
+                G_interactive_fd = dup_CLOEXEC(STDIN_FILENO, 254);
                 if (G_interactive_fd < 0) {
                         /* try to dup to any fd */
                         G_interactive_fd = dup(STDIN_FILENO);
@@ -9420,10 +9463,10 @@ int hush_main(int argc, char **argv)
 #elif ENABLE_HUSH_INTERACTIVE
         /* No job control compiled in, only prompt/line editing */
         if (isatty(STDIN_FILENO) && isatty(STDOUT_FILENO)) {
-                G_interactive_fd = fcntl_F_DUPFD(STDIN_FILENO, 254);
+                G_interactive_fd = dup_CLOEXEC(STDIN_FILENO, 254);
                 if (G_interactive_fd < 0) {
                         /* try to dup to any fd */
-                        G_interactive_fd = dup(STDIN_FILENO);
+                        G_interactive_fd = dup_CLOEXEC(STDIN_FILENO);
                         if (G_interactive_fd < 0)
                                 /* give up */
                                 G_interactive_fd = 0;
diff --git a/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right
new file mode 100644
index 000000000..fdb7ebd03
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right
@@ -0,0 +1,8 @@
+heredoc0
+Ok0:0
+heredoc1
+Ok1:0
+heredoc2
+Ok2:0
+heredoc3
+Ok4:0
diff --git a/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests
new file mode 100755
index 000000000..584edd0e4
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests
@@ -0,0 +1,25 @@
+cat <\
+<\
+EOF
+heredoc0
+EOF
+echo Ok0:$?
+
+cat <<\
+ EOF
+heredoc1
+EOF
+echo Ok1:$?
+
+cat <<\
+- EOF
+heredoc2
+        EOF
+echo Ok2:$?
+
+cat <\
+<\
+- EOF
+heredoc3
+        EOF
+echo Ok4:$?
diff --git a/shell/hush_test/hush-parsing/bkslash_newline1.right b/shell/hush_test/hush-parsing/bkslash_newline1.right
new file mode 100644
index 000000000..97ea0c197
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline1.right
@@ -0,0 +1,4 @@
+and1
+and2
+or1
+ok
diff --git a/shell/hush_test/hush-parsing/bkslash_newline1.tests b/shell/hush_test/hush-parsing/bkslash_newline1.tests
new file mode 100755
index 000000000..6e374c4fb
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline1.tests
@@ -0,0 +1,8 @@
+echo and1 &\
+& echo and2
+
+echo or1 |\
+| echo NOT SHOWN
+
+case w in a) echo SKIP;\
+; w) echo ok;; esac;
diff --git a/shell/hush_test/hush-parsing/bkslash_newline2.right b/shell/hush_test/hush-parsing/bkslash_newline2.right
new file mode 100644
index 000000000..c863c5453
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline2.right
@@ -0,0 +1,4 @@
+Line with one backslash:
+\
+
+Ok:0
diff --git a/shell/hush_test/hush-parsing/bkslash_newline2.tests b/shell/hush_test/hush-parsing/bkslash_newline2.tests
new file mode 100755
index 000000000..47d63042d
--- /dev/null
+++ b/shell/hush_test/hush-parsing/bkslash_newline2.tests
@@ -0,0 +1,4 @@
+echo Line with one backslash:
+echo '\
+'
+echo Ok:$?
diff --git a/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.right b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.right
new file mode 100644
index 000000000..2aead7129
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.right
@@ -0,0 +1 @@
+\/a\/bc\/def\/file
diff --git a/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.tests b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.tests
new file mode 100755
index 000000000..64ca0c170
--- /dev/null
+++ b/shell/hush_test/hush-quoting/dollar_repl_slash_bash2.tests
@@ -0,0 +1,2 @@
+var="/a/bc/def/file"
+echo "${var//\//\\/}"
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.right b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.tests b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.tests
new file mode 100755
index 000000000..544c810e3
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_1.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+busybox find /proc/self/fd >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.right b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.tests b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.tests
new file mode 100755
index 000000000..43777cade
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_2.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.right b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.right
new file mode 100644
index 000000000..46ab7f5d1
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.right
@@ -0,0 +1,5 @@
+/proc/self/fd
+/proc/self/fd/0
+/proc/self/fd/1
+/proc/self/fd/2
+/proc/self/fd/3
diff --git a/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.tests b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.tests
new file mode 100755
index 000000000..0a21173bd
--- /dev/null
+++ b/shell/hush_test/hush-redir/redir_children_should_not_see_saved_fd_3.tests
@@ -0,0 +1,6 @@
+# The "find" should not see "saved" (duplicated) fd #1
+# Explicitly use bbox find, since other implementations of "find"
+# may open other descriptors as well.
+{ busybox find /proc/self/fd; true; } >tmp_$$.out
+cat tmp_$$.out
+rm -f tmp_$$.out
diff --git a/shell/hush_test/hush-vars/var_LINENO1.tests b/shell/hush_test/hush-vars/var_LINENO1.tests
index 851b52cf5..775861e64 100755
--- a/shell/hush_test/hush-vars/var_LINENO1.tests
+++ b/shell/hush_test/hush-vars/var_LINENO1.tests
@@ -1,4 +1,4 @@
-env | grep LINENO
+env | grep ^LINENO
 echo 2:$LINENO
 echo 3:$LINENO >&2 \
 | { sleep 0.1; echo 4:$LINENO; }