diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-04-16 02:32:12 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-04-16 02:32:12 +0000 |
| commit | 0edd2576c0e07f525c80e4aa5ff24350b55f18b7 (patch) | |
| tree | a8871301d693c6d33d43cd3171b1ee4783fec0e4 /bin | |
| parent | 010855174aaafbf3c0fee918f12e843089b58b6f (diff) | |
| parent | d1ad1a7394330d70efc2f2c58862a02dd8900acf (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/csh/Makefile | 2 | ||||
| -rw-r--r-- | bin/sh/Makefile | 6 | ||||
| -rw-r--r-- | bin/sh/parser.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index aa3b83becd166..6e3c32d407457 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -110,7 +110,7 @@ csh.1: tcsh.man build-tools: gethost -gethost: gethost.c sh.err.h tc.const.h sh.h +gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META} @rm -f ${.TARGET} ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ ${TCSHDIR}/gethost.c diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 419ff7915bf6e..d3422b43beff0 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -45,10 +45,10 @@ builtins.c builtins.h: mkbuiltins builtins.def # XXX this is just to stop the default .c rule being used, so that the # intermediate object has a fixed name. # XXX we have a default .c rule, but no default .o rule. -.o: +mknodes.o mksyntax.o: ${BUILD_TOOLS_META} ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} -mknodes: mknodes.o -mksyntax: mksyntax.o +mknodes: mknodes.o ${BUILD_TOOLS_META} +mksyntax: mksyntax.o ${BUILD_TOOLS_META} .ORDER: nodes.c nodes.h nodes.c nodes.h: mknodes nodetypes nodes.c.pat diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 3f9732cbbff30..e72a6f1c7e2ec 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -1616,7 +1616,6 @@ parsesub: { int flags; char *p; static const char types[] = "}-+?="; - int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ int linno; int length; int c1; @@ -1640,7 +1639,6 @@ parsesub: { subtype = VSNORMAL; flags = 0; if (c == '{') { - bracketed_name = 1; c = pgetc_linecont(); subtype = 0; } @@ -1665,7 +1663,7 @@ varname: flags |= VSLINENO; } } else if (is_digit(c)) { - if (bracketed_name) { + if (subtype != VSNORMAL) { do { STPUTC(c, out); c = pgetc_linecont(); |