 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.172 2020/10/22 05:50:02 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.173 2020/10/24 09:18:09 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 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.
 @@ -125,27 +125,27 @@
  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 /*	"@(#)dir.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: dir.c,v 1.172 2020/10/22 05:50:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.173 2020/10/24 09:18:09 rillig Exp $");
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
 #define DIR_DEBUG2(fmt, arg1, arg2) DEBUG2(DIR, fmt, arg1, arg2)
 /*
  *	A search path consists of a list of CachedDir structures. A CachedDir
  *	has in it the name of the directory and a hash table of all the files
  *	in the directory. This is used to cut down on the number of system
  *	calls necessary to find implicit dependents and their like. Since
  *	these searches are made before any actions are taken, we need not
  *	worry about the directory changing due to creation commands. If this
  *	hampers the style of some makefiles, they must be changed.
 @@ -517,36 +517,26 @@ Dir_SetPATH(void)
 	if (dir == dot && hasLastDot)
 	    continue;
 	Var_Append(".PATH", dir->name, VAR_GLOBAL);
+    }
     if (hasLastDot) {
 	if (dot)
 	    Var_Append(".PATH", dot->name, VAR_GLOBAL);
 	if (cur)
 	    Var_Append(".PATH", cur->name, VAR_GLOBAL);
+    }
+}
 /* See if the CachedDir structure describes the same directory as the
  * given one by comparing their names. Called from Dir_AddDir via
  * Lst_Find when searching the list of open directories. */
 static Boolean
 DirFindName(const void *p, const void *desiredName)
     const CachedDir *dir = p;
     return strcmp(dir->name, desiredName) == 0;
 /* See if the given name has any wildcard characters in it. Be careful not to
  * expand unmatching brackets or braces.
+ *
  * XXX: This code is not 100% correct ([^]] fails etc.). I really don't think
  * that make(1) should be expanding patterns, because then you have to set a
  * mechanism for escaping the expansion!
+ *
  * Input:
  *	name		name to check
+ *
  * Results:
  *	returns TRUE if the word should be expanded, FALSE otherwise
  */
 @@ -1498,29 +1488,33 @@ Dir_MTime(GNode *gn, Boolean recheck)
  *			added, or NULL to only add the directory to
  *			openDirectories
  *	name		The name of the directory to add.
  *			The name is not normalized in any way.
  */
 CachedDir *
 Dir_AddDir(SearchPath *path, const char *name)
+{
     CachedDir *dir = NULL;	/* the added directory */
     DIR *d;
     struct dirent *dp;
     if (path != NULL && strcmp(name, ".DOTLAST") == 0) {
-	SearchPathNode *ln = Lst_Find(path, DirFindName, name);
+	SearchPathNode *ln;
 	if (ln != NULL)
-	    return ln->datum;
+	for (ln = path->first; ln != NULL; ln = ln->next) {
 	    CachedDir *pathDir = ln->datum;
 	    if (strcmp(pathDir->name, name) == 0)
 		return pathDir;
+	}
 	dotLast->refCount++;
 	Lst_Prepend(path, dotLast);
+    }
     if (path != NULL)
 	dir = OpenDirs_Find(&openDirs, name);
     if (dir != NULL) {
 	if (Lst_FindDatum(path, dir) == NULL) {
 	    dir->refCount++;
 	    Lst_Append(path, dir);
+	}
 	return dir;