diff options
| author |   deraadt <deraadt@openbsd.org> | 2008-03-22 22:35:15 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2008-03-22 22:35:15 +0000 |
| commit | decd1fd68d6584a4a244723912dd0f1d46acb2a7 (patch) | |
| tree | f29012a5e11b9a094873e294b4b620ad3d3dfb2f | |
| parent | put in explicit suffix rules, they're needed anyways since $< is only used (diff) | |
| download | wireguard-openbsd-decd1fd68d6584a4a244723912dd0f1d46acb2a7.tar.xz wireguard-openbsd-decd1fd68d6584a4a244723912dd0f1d46acb2a7.zip | |
spaces found reading that diff
| -rw-r--r-- | usr.sbin/config/files.c | 4 | ||||
| -rw-r--r-- | usr.sbin/config/gram.y | 4 | ||||
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c index 02b8da6037d..79700551e4d 100644 --- a/usr.sbin/config/files.c +++ b/usr.sbin/config/files.c @@ -1,4 +1,4 @@ -/* $OpenBSD: files.c,v 1.15 2007/11/25 08:26:59 deraadt Exp $ */ +/* $OpenBSD: files.c,v 1.16 2008/03/22 22:35:15 deraadt Exp $ */ /* $NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $ */ /* @@ -126,7 +126,7 @@ addfile(struct nvlist *nvpath, struct nvlist *optx, int flags, const char *rule, * Ensure all tailnames are identical, because .o * filenames must be identical too. */ - if (tail1 && + if (tail1 && (dotp - tail != dotp1 - tail1 || strncmp(tail1, tail, dotp - tail))) error("different production from %s %s", diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y index dfc219c393a..265fd011b30 100644 --- a/usr.sbin/config/gram.y +++ b/usr.sbin/config/gram.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: gram.y,v 1.20 2007/11/25 08:26:59 deraadt Exp $ */ +/* $OpenBSD: gram.y,v 1.21 2008/03/22 22:35:15 deraadt Exp $ */ /* $NetBSD: gram.y,v 1.14 1997/02/02 21:12:32 thorpej Exp $ */ /* @@ -96,7 +96,7 @@ static void check_maxpart(void); int val; } -%token AND AT ATTACH BUILD COMPILE_WITH LINT_WITH CONFIG DEFINE DEFOPT +%token AND AT ATTACH BUILD COMPILE_WITH LINT_WITH CONFIG DEFINE DEFOPT %token DEVICE DISABLE %token DUMPS ENDFILE XFILE XOBJECT FLAGS INCLUDE XMACHINE MAJOR MAKEOPTIONS %token MAXUSERS MAXPARTITIONS MINOR ON OPTIONS PSEUDO_DEVICE ROOT SOURCE SWAP diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 7f77bdc09fd..8a824f58e63 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkmakefile.c,v 1.28 2008/03/22 22:30:36 espie Exp $ */ +/* $OpenBSD: mkmakefile.c,v 1.29 2008/03/22 22:35:15 deraadt Exp $ */ /* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */ /* @@ -498,10 +498,10 @@ emitrules(FILE *fp) if (fi->fi_mkrule[0] || fi->fi_mkrule[1]) { if (emit_1rule(fp, fi, fpath, ".o", 0) || emit_1rule(fp, fi, fpath, ".ln", 1)) - return (1); + return (1); /* simple default rule */ } else { - if (fprintf(fp, "%s.o %s.ln: %s%s\n", fi->fi_base, + if (fprintf(fp, "%s.o %s.ln: %s%s\n", fi->fi_base, fi->fi_base, *fpath != '/' ? "$S/" : "", fpath) < 0) return (1); |