diff options
| author | ache <ache@FreeBSD.org> | 1995-06-18 12:34:14 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-06-18 12:34:14 +0000 |
| commit | 5b84039fb3ea9614bccce9c2e800251228ab7e7c (patch) | |
| tree | 91257bccf4dda92d8334ba4a74af5a2241987117 /usr.bin/make/parse.c | |
| parent | 1c7c56a93b2ee67dd860c2b2c4f4b9a918a538de (diff) | |
| download | FreeBSD-src-5b84039fb3ea9614bccce9c2e800251228ab7e7c.zip FreeBSD-src-5b84039fb3ea9614bccce9c2e800251228ab7e7c.tar.gz | |
NetBSD fixes: declare more prototypes, move .OPTIONAL in alphabet
order, prevent suffix rule, if direct or children dependances exists,
forget to free v->name in var.c
My fixes: fix famous ^\t\n bug, correct free order in str_end
Reviewed by: bde
Obtained from: NetBSD, me
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 27b3ff7..2263a52 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 }, @@ -2259,6 +2259,8 @@ test_char: while (ep > line && (ep[-1] == ' ' || ep[-1] == '\t')) { if (ep > line + 1 && ep[-2] == '\\') break; + if (ep == line + 1 && ep[-1] == '\t') + break; --ep; } *ep = 0; |
