Module Name: src
Committed By: rillig
Date: Mon Sep 14 16:05:09 UTC 2020
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make(1): split complicated condition in ParseDoDependency
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/usr.bin/make/parse.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/parse.c
diff -u src/usr.bin/make/parse.c:1.307 src/usr.bin/make/parse.c:1.308
--- src/usr.bin/make/parse.c:1.307 Mon Sep 14 15:11:13 2020
+++ src/usr.bin/make/parse.c Mon Sep 14 16:05:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.307 2020/09/14 15:11:13 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.308 2020/09/14 16:05:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.307 2020/09/14 15:11:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.308 2020/09/14 16:05:09 rillig Exp $");
/* types and constants */
@@ -1140,9 +1140,11 @@ ParseDoDependency(char *line)
*/
/* Find the end of the next word. */
- for (cp = line; *cp && (ParseIsEscaped(lstart, cp) ||
- !(ch_isspace(*cp) ||
- *cp == '!' || *cp == ':' || *cp == LPAREN));) {
+ for (cp = line; *cp != '\0';) {
+ if (!ParseIsEscaped(lstart, cp) &&
+ (ch_isspace(*cp) || *cp == '!' || *cp == ':' || *cp == LPAREN))
+ break;
+
if (*cp == '$') {
/*
* Must be a dynamic source (would have been expanded
