Module Name: src
Committed By: rillig
Date: Thu Sep 10 23:27:27 UTC 2020
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): skip redundant condExpr-- in CondGetString
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.118 src/usr.bin/make/cond.c:1.119
--- src/usr.bin/make/cond.c:1.118 Thu Sep 10 22:47:22 2020
+++ src/usr.bin/make/cond.c Thu Sep 10 23:27:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.118 2020/09/10 22:47:22 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.119 2020/09/10 23:27:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.118 2020/09/10 22:47:22 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.119 2020/09/10 23:27:27 rillig 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.118 2020/09/10 22:47:22 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.119 2020/09/10 23:27:27 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -415,22 +415,23 @@ CondGetString(CondLexer *lex, Boolean do
*quoted = qt = *lex->condExpr == '"' ? 1 : 0;
if (qt)
lex->condExpr++;
- for (start = lex->condExpr;
- *lex->condExpr && str == NULL; lex->condExpr++) {
+ for (start = lex->condExpr; *lex->condExpr && str == NULL;) {
switch (*lex->condExpr) {
case '\\':
if (lex->condExpr[1] != '\0') {
lex->condExpr++;
Buf_AddByte(&buf, *lex->condExpr);
}
- break;
+ lex->condExpr++;
+ continue;
case '"':
if (qt) {
lex->condExpr++; /* we don't want the quotes */
goto got_str;
} else
Buf_AddByte(&buf, *lex->condExpr); /* likely? */
- break;
+ lex->condExpr++;
+ continue;
case ')':
case '!':
case '=':
@@ -442,7 +443,8 @@ CondGetString(CondLexer *lex, Boolean do
goto got_str;
else
Buf_AddByte(&buf, *lex->condExpr);
- break;
+ lex->condExpr++;
+ continue;
case '$':
/* if we are in quotes, then an undefined variable is ok */
eflags = ((!qt && doEval) ? VARE_UNDEFERR : 0) |
@@ -479,8 +481,7 @@ CondGetString(CondLexer *lex, Boolean do
*freeIt = NULL;
}
str = NULL; /* not finished yet */
- lex->condExpr--; /* don't skip over next char */
- break;
+ continue;
default:
if (strictLHS && !qt && *start != '$' &&
!isdigit((unsigned char)*start)) {
@@ -493,7 +494,8 @@ CondGetString(CondLexer *lex, Boolean do
goto cleanup;
}
Buf_AddByte(&buf, *lex->condExpr);
- break;
+ lex->condExpr++;
+ continue;
}
}
got_str:
