 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.415 2020/10/31 21:52:56 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.416 2020/10/31 23:01:23 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.415 2020/10/31 21:52:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.416 2020/10/31 23:01:23 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     Boolean fromForLoop;	/* simulated .include by the .for loop */
     int lineno;			/* current line number in file */
     int first_lineno;		/* line number of start of text */
     unsigned int cond_depth;	/* 'if' nesting when file opened */
     Boolean depending;		/* state of doing_depend on EOF */
 @@ -2356,27 +2356,27 @@ ParseSetParseFile(const char *filename)
 static void
 ParseTrackInput(const char *name)
+{
     void *fp = NULL;
     const char *old = Var_Value(MAKE_MAKEFILES, VAR_GLOBAL, &fp);
     if (old) {
 	size_t name_len = strlen(name);
 	const char *ep = old + strlen(old) - name_len;
 	/* does it contain name? */
 	for (; old != NULL; old = strchr(old, ' ')) {
 	    if (*old == ' ')
 		old++;
-	    if (old >= ep)
+	    if (old > ep)
 		break;		/* cannot contain name */
 	    if (memcmp(old, name, name_len) == 0 &&
 		(old[name_len] == '\0' || old[name_len] == ' '))
 		goto cleanup;
+	}
+    }
     Var_Append(MAKE_MAKEFILES, name, VAR_GLOBAL);
 cleanup:
     bmake_free(fp);
+}
 /* Start Parsing from the given source.

 @@ -1,33 +1,26 @@
-# $NetBSD: directive-include.mk,v 1.2 2020/10/31 22:55:35 rillig Exp $
+# $NetBSD: directive-include.mk,v 1.3 2020/10/31 23:01:23 rillig Exp $
+#
 # Tests for the .include directive, which includes another file.
 # TODO: Implementation
 .MAKEFLAGS: -dc
 # All included files are recorded in the variable .MAKE.MAKEFILES.
 # In this test, only the basenames of the files are compared since
 # the directories can differ.
 .include "/dev/null"
 .if ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null"
 .  error
 .endif
 # Each file is recorded only once in the variable .MAKE.MAKEFILES.
-# XXX: As of 2020-10-31, the very last file can be repeated, due to an
+# Between 2015-11-26 and 2020-10-31, the very last file could be repeated,
-# off-by-one bug in ParseTrackInput.
+# due to an off-by-one bug in ParseTrackInput.
 .include "/dev/null"
-.if ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null null"
+.if ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null"
 .  error
 .endif
 # Since the file /dev/null is not only recorded at the very end of the
 # variable .MAKE.MAKEFILES, it is not added a third time.
 .include "/dev/null"
 .if ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null null"
 .  error
 .endif
 all:
 	@:;

 @@ -1,7 +1,5 @@
 CondParser_Eval: ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null"
 lhs = "directive-include.mk null", rhs = "directive-include.mk null", op = !=
-CondParser_Eval: ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null null"
+CondParser_Eval: ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null"
-lhs = "directive-include.mk null null", rhs = "directive-include.mk null null", op = !=
+lhs = "directive-include.mk null", rhs = "directive-include.mk null", op = !=
 CondParser_Eval: ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null null"
 lhs = "directive-include.mk null null", rhs = "directive-include.mk null null", op = !=
 exit status 0