 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.243 2020/11/30 18:49:58 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.244 2020/11/30 20:17:00 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.
 @@ -126,27 +126,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.243 2020/11/30 18:49:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.244 2020/11/30 20:17:00 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 is a list of CachedDir structures. A CachedDir has in it the
  * name of the directory and the names 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.
+ *
 @@ -257,28 +257,30 @@ typedef enum CachedStatsFlags {
 SearchPath dirSearchPath = LST_INIT;	/* main search path */
 static OpenDirs openDirs;	/* all cached directories */
 /*
  * Variables for gathering statistics on the efficiency of the caching
  * mechanism.
  */
 static int hits;		/* Found in directory cache */
 static int misses;		/* Sad, but not evil misses */
 static int nearmisses;		/* Found under search path */
 static int bigmisses;		/* Sought by itself */
-static CachedDir *dot = NULL;	/* contents of current directory */
+/* The cached contents of ".", the relative current directory. */
-static CachedDir *cur = NULL;	/* contents of current directory, if not dot */
+static CachedDir *dot = NULL;
 /* The cached contents of the absolute current directory. */
 static CachedDir *cur = NULL;
 /* A fake path entry indicating we need to look for '.' last. */
 static CachedDir *dotLast = NULL;
 /* Results of doing a last-resort stat in Dir_FindFile -- if we have to go to
  * the system to find the file, we might as well have its mtime on record.
+ *
  * XXX: If this is done way early, there's a chance other rules will have
  * already updated the file, in which case we'll update it again. Generally,
  * there won't be two rules to update a single file, so this should be ok,
  * but... */
 static HashTable mtimes;
 static HashTable lmtimes;	/* same as mtimes but for lstat */
 @@ -1057,27 +1059,27 @@ char *
 Dir_FindFile(const char *name, SearchPath *path)
+{
 	char *file;		/* the current filename to check */
 	const char *base;	/* Terminal name of file */
 	Boolean hasLastDot = FALSE; /* true if we should search dot last */
 	Boolean hasSlash;	/* true if 'name' contains a / */
 	struct cached_stat cst;	/* Buffer for stat, if necessary */
 	const char *trailing_dot = ".";
 	/*
 	 * Find the final component of the name and note whether it has a
 	 * slash in it (the name, I mean)
 	 */
-	base = strrchr(name, '/');
+	base = strrchr(name, '/'); /* XXX: confusing variable name */
 	if (base != NULL) {
 		hasSlash = TRUE;
 		base++;
 	} else {
 		hasSlash = FALSE;
 		base = name;
+	}
 	DIR_DEBUG1("Searching for %s ...", name);
 	if (path == NULL) {
 		DIR_DEBUG0("couldn't open path, file not found\n");
 		misses++;