Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make Handle missing file for Read the same as for Wr...



details:   https://anonhg.NetBSD.org/src/rev/fb0069161af9
branches:  trunk
changeset: 344038:fb0069161af9
user:      sjg <sjg%NetBSD.org@localhost>
date:      Fri Mar 11 07:01:21 2016 +0000

description:
Handle missing file for Read the same as for Write, since if it
is Deleted we don't care.

Patch from Bryan Drewery.

diffstat:

 usr.bin/make/meta.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 03a1dd70a9ca -r fb0069161af9 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Fri Mar 11 05:02:32 2016 +0000
+++ b/usr.bin/make/meta.c       Fri Mar 11 07:01:21 2016 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.53 2016/03/07 21:45:43 christos Exp $ */
+/*      $NetBSD: meta.c,v 1.54 2016/03/11 07:01:21 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -1186,7 +1186,8 @@
 
                    if ((link_src != NULL && lstat(p, &fs) < 0) ||
                        (link_src == NULL && stat(p, &fs) < 0)) {
-                       Lst_AtEnd(missingFiles, bmake_strdup(p));
+                       if (Lst_Find(missingFiles, p, string_match) == NULL)
+                               Lst_AtEnd(missingFiles, bmake_strdup(p));
                    }
                    break;
                check_link_src:
@@ -1277,9 +1278,8 @@
                             * 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 (Lst_Find(missingFiles, p, string_match) == NULL)
+                                   Lst_AtEnd(missingFiles, bmake_strdup(p));
                        }
                    }
                    if (buf[0] == 'E') {



Home | Main Index | Thread Index | Old Index