Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conditional variable expression parsing (reported by cgd)

Browse Source
This commit is contained in:
christos 1998-09-18 20:35:11 +00:00
parent 1b24c735a6
commit 82ee767393
3 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
usr.bin/make/cond.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cond.c,v 1.10 1998/04/01 14:18:10 christos Exp $ */
/* $NetBSD: cond.c,v 1.11 1998/09/18 20:35:11 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: cond.c,v 1.10 1998/04/01 14:18:10 christos Exp $";
static char rcsid[] = "$NetBSD: cond.c,v 1.11 1998/09/18 20:35:11 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
__RCSID("$NetBSD: cond.c,v 1.10 1998/04/01 14:18:10 christos Exp $");
__RCSID("$NetBSD: cond.c,v 1.11 1998/09/18 20:35:11 christos Exp $");
#endif
#endif /* not lint */
#endif
@ -1071,44 +1071,48 @@ CondE(doEval)
*-----------------------------------------------------------------------
*/
int
Cond_EvalExpression(int dosetup, char *line, Boolean *value)
Cond_EvalExpression(dosetup, line, value, eprint)
int dosetup;
char *line;
Boolean *value;
int eprint;
{
if (dosetup) {
condDefProc = CondDoDefined;
condInvert = 0;
if (dosetup) {
condDefProc = CondDoDefined;
condInvert = 0;
}
while (*line == ' ' || *line == '\t')
line++;
condExpr = line;
condPushBack = None;
switch (CondE(TRUE)) {
case True:
if (CondToken(TRUE) == EndOfFile) {
*value = TRUE;
break;
}
while (*line == ' ' || *line == '\t') {
line++;
goto err;
/*FALLTHRU*/
case False:
if (CondToken(TRUE) == EndOfFile) {
*value = FALSE;
break;
}
condExpr = line;
condPushBack = None;
switch (CondE(TRUE)) {
case True:
if (CondToken(TRUE) == EndOfFile) {
*value = TRUE;
break;
}
goto err;
/*FALLTHRU*/
case False:
if (CondToken(TRUE) == EndOfFile) {
*value = FALSE;
break;
}
/*FALLTHRU*/
case Err:
/*FALLTHRU*/
case Err:
err:
Parse_Error (PARSE_FATAL, "Malformed conditional (%s)",
line);
return (COND_INVALID);
default:
break;
}
return COND_PARSE;
if (eprint)
Parse_Error (PARSE_FATAL, "Malformed conditional (%s)",
line);
return (COND_INVALID);
default:
break;
}
return COND_PARSE;
}
@ -1242,7 +1246,7 @@ Cond_Eval (line)
condInvert = ifp->doNot;
line += ifp->formlen;
if (Cond_EvalExpression(0, line, &value) == COND_INVALID)
if (Cond_EvalExpression(0, line, &value, 1) == COND_INVALID)
return COND_INVALID;
}
if (!isElse) {

4
usr.bin/make/nonints.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: nonints.h,v 1.16 1998/04/01 14:18:10 christos Exp $ */
/* $NetBSD: nonints.h,v 1.17 1998/09/18 20:35:11 christos Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@ -56,7 +56,7 @@ int Arch_IsLib __P((GNode *));
void Compat_Run __P((Lst));
/* cond.c */
int Cond_EvalExpression __P((int dosetup, char *line, Boolean *value));
int Cond_EvalExpression __P((int, char *, Boolean *, int));
int Cond_Eval __P((char *));
void Cond_End __P((void));

17
usr.bin/make/var.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.26 1998/04/03 04:07:15 cgd Exp $ */
/* $NetBSD: var.c,v 1.27 1998/09/18 20:35:12 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -39,14 +39,14 @@
*/
#ifdef MAKE_BOOTSTRAP
static char rcsid[] = "$NetBSD: var.c,v 1.26 1998/04/03 04:07:15 cgd Exp $";
static char rcsid[] = "$NetBSD: var.c,v 1.27 1998/09/18 20:35:12 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
__RCSID("$NetBSD: var.c,v 1.26 1998/04/03 04:07:15 cgd Exp $");
__RCSID("$NetBSD: var.c,v 1.27 1998/09/18 20:35:12 christos Exp $");
#endif
#endif /* not lint */
#endif
@ -1868,8 +1868,12 @@ Var_Parse (str, ctxt, err, lengthPtr, freePtr)
goto cleanup;
termc = *--cp;
if (Cond_EvalExpression(1, str, &value) == COND_INVALID)
delim = '\0';
if (Cond_EvalExpression(1, str, &value, 0) == COND_INVALID){
Error("Bad conditional expression `%s' in %s?%s:%s",
str, str, pattern.lhs, pattern.rhs);
goto cleanup;
}
if (value) {
newStr = pattern.lhs;
@ -2144,8 +2148,9 @@ cleanup:
*lengthPtr = cp - start + 1;
if (*freePtr)
free(str);
Error("Unclosed substitution for %s (%c missing)",
v->name, delim);
if (delim != '\0')
Error("Unclosed substitution for %s (%c missing)",
v->name, delim);
return (var_Error);
}