Merge branch 'busybox' into merge

1 files changed, 167 insertions, 24 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 3d6f25802..14712ef54 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -262,6 +262,14 @@
 #define    BASH_READ_D          ENABLE_ASH_BASH_COMPAT
 #define IF_BASH_READ_D              IF_ASH_BASH_COMPAT
 #define    BASH_WAIT_N          ENABLE_ASH_BASH_COMPAT
+/* <(...) and >(...) */
+#if HAVE_DEV_FD
+# define    BASH_PROCESS_SUBST   ENABLE_ASH_BASH_COMPAT
+# define IF_BASH_PROCESS_SUBST       IF_ASH_BASH_COMPAT
+#else
+# define    BASH_PROCESS_SUBST 0
+# define IF_BASH_PROCESS_SUBST(...)
+#endif
 
 #if defined(__ANDROID_API__) && __ANDROID_API__ <= 24
 /* Bionic at least up to version 24 has no glob() */
@@ -973,6 +981,12 @@ out2str(const char *p)
 #define CTLENDARI    ((unsigned char)'\207')
 #define CTLQUOTEMARK ((unsigned char)'\210')
 #define CTL_LAST CTLQUOTEMARK
+#if BASH_PROCESS_SUBST
+# define CTLTOPROC    ((unsigned char)'\211')
+# define CTLFROMPROC  ((unsigned char)'\212')
+# undef CTL_LAST
+# define CTL_LAST CTLFROMPROC
+#endif
 
 /* variable substitution byte (follows CTLVAR) */
 #define VSTYPE  0x0f            /* type of variable substitution */
@@ -1244,6 +1258,10 @@ trace_puts_quoted(char *s)
                 case CTLESC: c = 'e'; goto backslash;
                 case CTLVAR: c = 'v'; goto backslash;
                 case CTLBACKQ: c = 'q'; goto backslash;
+#if BASH_PROCESS_SUBST
+                case CTLTOPROC: c = 'p'; goto backslash;
+                case CTLFROMPROC: c = 'P'; goto backslash;
+#endif
  backslash:
                         putc('\\', tracefile);
                         putc(c, tracefile);
@@ -1405,8 +1423,17 @@ sharg(union node *arg, FILE *fp)
                 case CTLENDVAR:
                         putc('}', fp);
                         break;
+#if BASH_PROCESS_SUBST
+                case CTLTOPROC:
+                        putc('>', fp);
+                        goto backq;
+                case CTLFROMPROC:
+                        putc('<', fp);
+                        goto backq;
+#endif
                 case CTLBACKQ:
                         putc('$', fp);
+ IF_BASH_PROCESS_SUBST(backq:)
                         putc('(', fp);
                         shtree(bqlist->n, -1, NULL, fp);
                         putc(')', fp);
@@ -3663,8 +3690,13 @@ static const uint8_t syntax_index_table[] ALIGN1 = {
         /* 134 CTLARI       */ CCTL_CCTL_CCTL_CCTL,
         /* 135 CTLENDARI    */ CCTL_CCTL_CCTL_CCTL,
         /* 136 CTLQUOTEMARK */ CCTL_CCTL_CCTL_CCTL,
+#if BASH_PROCESS_SUBST
+        /* 137 CTLTOPROC    */ CCTL_CCTL_CCTL_CCTL,
+        /* 138 CTLFROMPROC  */ CCTL_CCTL_CCTL_CCTL,
+#else
         /* 137      */ CWORD_CWORD_CWORD_CWORD,
         /* 138      */ CWORD_CWORD_CWORD_CWORD,
+#endif
         /* 139      */ CWORD_CWORD_CWORD_CWORD,
         /* 140      */ CWORD_CWORD_CWORD_CWORD,
         /* 141      */ CWORD_CWORD_CWORD_CWORD,
@@ -5377,9 +5409,24 @@ cmdputs(const char *s)
                         quoted >>= 1;
                         subtype = 0;
                         goto dostr;
+#if BASH_PROCESS_SUBST
+                case CTLBACKQ:
+                        c = '$';
+                        str = "(...)";
+                        break;
+                case CTLTOPROC:
+                        c = '>';
+                        str = "(...)";
+                        break;
+                case CTLFROMPROC:
+                        c = '<';
+                        str = "(...)";
+                        break;
+#else
                 case CTLBACKQ:
                         str = "$(...)";
                         goto dostr;
+#endif
 #if ENABLE_FEATURE_SH_MATH
                 case CTLARI:
                         str = "$((";
@@ -6446,6 +6493,21 @@ redirectsafe(union node *redir, int flags)
         return err;
 }
 
+#if BASH_PROCESS_SUBST
+static void
+pushfd(int fd)
+{
+        struct redirtab *sv;
+
+        sv = ckzalloc(sizeof(*sv) + sizeof(sv->two_fd[0]));
+        sv->pair_count = 1;
+        sv->two_fd[0].orig_fd = fd;
+        sv->two_fd[0].moved_to = CLOSED;
+        sv->next = redirlist;
+        redirlist = sv;
+}
+#endif
+
 static struct redirtab*
 pushredir(union node *redir)
 {
@@ -7084,10 +7146,20 @@ evaltreenr(union node *n, int flags)
 }
 
 static void FAST_FUNC
-evalbackcmd(union node *n, struct backcmd *result)
+evalbackcmd(union node *n, struct backcmd *result
+                                IF_BASH_PROCESS_SUBST(, int ctl))
 {
         int pip[2];
         struct job *jp;
+#if BASH_PROCESS_SUBST
+        /* determine end of pipe used by parent (ip) and child (ic) */
+        const int ip = (ctl == CTLTOPROC);
+        const int ic = !(ctl == CTLTOPROC);
+#else
+        const int ctl = CTLBACKQ;
+        const int ip = 0;
+        const int ic = 1;
+#endif
         IF_PLATFORM_MINGW32(struct forkshell fs);
 
         result->fd = -1;
@@ -7100,23 +7172,26 @@ evalbackcmd(union node *n, struct backcmd *result)
 
         if (pipe(pip) < 0)
                 ash_msg_and_raise_perror("can't create pipe");
-        jp = makejob(/*n,*/ 1);
+        /* process substitution uses NULL job/node, like openhere() */
+        jp = (ctl == CTLBACKQ) ? makejob(/*n,*/ 1) : NULL;
 #if ENABLE_PLATFORM_MINGW32
         memset(&fs, 0, sizeof(fs));
         fs.fpid = FS_EVALBACKCMD;
         fs.n = n;
         fs.fd[0] = pip[0];
         fs.fd[1] = pip[1];
-        spawn_forkshell(&fs, jp, n, FORK_NOJOB);
+        fs.fd[2] = ctl;
+        spawn_forkshell(&fs, jp, (ctl == CTLBACKQ) ? n : NULL, FORK_NOJOB);
 #else
-        if (forkshell(jp, n, FORK_NOJOB) == 0) {
+        if (forkshell(jp, (ctl == CTLBACKQ) ? n : NULL, FORK_NOJOB) == 0) {
                 /* child */
                 FORCE_INT_ON;
-                close(pip[0]);
-                if (pip[1] != 1) {
-                        /*close(1);*/
-                        dup2_or_raise(pip[1], 1);
-                        close(pip[1]);
+                close(pip[ip]);
+                /* ic is index of child end of pipe *and* fd to connect it to */
+                if (pip[ic] != ic) {
+                        /*close(ic);*/
+                        dup2_or_raise(pip[ic], ic);
+                        close(pip[ic]);
                 }
 /* TODO: eflag clearing makes the following not abort:
  *  ash -c 'set -e; z=$(false;echo foo); echo $z'
@@ -7133,8 +7208,18 @@ evalbackcmd(union node *n, struct backcmd *result)
         }
 #endif
         /* parent */
-        close(pip[1]);
-        result->fd = pip[0];
+#if BASH_PROCESS_SUBST
+        if (ctl != CTLBACKQ) {
+                int fd = fcntl(pip[ip], F_DUPFD, 64);
+                if (fd > 0) {
+                        close(pip[ip]);
+                        pip[ip] = fd;
+                }
+                pushfd(pip[ip]);
+        }
+#endif
+        close(pip[ic]);
+        result->fd = pip[ip];
         result->jp = jp;
 
  out:
@@ -7146,8 +7231,11 @@ evalbackcmd(union node *n, struct backcmd *result)
  * Expand stuff in backwards quotes.
  */
 static void
-expbackq(union node *cmd, int flag)
+expbackq(union node *cmd, int flag IF_BASH_PROCESS_SUBST(, int ctl))
 {
+#if !BASH_PROCESS_SUBST
+        const int ctl = CTLBACKQ;
+#endif
         struct backcmd in;
         int i;
         char buf[128];
@@ -7162,9 +7250,15 @@ expbackq(union node *cmd, int flag)
         INT_OFF;
         startloc = expdest - (char *)stackblock();
         pushstackmark(&smark, startloc);
-        evalbackcmd(cmd, &in);
+        evalbackcmd(cmd, &in IF_BASH_PROCESS_SUBST(, ctl));
         popstackmark(&smark);
 
+        if (ctl != CTLBACKQ) {
+                sprintf(buf, DEV_FD_PREFIX"%d", in.fd);
+                strtodest(buf, BASESYNTAX);
+                goto done;
+        }
+
         p = in.buf;
         i = in.nleft;
         if (i == 0)
@@ -7186,6 +7280,7 @@ expbackq(union node *cmd, int flag)
                 close(in.fd);
                 back_exitstatus = waitforjob(in.jp);
         }
+ done:
         INT_ON;
 
         /* Eat all trailing newlines */
@@ -7274,6 +7369,10 @@ argstr(char *p, int flag)
                 CTLESC,
                 CTLVAR,
                 CTLBACKQ,
+#if BASH_PROCESS_SUBST
+                CTLTOPROC,
+                CTLFROMPROC,
+#endif
 #if ENABLE_FEATURE_SH_MATH
                 CTLARI,
                 CTLENDARI,
@@ -7373,8 +7472,12 @@ argstr(char *p, int flag)
                         p = evalvar(p, flag | inquotes);
                         TRACE(("argstr: evalvar:'%s'\n", (char *)stackblock()));
                         goto start;
+#if BASH_PROCESS_SUBST
+                case CTLTOPROC:
+                case CTLFROMPROC:
+#endif
                 case CTLBACKQ:
-                        expbackq(argbackq->n, flag | inquotes);
+                        expbackq(argbackq->n, flag | inquotes IF_BASH_PROCESS_SUBST(, c));
                         goto start;
 #if ENABLE_FEATURE_SH_MATH
                 case CTLARI:
@@ -12995,8 +13098,9 @@ realeofmark(const char *eofmark)
 #define CHECKEND()      {goto checkend; checkend_return:;}
 #define PARSEREDIR()    {goto parseredir; parseredir_return:;}
 #define PARSESUB()      {goto parsesub; parsesub_return:;}
-#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
-#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
+#define PARSEBACKQOLD() {style = OLD; goto parsebackq; parsebackq_oldreturn:;}
+#define PARSEBACKQNEW() {style = NEW; goto parsebackq; parsebackq_newreturn:;}
+#define PARSEPROCSUB()  {style = PSUB; goto parsebackq; parsebackq_psreturn:;}
 #define PARSEARITH()    {goto parsearith; parsearith_return:;}
 static int
 readtoken1(int c, int syntax, char *eofmark, int striptabs)
@@ -13007,7 +13111,9 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
         size_t len;
         struct nodelist *bqlist;
         smallint quotef;
-        smallint oldstyle;
+        smallint style;
+        enum { OLD, NEW, PSUB };
+#define oldstyle (style == OLD)
         smallint pssyntax;   /* we are expanding a prompt string */
         IF_BASH_DOLLAR_SQUOTE(smallint bash_dollar_squote = 0;)
         /* syntax stack */
@@ -13189,6 +13295,15 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                         pungetc();
                                 }
 #endif
+#if BASH_PROCESS_SUBST
+                                if (c == '<' || c == '>') {
+                                        if (pgetc() == '(') {
+                                                PARSEPROCSUB();
+                                                break;
+                                        }
+                                        pungetc();
+                                }
+#endif
                                 goto endword;   /* exit outer loop */
                         }
                         IF_ASH_ALIAS(if (c != PEOA))
@@ -13673,9 +13788,18 @@ parsebackq: {
                 memcpy(out, str, savelen);
                 STADJUST(savelen, out);
         }
-        USTPUTC(CTLBACKQ, out);
+#if BASH_PROCESS_SUBST
+        if (style == PSUB)
+                USTPUTC(c == '<' ? CTLFROMPROC : CTLTOPROC, out);
+        else
+#endif
+                USTPUTC(CTLBACKQ, out);
         if (oldstyle)
                 goto parsebackq_oldreturn;
+#if BASH_PROCESS_SUBST
+        else if (style == PSUB)
+                goto parsebackq_psreturn;
+#endif
         goto parsebackq_newreturn;
 }
 
@@ -14130,6 +14254,9 @@ cmdloop(int top)
                 if (doing_jobctl)
                         showjobs(SHOW_CHANGED|SHOW_STDERR);
 #endif
+#if BASH_PROCESS_SUBST
+                unwindredir(NULL);
+#endif
                 inter = 0;
                 if (iflag && top) {
                         inter++;
@@ -14864,6 +14991,10 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 }
         }
 
+        if (!ENABLE_ASH_BASH_COMPAT && !argptr) {
+                bb_simple_error_msg("read: need variable name");
+                return 1;
+        }
         params.argv = argptr;
         params.setvar = setvar0;
         params.ifs = bltinlookup("IFS"); /* can be NULL */
@@ -15578,15 +15709,27 @@ forkshell_openhere(struct forkshell *fs)
 static void
 forkshell_evalbackcmd(struct forkshell *fs)
 {
+#if BASH_PROCESS_SUBST
+        /* determine end of pipe used by parent (ip) and child (ic) */
+        const int ctl = fs->fd[2];
+        const int ip = (ctl == CTLTOPROC);
+        const int ic = !(ctl == CTLTOPROC);
+#else
+        const int ip = 0;
+        const int ic = 1;
+#endif
         union node *n = fs->n;
-        int pip[2] = {fs->fd[0], fs->fd[1]};
+        int pip[2];
+
+        pip[ip] = fs->fd[ip];
+        pip[ic] = fs->fd[ic];
 
         FORCE_INT_ON;
-        close(pip[0]);
-        if (pip[1] != 1) {
-                /*close(1);*/
-                dup2_or_raise(pip[1], 1);
-                close(pip[1]);
+        close(pip[ip]);
+        if (pip[ic] != ic) {
+                /*close(ic);*/
+                dup2_or_raise(pip[ic], ic);
+                close(pip[ic]);
         }
         eflag = 0;
         ifsfree();