|
 |
ebf9b31 |
diff -up ksh-20120801/src/cmd/ksh93/sh/lex.c.heresub ksh-20120801/src/cmd/ksh93/sh/lex.c
|
|
|
ebf9b31 |
--- ksh-20120801/src/cmd/ksh93/sh/lex.c.heresub 2014-05-21 16:48:42.635700984 +0200
|
|
|
ebf9b31 |
+++ ksh-20120801/src/cmd/ksh93/sh/lex.c 2014-05-21 16:48:42.678700772 +0200
|
|
|
ebf9b31 |
@@ -1557,6 +1557,7 @@ static int comsub(register Lex_t *lp, in
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
register int n,c,count=1;
|
|
|
ebf9b31 |
register int line=lp->sh->inlineno;
|
|
|
ebf9b31 |
+ struct ionod *inheredoc = lp->heredoc;
|
|
|
ebf9b31 |
char *first,*cp=fcseek(0),word[5];
|
|
|
ebf9b31 |
int off, messages=0, assignok=lp->assignok, csub;
|
|
|
ebf9b31 |
struct lexstate save;
|
|
|
ebf9b31 |
@@ -1683,7 +1684,7 @@ done:
|
|
|
ebf9b31 |
lp->lexd.dolparen--;
|
|
|
ebf9b31 |
lp->lex = save;
|
|
|
ebf9b31 |
lp->assignok = (endchar(lp)==RBRACT?assignok:0);
|
|
|
ebf9b31 |
- if(lp->heredoc)
|
|
|
ebf9b31 |
+ if(lp->heredoc && !inheredoc)
|
|
|
ebf9b31 |
errormsg(SH_DICT,ERROR_exit(SYNBAD),e_lexsyntax5,lp->sh->inlineno,lp->heredoc->ioname);
|
|
|
ebf9b31 |
return(messages);
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
diff -up ksh-20120801/src/cmd/ksh93/sh/macro.c.heresub ksh-20120801/src/cmd/ksh93/sh/macro.c
|
|
|
ebf9b31 |
--- ksh-20120801/src/cmd/ksh93/sh/macro.c.heresub 2014-05-21 16:48:42.650700910 +0200
|
|
|
ebf9b31 |
+++ ksh-20120801/src/cmd/ksh93/sh/macro.c 2014-05-21 16:48:42.678700772 +0200
|
|
|
ebf9b31 |
@@ -2085,7 +2085,7 @@ static void comsubst(Mac_t *mp,register
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
sfputc(stkp,c);
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
- sfputc(stkp,' ');
|
|
|
ebf9b31 |
+ sfputc(stkp,'\n');
|
|
|
ebf9b31 |
c = stktell(stkp);
|
|
|
ebf9b31 |
str=stkfreeze(stkp,1);
|
|
|
ebf9b31 |
/* disable verbose and don't save in history file */
|