summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2020-11-23 13:52:27 +0000
committerrillig <rillig@NetBSD.org>2020-11-23 13:52:27 +0000
commitfa5084df2be01446b3b2fbec48a4f7ebc13647a0 (patch)
tree5641cdbcce92c91af941960e2530fc1ff6108f2b
parentdcbe66e1404881c8033ce9ee694f373418e7aee2 (diff)
make(1): fix DEBUG_SRC logging in FindThem
The node is also removed from the list if it is neither found in the nodes nor in the file system. The logging did not reflect this.
-rw-r--r--usr.bin/make/suff.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 01c2291a7d4..c7014ceabfd 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.303 2020/11/22 22:58:43 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.304 2020/11/23 13:52:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.303 2020/11/22 22:58:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.304 2020/11/23 13:52:27 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -1065,6 +1065,9 @@ FindThem(CandidateList *srcs, CandidateSearcher *cs)
while (!Lst_IsEmpty(srcs)) {
Candidate *src = Lst_Dequeue(srcs);
+#ifdef DEBUG_SRC
+ debug_printf("remove from list %p src %p:%s\n", srcs, src, src->file);
+#endif
SUFF_DEBUG1("\ttrying %s...", src->file);
/*
@@ -1072,10 +1075,6 @@ FindThem(CandidateList *srcs, CandidateSearcher *cs)
* graph for it or the file actually exists.
*/
if (Targ_FindNode(src->file) != NULL) {
-#ifdef DEBUG_SRC
- debug_printf("remove from list %p src %p:%s\n",
- srcs, src, src->file);
-#endif
retsrc = src;
break;
}
@@ -1084,10 +1083,6 @@ FindThem(CandidateList *srcs, CandidateSearcher *cs)
char *file = Dir_FindFile(src->file, src->suff->searchPath);
if (file != NULL) {
retsrc = src;
-#ifdef DEBUG_SRC
- debug_printf("remove from list %p src %p:%s\n",
- srcs, src, src->file);
-#endif
free(file);
break;
}