diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-25 20:10:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-25 20:10:41 +0000 |
| commit | e78fef215b8724ded934dd093c3e550a6c86fd5b (patch) | |
| tree | 80731a07cf5c2d1ae51901d2f6be99c06805c505 /usr.sbin | |
| parent | c78b2f5babda7f4d0842ccf526eaac953a053865 (diff) | |
correct pathname variable matching, and also support ${MACHINE}
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/config/mkmakefile.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 989838eeaf8..0c9cd3bfa44 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkmakefile.c,v 1.22 2007/11/25 08:26:59 deraadt Exp $ */ +/* $OpenBSD: mkmakefile.c,v 1.23 2007/11/25 20:10:40 deraadt Exp $ */ /* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */ /* @@ -153,6 +153,7 @@ srcpath(struct files *fi) #if 1 /* Always have source, don't support object dirs for kernel builds. */ struct nvlist *nv, *nv1; + const char *var; char *source; /* Search path list for files we will want to use */ @@ -167,6 +168,7 @@ srcpath(struct files *fi) s = strchr(nv->nv_name, '$'); if (s) { char *expand; + size_t len; /* Search for a ${name} to expand */ if (s[1] != '{') @@ -174,13 +176,21 @@ srcpath(struct files *fi) e = strchr(s + 2, '}'); if (!e) error("}"); - if (strncmp(s + 2, "MACHINE_ARCH", - strlen("MACHINE_ARCH")) != 0) + + len = e - s - 2; + if (strlen("MACHINE_ARCH") == len && + bcmp(s + 2, "MACHINE_ARCH", len) == 0) + var = machinearch ? machinearch : machine; + else if (strlen("MACHINE") == len && + bcmp(s + 2, "MACHINE", len) == 0) + var = machine; + else error("variable %*.*s not supported", e - s - 2, e - s - 2, s + 2); + asprintf(&expand, "%*.*s%s%s", s - nv->nv_name, s - nv->nv_name, nv->nv_name, - machinearch ? machinearch : machine, e + 1); + var, e + 1); source = sourcepath(expand); free(expand); } else |