 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.123 2020/08/29 10:41:12 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.124 2020/08/29 12:39:32 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.
 @@ -60,34 +60,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.123 2020/08/29 10:41:12 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.124 2020/08/29 12:39:32 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.123 2020/08/29 10:41:12 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.124 2020/08/29 12:39:32 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * dir.c --
  *	Directory searching using wildcards and/or normal names...
  *	Used both for source wildcarding in the Makefile and for finding
  *	implicit sources.
+ *
  * The interface for this module is:
  *	Dir_Init  	    Initialize the module.
+ *
 @@ -387,76 +387,55 @@ Dir_InitCur(const char *cdname)
 	    p->refCount += 1;
 	    if (cur && cur != p) {
 		/*
 		 * We've been here before, cleanup.
 		 */
 		cur->refCount -= 1;
 		Dir_Destroy(cur);
+	    }
 	    cur = p;
+	}
+    }
+}
-/*-
+/* (Re)initialize "dot" (current/object directory) path hash.
- *-----------------------------------------------------------------------
+ * Some directories may be opened. */
  * Dir_InitDot --
  *	(re)initialize "dot" (current/object directory) path hash
  * Results:
  *	none
  * Side Effects:
  *	some directories may be opened.
  *-----------------------------------------------------------------------
  */
 void
 Dir_InitDot(void)
+{
     if (dot != NULL) {
 	LstNode ln;
 	/* Remove old entry from openDirectories, but do not destroy. */
 	ln = Lst_Member(openDirectories, dot);
 	Lst_Remove(openDirectories, ln);
+    }
     dot = Dir_AddDir(NULL, ".");
     if (dot == NULL) {
 	Error("Cannot open `.' (%s)", strerror(errno));
 	exit(1);
+    }
     /*
      * We always need to have dot around, so we increment its reference count
      * to make sure it's not destroyed.
      */
     dot->refCount += 1;
     Dir_SetPATH();		/* initialize */
+}
-/*-
+/* Clean up things for this module. */
  *-----------------------------------------------------------------------
  * Dir_End --
  *	cleanup things for this module
  * Results:
  *	none
  * Side Effects:
  *	none
  *-----------------------------------------------------------------------
  */
 void
 Dir_End(void)
+{
 #ifdef CLEANUP
     if (cur) {
 	cur->refCount -= 1;
 	Dir_Destroy(cur);
+    }
     dot->refCount -= 1;
     dotLast->refCount -= 1;
     Dir_Destroy(dotLast);
     Dir_Destroy(dot);
     Dir_ClearPath(dirSearchPath);
 @@ -514,45 +493,38 @@ Dir_SetPATH(void)
+    }
     Lst_Close(dirSearchPath);
+}
 /* See if the Path 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)
+{
     return strcmp(((const Path *)p)->name, desiredName) == 0;
+}
-/*-
+/* See if the given name has any wildcard characters in it. Be careful not to
- *-----------------------------------------------------------------------
+ * expand unmatching brackets or braces.
  * Dir_HasWildcards  --
- *	see if the given name has any wildcard characters in it
+ * XXX: This code is not 100% correct ([^]] fails etc.). I really don't think
- *	be careful not to expand unmatching brackets or braces.
+ * that make(1) should be expanding patterns, because then you have to set a
- *	XXX: This code is not 100% correct. ([^]] fails etc.)
+ * mechanism for escaping the expansion!
  *	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
  * Side Effects:
  *	none
  *-----------------------------------------------------------------------
  */
 Boolean
 Dir_HasWildcards(char *name)
+{
     char *cp;
     int wild = 0, brace = 0, bracket = 0;
     for (cp = name; *cp; cp++) {
 	switch (*cp) {
 	case '{':
 	    brace++;
 	    wild = 1;
 	    break;