diff options
| author | hoek <hoek@FreeBSD.org> | 1999-08-12 13:30:08 +0000 |
|---|---|---|
| committer | hoek <hoek@FreeBSD.org> | 1999-08-12 13:30:08 +0000 |
| commit | a3c71888d57c17eeaa86a8573b21564c8709346a (patch) | |
| tree | 6da09e056b67d53bc0fb295d9e3965823fcd5890 /usr.bin | |
| parent | 0740e2b138cfca2e649c43448d5133a7662d29fa (diff) | |
| download | FreeBSD-src-a3c71888d57c17eeaa86a8573b21564c8709346a.zip FreeBSD-src-a3c71888d57c17eeaa86a8573b21564c8709346a.tar.gz | |
Bugfix to last commit: Correctly intuit when an lhs is a string vs. number.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/make/cond.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c index ddb62f6..5eb420e 100644 --- a/usr.bin/make/cond.c +++ b/usr.bin/make/cond.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cond.c,v 1.7 1997/02/22 19:27:07 peter Exp $ + * $Id: cond.c,v 1.8 1999/05/25 13:45:08 hoek Exp $ */ #ifndef lint @@ -707,7 +707,8 @@ do_string_compare: condExpr += len; } } else { - if (CondCvtArg(rhs, &right) == rhs) + char *c = CondCvtArg(rhs, &right); + if (*c != '\0' && !isspace(*c)) goto do_string_compare; if (rhs == condExpr) { /* |
