CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:    src
Committed By:   sjg
Date:           Wed Dec 15 23:03:36 UTC 2010

Modified Files:
        src/usr.bin/make: meta.c

Log Message:
Invalidate meta_fname when we finish a job, so that in compat
mode, we do not report a previous .meta file as being involved
in an error.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/meta.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.5 src/usr.bin/make/meta.c:1.6
--- src/usr.bin/make/meta.c:1.5	Thu Dec  9 22:30:17 2010
+++ src/usr.bin/make/meta.c	Wed Dec 15 23:03:35 2010
@@ -574,7 +574,7 @@
     }
     getcwd(cwd, sizeof(cwd));
     Var_Set(".ERROR_CWD", cwd, VAR_GLOBAL, 0);
-    if (pbm) {
+    if (pbm && pbm->meta_fname[0]) {
 	Var_Set(".ERROR_META_FILE", pbm->meta_fname, VAR_GLOBAL, 0);
     }
 }
@@ -644,6 +644,7 @@
 	meta_cmd_finish(pbm);
 	fclose(pbm->mfp);
 	pbm->mfp = NULL;
+	pbm->meta_fname[0] = '\0';
     }
 }