diff options
| author | Joerg Wunsch <joerg@FreeBSD.org> | 1996-02-03 13:27:55 +0000 |
|---|---|---|
| committer | Joerg Wunsch <joerg@FreeBSD.org> | 1996-02-03 13:27:55 +0000 |
| commit | 0f9a5351247dd226ded96d9d0f2f5373095b4c0b (patch) | |
| tree | 32ae361f1a2963e8e82aa2e47ec7b2a0e52cbc4c /bin | |
| parent | 5bf1814b0e6c24f54c330879709617bd1174db27 (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/Makefile | 5 | ||||
| -rw-r--r-- | bin/sh/parser.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile index ae285c9769ab..b52b94d19791 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $Id: Makefile,v 1.7 1994/10/02 01:36:03 ache Exp $ +# $Id: Makefile,v 1.8 1995/08/27 20:26:40 joerg Exp $ PROG= sh SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \ @@ -23,6 +23,9 @@ CLEANFILES+=\ token.def: mktokens sh ${.CURDIR}/mktokens +${.CURDIR}/builtins: + # just override the default rule + builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins cd ${.CURDIR}; sh mkbuiltins diff --git a/bin/sh/parser.c b/bin/sh/parser.c index c8ea3765b2e5..ef9c40c64020 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parser.c,v 1.9 1995/08/28 19:24:35 joerg Exp $ + * $Id: parser.c,v 1.10 1995/12/10 17:59:23 joerg Exp $ */ #ifndef lint @@ -149,12 +149,12 @@ list(nlflag) { n1 = andor(); for (;;) { switch (readtoken()) { + case TBACKGND: case TNL: parseheredoc(); if (nlflag) return n1; /* fall through */ - case TBACKGND: case TSEMI: checkkwd = 2; if (tokendlist[peektoken()]) |