Module Name:    src
Committed By:   sjg
Date:           Tue May 10 00:02:31 UTC 2016

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

Log Message:
Apply realpath() to p before matching against metaIgnorePaths.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 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.54 src/usr.bin/make/meta.c:1.55
--- src/usr.bin/make/meta.c:1.54	Fri Mar 11 07:01:21 2016
+++ src/usr.bin/make/meta.c	Tue May 10 00:02:31 2016
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.55 2016/05/10 00:02:31 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -1205,14 +1205,16 @@ meta_oodate(GNode *gn, Boolean oodate)
 		     * be part of the dependencies because
 		     * they are _expected_ to change.
 		     */
-		    if (*p == '/' &&
-			Lst_ForEach(metaIgnorePaths, prefix_match, p)) {
+		    if (*p == '/') {
+			realpath(p, fname1); /* clean it up */
+			if (Lst_ForEach(metaIgnorePaths, prefix_match, fname1)) {
 #ifdef DEBUG_META_MODE
-			if (DEBUG(META))
-			    fprintf(debug_file, "meta_oodate: ignoring: %s\n",
-				    p);
+			    if (DEBUG(META))
+				fprintf(debug_file, "meta_oodate: ignoring: %s\n",
+					p);
 #endif
-			break;
+			    break;
+			}
 		    }
 
 		    /*

Reply via email to