diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1995-08-08 04:00:37 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1995-08-08 04:00:37 +0000 |
| commit | 1d6a79bc33c7430c06233ffc8bbe081ad3635fea (patch) | |
| tree | c0237573a48aa1380d8729841d3270822c839a48 /usr.bin/make/parse.c | |
| parent | 90a2b819e31b3ef89db07412cf352a49e1d21c53 (diff) | |
Notes
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 27b3ff73a806..a56e398d785e 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -193,7 +193,6 @@ static struct { } parseKeywords[] = { { ".BEGIN", Begin, 0 }, { ".DEFAULT", Default, 0 }, -{ ".OPTIONAL", Attribute, OP_OPTIONAL }, { ".END", End, 0 }, { ".EXEC", Attribute, OP_EXEC }, { ".IGNORE", Ignore, OP_IGNORE }, @@ -209,6 +208,7 @@ static struct { { ".NOTMAIN", Attribute, OP_NOTMAIN }, { ".NOTPARALLEL", NotParallel, 0 }, { ".NULL", Null, 0 }, +{ ".OPTIONAL", Attribute, OP_OPTIONAL }, { ".ORDER", Order, 0 }, { ".PATH", ExPath, 0 }, { ".PRECIOUS", Precious, OP_PRECIOUS }, @@ -2256,8 +2256,8 @@ test_char: ep = line; while (*ep) ++ep; - while (ep > line && (ep[-1] == ' ' || ep[-1] == '\t')) { - if (ep > line + 1 && ep[-2] == '\\') + while (ep > line + 1 && (ep[-1] == ' ' || ep[-1] == '\t')) { + if (ep[-2] == '\\') break; --ep; } @@ -2437,6 +2437,7 @@ Parse_File(name, stream) } #ifdef SYSVINCLUDE } else if (strncmp (line, "include", 7) == 0 && + isspace(line[7]) && strchr(line, ':') == NULL) { /* * It's an S3/S5-style "include". |