 @@ -1,14 +1,14 @@
-/*      $NetBSD: meta.c,v 1.37 2015/04/01 01:03:55 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.38 2015/04/11 05:24:30 sjg Exp $ */
 /*
  * Implement 'meta' mode.
  * Adapted from John Birrell's patches to FreeBSD make.
  * --sjg
  */
 /*
  * Copyright (c) 2009-2010, Juniper Networks, Inc.
  * Portions Copyright (c) 2009, John Birrell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -838,56 +838,60 @@ string_match(const void *p, const void *
+{
     const char *p1 = p;
     const char *p2 = q;
     return strcmp(p1, p2);
+}
 /*
  * When running with 'meta' functionality, a target can be out-of-date
  * if any of the references in its meta data file is more recent.
  * We have to track the latestdir on a per-process basis.
  */
 #define LCWD_VNAME_FMT ".meta.%d.lcwd"
 #define LDIR_VNAME_FMT ".meta.%d.ldir"
 /*
  * It is possible that a .meta file is corrupted,
  * if we detect this we want to reproduce it.
  * Setting oodate TRUE will have that effect.
  */
 #define CHECK_VALID_META(p) if (!(p && *p)) { \
     warnx("%s: %d: malformed", fname, lineno); \
     oodate = TRUE; \
     continue; \
+    }
 #define DEQUOTE(p) if (*p == '\'') {	\
     char *ep; \
     p++; \
     if ((ep = strchr(p, '\''))) \
 	*ep = '\0'; \
+    }
 Boolean
 meta_oodate(GNode *gn, Boolean oodate)
+{
     static char *tmpdir = NULL;
     static char cwd[MAXPATHLEN];
     char lcwd_vname[64];
     char ldir_vname[64];
     char lcwd[MAXPATHLEN];
     char latestdir[MAXPATHLEN];
     char fname[MAXPATHLEN];
     char fname1[MAXPATHLEN];
     char fname2[MAXPATHLEN];
     char fname3[MAXPATHLEN];
     char *p;
     char *cp;
     char *link_src;
     char *move_target;
     static size_t cwdlen = 0;
     static size_t tmplen = 0;
     FILE *fp;
     Boolean needOODATE = FALSE;
     Lst missingFiles;
     if (oodate)
 	return oodate;		/* we're done */
 @@ -919,26 +923,28 @@ meta_oodate(GNode *gn, Boolean oodate)
 	LstNode ln;
 	struct stat fs;
 	if (!buf) {
 	    bufsz = 8 * BUFSIZ;
 	    buf = bmake_malloc(bufsz);
+	}
 	if (!cwdlen) {
 	    if (getcwd(cwd, sizeof(cwd)) == NULL)
 		err(1, "Could not get current working directory");
 	    cwdlen = strlen(cwd);
+	}
 	strlcpy(lcwd, cwd, sizeof(lcwd));
 	strlcpy(latestdir, cwd, sizeof(latestdir));
 	if (!tmpdir) {
 	    tmpdir = getTmpdir();
 	    tmplen = strlen(tmpdir);
+	}
 	/* we want to track all the .meta we read */
 	Var_Append(".MAKE.META.FILES", fname, VAR_GLOBAL);
 	ln = Lst_First(gn->commands);
 	while (!oodate && (x = fgetLine(&buf, &bufsz, 0, fp)) > 0) {
 	    lineno++;
 	    if (buf[x - 1] == '\n')
 @@ -1002,74 +1008,99 @@ meta_oodate(GNode *gn, Boolean oodate)
 		     * Each time we spot a different process ('pid')
 		     * we save the current value of 'latestdir' in a
 		     * variable qualified by 'lastpid', and
 		     * re-initialize 'latestdir' to any pre-saved
 		     * value for the current 'pid' and 'CWD' if none.
 		     */
 		    CHECK_VALID_META(p);
 		    pid = atoi(p);
 		    if (pid > 0 && pid != lastpid) {
 			char *ldir;
 			char *tp;
 			if (lastpid > 0) {
-			    /* We need to remember this. */
+			    /* We need to remember these. */
 			    Var_Set(lcwd_vname, lcwd, VAR_GLOBAL, 0);
 			    Var_Set(ldir_vname, latestdir, VAR_GLOBAL, 0);
+			}
 			snprintf(lcwd_vname, sizeof(lcwd_vname), LCWD_VNAME_FMT, pid);
 			snprintf(ldir_vname, sizeof(ldir_vname), LDIR_VNAME_FMT, pid);
 			lastpid = pid;
 			ldir = Var_Value(ldir_vname, VAR_GLOBAL, &tp);
 			if (ldir) {
 			    strlcpy(latestdir, ldir, sizeof(latestdir));
 			    if (tp)
 				free(tp);
 			} else
-			    strlcpy(latestdir, cwd, sizeof(latestdir));
+			ldir = Var_Value(lcwd_vname, VAR_GLOBAL, &tp);
 			if (ldir) {
 			    strlcpy(lcwd, ldir, sizeof(lcwd));
 			    if (tp)
 				free(tp);
+			}
+		    }
 		    /* Skip past the pid. */
 		    if (strsep(&p, " ") == NULL)
 			continue;
 #ifdef DEBUG_META_MODE
 		    if (DEBUG(META))
-			fprintf(debug_file, "%s: %d: cwd=%s ldir=%s\n", fname, lineno, cwd, latestdir);
+			    fprintf(debug_file, "%s: %d: %d: %c: cwd=%s lcwd=%s ldir=%s\n",
 				    fname, lineno,
 				    pid, buf[0], cwd, lcwd, latestdir);
 #endif
 		    break;
+		}
 		CHECK_VALID_META(p);
 		/* Process according to record type. */
 		switch (buf[0]) {
 		case 'X':		/* eXit */
 		    Var_Delete(lcwd_vname, VAR_GLOBAL);
 		    Var_Delete(ldir_vname, VAR_GLOBAL);
 		    lastpid = 0;	/* no need to save ldir_vname */
 		    break;
 		case 'F':		/* [v]Fork */
+		    {
 			char cldir[64];
 			int child;
 			child = atoi(p);
 			if (child > 0) {
 			    snprintf(cldir, sizeof(cldir), LCWD_VNAME_FMT, child);
 			    Var_Set(cldir, lcwd, VAR_GLOBAL, 0);
 			    snprintf(cldir, sizeof(cldir), LDIR_VNAME_FMT, child);
 			    Var_Set(cldir, latestdir, VAR_GLOBAL, 0);
 #ifdef DEBUG_META_MODE
 			    if (DEBUG(META))
 				    fprintf(debug_file, "%s: %d: %d: cwd=%s lcwd=%s ldir=%s\n",
 					    fname, lineno,
 					    child, cwd, lcwd, latestdir);
 #endif
+			}
+		    }
 		    break;
 		case 'C':		/* Chdir */
-		    /* Update the latest directory. */
+		    /* Update lcwd and latest directory. */
 		    strlcpy(latestdir, p, sizeof(latestdir));
 		    strlcpy(lcwd, p, sizeof(lcwd));
 		    Var_Set(lcwd_vname, lcwd, VAR_GLOBAL, 0);
 		    Var_Set(ldir_vname, lcwd, VAR_GLOBAL, 0);
 #ifdef DEBUG_META_MODE
 		    if (DEBUG(META))
 			fprintf(debug_file, "%s: %d: cwd=%s ldir=%s\n", fname, lineno, cwd, lcwd);
 #endif
 		    break;
 		case 'M':		/* renaMe */
 		    /*
 		     * For 'M'oves we want to check
 		     * the src as for 'R'ead
 		     * and the target as for 'W'rite.
 		     */
 		    cp = p;		/* save this for a second */
 		    /* now get target */
 		    if (strsep(&p, " ") == NULL)
 			continue;
 		    CHECK_VALID_META(p);
 @@ -1198,31 +1229,36 @@ meta_oodate(GNode *gn, Boolean oodate)
 			int sdx = 0;
 			int found = 0;
 			if (*p == '/') {
 			    sdirs[sdx++] = p; /* done */
 			} else {
 			    if (strcmp(".", p) == 0)
 				continue;  /* no point */
 			    /* Check vs latestdir */
 			    snprintf(fname1, sizeof(fname1), "%s/%s", latestdir, p);
 			    sdirs[sdx++] = fname1;
-			    if (strcmp(latestdir, cwd) != 0) {
+			    if (strcmp(latestdir, lcwd) != 0) {
-				/* Check vs cwd */
+				/* Check vs lcwd */
-				snprintf(fname2, sizeof(fname2), "%s/%s", cwd, p);
+				snprintf(fname2, sizeof(fname2), "%s/%s", lcwd, p);
 				sdirs[sdx++] = fname2;
+			    }
 			    if (strcmp(lcwd, cwd) != 0) {
 				/* Check vs cwd */
 				snprintf(fname3, sizeof(fname3), "%s/%s", cwd, p);
 				sdirs[sdx++] = fname3;
+			    }
+			}
 			sdirs[sdx++] = NULL;
 			for (sdp = sdirs; *sdp && !found; sdp++) {
 #ifdef DEBUG_META_MODE
 			    if (DEBUG(META))
 				fprintf(debug_file, "%s: %d: looking for: %s\n", fname, lineno, *sdp);
 #endif
 			    if (stat(*sdp, &fs) == 0) {
 				found = 1;
 				p = *sdp;
+			    }
+			}
 @@ -1241,26 +1277,30 @@ meta_oodate(GNode *gn, Boolean oodate)
 				realpath(p, latestdir);
+			    }
 			} else if (errno == ENOENT && *p == '/' &&
 				   strncmp(p, cwd, cwdlen) != 0) {
 			    /*
 			     * A referenced file outside of CWD is missing.
 			     * We cannot catch every eventuality here...
 			     */
 			    if (DEBUG(META))
 				fprintf(debug_file, "%s: %d: file '%s' may have moved?...\n", fname, lineno, p);
 			    oodate = TRUE;
+			}
+		    }
 		    if (buf[0] == 'E') {
 			/* previous latestdir is no longer relevant */
 			strlcpy(latestdir, lcwd, sizeof(latestdir));
+		    }
 		    break;
 		default:
 		    break;
+		}
 		if (!oodate && buf[0] == 'L' && link_src != NULL)
 		    goto check_link_src;
 	    } else if (strcmp(buf, "CMD") == 0) {
 		/*
 		 * Compare the current command with the one in the
 		 * meta data file.
 		 */
 		if (ln == NULL) {
 		    if (DEBUG(META))