Changeset 2741 in kBuild

Timestamp:

Dec 26, 2014 4:36:14 PM (10 years ago)

Author:

bird

Message:

file.c: Forgot to update to_file->multi_head when the file being rehashed was at the head of a multi target link. This caused the renamed target to be used during updating and lots of trouble.

File:

• trunk/src/kmk/file.c (modified) (2 diffs)

trunk/src/kmk/file.c

@@ -374 +374 @@
       to_file->multi_head  = f = from_file->multi_head;
       if (f == from_file)
-        for (; f != 0; f = f->multi_next)
-            f->multi_head = to_file;
+        {
+          for (; f != 0; f = f->multi_next)
+              f->multi_head = to_file;
+          to_file->multi_head = to_file;
+        }
       else
         {
@@ -383 +386 @@
           f->multi_next = to_file;
         }
+# ifdef NDEBUG
       from_file->multi_head = to_file->multi_head;
       from_file->multi_next = NULL;
+# else
+      from_file->multi_head = (struct file *)0x2; /* poison */
+      from_file->multi_next = (struct file *)0x8;
+# endif
     }
 #endif