4 files changed, 139 insertions, 35 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 773de79f5..61f10d74e 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -431,7 +431,7 @@ struct forkshell {
         int fd[3];
         union node *n;
         char **argv;
-        char *path;
+        const char *path;
 } ALIGN64;
 
 enum {
@@ -1181,14 +1181,15 @@ static const char dolatstr[] ALIGN1 = {
 #endif
 #define NCLOBBER 18
 #define NFROM    19
-#define NFROMTO  20
-#define NAPPEND  21
-#define NTOFD    22
-#define NFROMFD  23
-#define NHERE    24
-#define NXHERE   25
-#define NNOT     26
-#define N_NUMBER 27
+#define NFROMSTR 20
+#define NFROMTO  21
+#define NAPPEND  22
+#define NTOFD    23
+#define NFROMFD  24
+#define NHERE    25
+#define NXHERE   26
+#define NNOT     27
+#define N_NUMBER 28
 
 union node;
 
@@ -1619,6 +1620,7 @@ shcmd(union node *cmd, FILE *fp)
 #endif
                 case NTOFD:    s = ">&"; dftfd = 1; break;
                 case NFROM:    s = "<"; break;
+                case NFROMSTR: s = "<<<"; break;
                 case NFROMFD:  s = "<&"; break;
                 case NFROMTO:  s = "<>"; break;
                 default:       s = "*error*"; break;
@@ -5881,6 +5883,9 @@ cmdtxt(union node *n)
         case NXHERE:
                 p = "<<...";
                 goto dotail2;
+        case NFROMSTR:
+                p = "<<<";
+                goto dotail2;
         case NCASE:
                 cmdputs("case ");
                 cmdputs(n->ncase.expr->narg.text);
@@ -6371,26 +6376,11 @@ stoppedjobs(void)
  * data to a pipe.  If the document is short, we can stuff the data in
  * the pipe without forking.
  */
-/* openhere needs this forward reference */
-static void expandhere(union node *arg);
 static int
-openhere(union node *redir)
+write2pipe(int pip[2], const char *p, size_t len)
 {
-        char *p;
-        int pip[2];
-        size_t len = 0;
         IF_PLATFORM_MINGW32(struct forkshell fs);
 
-        if (pipe(pip) < 0)
-                ash_msg_and_raise_perror("can't create pipe");
-
-        p = redir->nhere.doc->narg.text;
-        if (redir->type == NXHERE) {
-                expandhere(redir->nhere.doc);
-                p = stackblock();
-        }
-
-        len = strlen(p);
         if (len <= PIPE_BUF) {
                 xwrite(pip[1], p, len);
                 goto out;
@@ -6421,6 +6411,42 @@ openhere(union node *redir)
         return pip[0];
 }
 
+/* openhere needs this forward reference */
+static void expandhere(union node *arg);
+static int
+openhere(union node *redir)
+{
+        char *p;
+        int pip[2];
+
+        if (pipe(pip) < 0)
+                ash_msg_and_raise_perror("can't create pipe");
+
+        p = redir->nhere.doc->narg.text;
+        if (redir->type == NXHERE) {
+                expandhere(redir->nhere.doc);
+                p = stackblock();
+        }
+
+        return write2pipe(pip, p, strlen(p));
+}
+
+static int
+openherestr(char *str)
+{
+        int pip[2];
+        size_t len;
+
+        if (pipe(pip) < 0)
+                ash_msg_and_raise_perror("can't create pipe");
+
+        len = strlen(str);
+        str[len] = '\n';
+        write2pipe(pip, str, len + 1);
+        str[len] = '\0';
+        return pip[0];
+}
+
 static int
 openredirect(union node *redir)
 {
@@ -6439,6 +6465,9 @@ openredirect(union node *redir)
                         lseek(f, 0, SEEK_END);
 #endif
                 break;
+        case NFROMSTR:
+                f = openherestr(redir->nfile.expfname);
+                break;
         case NFROMTO:
                 flags = O_RDWR|O_CREAT;
                 goto do_open;
@@ -10176,6 +10205,7 @@ calcsize(int funcblocksize, union node *n)
 #endif
         case NCLOBBER:
         case NFROM:
+        case NFROMSTR:
         case NFROMTO:
         case NAPPEND:
                 funcblocksize = calcsize(funcblocksize, n->nfile.fname);
@@ -10392,6 +10422,7 @@ copynode(union node *n)
 #endif
         case NCLOBBER:
         case NFROM:
+        case NFROMSTR:
         case NFROMTO:
         case NAPPEND:
                 new->nfile.fname = copynode(n->nfile.fname);
@@ -10929,6 +10960,7 @@ expredir(union node *n)
                 switch (redir->type) {
                 case NFROMTO:
                 case NFROM:
+                case NFROMSTR:
                 case NTO:
 #if BASH_REDIR_OUTPUT
                 case NTO2:
@@ -14306,6 +14338,11 @@ parseredir: {
                 c = pgetc_eatbnl();
                 switch (c) {
                 case '<':
+                        c = pgetc_eatbnl();
+                        if (c == '<') {
+                                np->type = NFROMSTR;
+                                break;
+                        }
                         if (sizeof(struct nfile) != sizeof(struct nhere)) {
                                 np = stzalloc(sizeof(struct nhere));
                                 /*np->nfile.fd = 0; - stzalloc did it */
@@ -14313,7 +14350,6 @@ parseredir: {
                         np->type = NHERE;
                         heredoc = stzalloc(sizeof(struct heredoc));
                         heredoc->here = np;
-                        c = pgetc_eatbnl();
                         if (c == '-') {
                                 heredoc->striptabs = 1;
                         } else {
@@ -16768,7 +16804,7 @@ forkshell_shellexec(struct forkshell *fs)
 {
         int idx = fs->fd[0];
         char **argv = fs->argv;
-        char *path = fs->path;
+        const char *path = fs->path;
 
         FORCEINTON;
         shellexec(argv[0], argv, path, idx, TRUE);
diff --git a/shell/ash_test/ash-heredoc/herestring1.right b/shell/ash_test/ash-heredoc/herestring1.right
new file mode 100644
index 000000000..555937daa
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/herestring1.right
@@ -0,0 +1,33 @@
+one
+_two
+\_three
+\_four
+\_two
+\_three
+\\_four
+two_newlines
+
+/bin/c*
+star_*
+star_*
+star_*
+star_\*
+star_*
+star_\*
+line1
+line2
+        line3
+line1
+line2
+        line3
+512
+256
+128
+64
+32
+16
+8
+4
+2
+v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+v-$a-\t-\-"-\x-`-\--\z-\*-\?-
diff --git a/shell/ash_test/ash-heredoc/herestring1.tests b/shell/ash_test/ash-heredoc/herestring1.tests
new file mode 100755
index 000000000..fb7bd0dda
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/herestring1.tests
@@ -0,0 +1,35 @@
+cat <<<one
+cat <<<\_two
+cat <<<"\_three"
+cat <<<'\_four'
+cat <<<\\_two
+cat <<<"\\_three"
+cat <<<'\\_four'
+
+cat <<<$'two_newlines\n'
+
+cat <<</bin/c*
+
+cat <<<star_*
+cat <<<star_\*
+cat <<<"star_*"
+cat <<<"star_\*"
+cat <<<'star_*'
+cat <<<'star_\*'
+
+var=$'line1
+line2
+        line3'
+
+cat <<<$var
+
+cat <<<"$var"
+
+i=10
+until test $((--i)) = 0; do
+        cat <<<$((2**i))
+done
+
+a=qwerty
+cat <<<`echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+cat <<<"`echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`"
diff --git a/shell/hush.c b/shell/hush.c
index 226a6d68f..da0db7948 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -683,6 +683,7 @@ struct command {
 # endif
 # define CMD_FUNCDEF 5
 #endif
+/* ^^^ if you change this, update CMDTYPE[] array too */
 
         smalluint cmd_exitcode;
         /* if non-NULL, this "command" is { list }, ( list ), or a compound statement */
@@ -3947,7 +3948,7 @@ static void debug_print_tree(struct pipe *pi, int lvl)
 # endif
 # if ENABLE_HUSH_CASE
                 [RES_CASE ] = "CASE" ,
-                [RES_CASE_IN] = "CASE_IN" ,
+                [RES_CASE_IN] = "CASE_IN",
                 [RES_MATCH] = "MATCH",
                 [RES_CASE_BODY] = "CASE_BODY",
                 [RES_ESAC ] = "ESAC" ,
@@ -3956,11 +3957,13 @@ static void debug_print_tree(struct pipe *pi, int lvl)
                 [RES_SNTX ] = "SNTX" ,
         };
         static const char *const CMDTYPE[] ALIGN_PTR = {
-                "{}",
-                "()",
-                "[noglob]",
+                "{}",       //CMD_NORMAL
+                "()",       //CMD_SUBSHELL
+                "[test2]",  //CMD_TEST2_SINGLEWORD_NOGLOB
+                "[noglob]", //CMD_SINGLEWORD_NOGLOB
 # if ENABLE_HUSH_FUNCTIONS
-                "func()",
+                "func()",   //CMD_FUNCTION_KWORD
+                "funcdef",  //CMD_FUNCDEF
 # endif
         };
 
@@ -12988,9 +12991,6 @@ static int FAST_FUNC builtin_alias(char **argv)
         }
 
         while (*++argv) {
-                /* The characters /, $, `, = and any of the shell
-                 * metacharacters or quoting characters
-                 * may not appear in an alias name */
                 char *eq = end_of_alias_name(*argv);
                 if (*eq == '=' && eq != *argv) {
                         /* alias NAME=VALUE */