Sat Nov 14 19:36:31 2020 UTC ()

make(1): inline local variable in Dir_UpdateMTime

Now that the signature of cached_stats is cleaned up, the line is short
enough to contain the whole condition.


(rillig)

diff -r1.208 -r1.209 src/usr.bin/make/dir.c

--- src/usr.bin/make/dir.c 2020/11/14 19:24:24	1.208
+++ src/usr.bin/make/dir.c 2020/11/14 19:36:31	1.209

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dir.c,v 1.208 2020/11/14 19:24:24 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.209 2020/11/14 19:36:31 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.
 @@ -124,27 +124,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.208 2020/11/14 19:24:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.209 2020/11/14 19:36:31 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.
+ *
 @@ -1269,27 +1269,26 @@ Dir_FindHereOrAbove(const char *here, co
     free(dirbase);
     return NULL;
+}
 /* Search gn along dirSearchPath and store its modification time in gn->mtime.
  * If no file is found, store 0 instead.
+ *
  * The found file is stored in gn->path, unless the node already had a path. */
 void
 Dir_UpdateMTime(GNode *gn, Boolean recheck)
+{
     char *fullName;
     struct cached_stat cst;
     CachedStatsFlags flags;
     if (gn->type & OP_ARCHV) {
 	Arch_UpdateMTime(gn);
 	return;
+    }
     if (gn->type & OP_PHONY) {
 	gn->mtime = 0;
 	return;
+    }
     if (gn->path == NULL) {
 	if (gn->type & OP_NOPATH)
 @@ -1324,28 +1323,27 @@ Dir_UpdateMTime(GNode *gn, Boolean reche
+		    }
+		}
+	    }
 	    DIR_DEBUG2("Found '%s' as '%s'\n",
 		       gn->name, fullName ? fullName : "(not found)");
+	}
     } else {
 	fullName = gn->path;
+    }
     if (fullName == NULL)
 	fullName = bmake_strdup(gn->name);
-    flags = recheck ? CST_UPDATE : CST_NONE;
+    if (cached_stats(fullName, &cst, recheck ? CST_UPDATE : CST_NONE) < 0) {
     if (cached_stats(fullName, &cst, flags) < 0) {
 	if (gn->type & OP_MEMBER) {
 	    if (fullName != gn->path)
 		free(fullName);
 	    Arch_UpdateMemberMTime(gn);
 	    return;
+	}
 	cst.cst_mtime = 0;
+    }
     if (fullName != NULL && gn->path == NULL)
 	gn->path = fullName;