Changeset 24 in kBuild for branches/FREEBSD/src/kmk/make.c

Timestamp:

Nov 26, 2002 9:24:54 PM (22 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/make.c (modified) (35 diffs)

branches/FREEBSD/src/kmk/make.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)make.c   8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/make.c,v 1.23 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)make.c      8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/make.c,v 1.11 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -88 +92 @@
                                  * TRUE, there's a cycle in the graph */
 
-static int MakeAddChild(void *, void *);
-static int MakeAddAllSrc(void *, void *);
-static int MakeTimeStamp(void *, void *);
-static int MakeHandleUse(void *, void *);
-static Boolean MakeStartJobs(void);
-static int MakePrintStatus(void *, void *);
+static int MakeAddChild __P((ClientData, ClientData));
+static int MakeAddAllSrc __P((ClientData, ClientData));
+static int MakeTimeStamp __P((ClientData, ClientData));
+static int MakeHandleUse __P((ClientData, ClientData));
+static Boolean MakeStartJobs __P((void));
+static int MakePrintStatus __P((ClientData, ClientData));
 /*-
  *-----------------------------------------------------------------------
@@ -109 +113 @@
  */
 int
-Make_TimeStamp (GNode *pgn, GNode *cgn)
+Make_TimeStamp (pgn, cgn)
+    GNode *pgn; /* the current parent */
+    GNode *cgn; /* the child we've just examined */
 {
     if (cgn->mtime > pgn->cmtime) {
@@ -118 +124 @@
 
 static int
-MakeTimeStamp (void *pgn, void *cgn)
+MakeTimeStamp (pgn, cgn)
+    ClientData pgn;     /* the current parent */
+    ClientData cgn;     /* the child we've just examined */
 {
     return Make_TimeStamp((GNode *) pgn, (GNode *) cgn);
@@ -143 +151 @@
  */
 Boolean
-Make_OODate (GNode *gn)
+Make_OODate (gn)
+    register GNode *gn;       /* the node to check */
 {
     Boolean         oodate;
@@ -153 +162 @@
     if ((gn->type & (OP_JOIN|OP_USE|OP_EXEC)) == 0) {
         (void) Dir_MTime (gn);
-        if (gn->mtime != 0) {
-            DEBUGF(MAKE, ("modified %s...", Targ_FmtTime(gn->mtime)));
-        } else {
-            DEBUGF(MAKE, ("non-existent..."));
+        if (DEBUG(MAKE)) {
+            if (gn->mtime != 0) {
+                printf ("modified %s...", Targ_FmtTime(gn->mtime));
+            } else {
+                printf ("non-existent...");
+            }
         }
     }
@@ -179 +190 @@
          * no matter *what*.
          */
-        DEBUGF(MAKE, (".USE node..."));
+        if (DEBUG(MAKE)) {
+            printf(".USE node...");
+        }
         oodate = FALSE;
     } else if (gn->type & OP_LIB) {
-        DEBUGF(MAKE, ("library..."));
+        if (DEBUG(MAKE)) {
+            printf("library...");
+        }
 
         /*
@@ -195 +210 @@
          * out-of-date if any of its children was out-of-date.
          */
-        DEBUGF(MAKE, (".JOIN node..."));
+        if (DEBUG(MAKE)) {
+            printf(".JOIN node...");
+        }
         oodate = gn->childMade;
     } else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {
@@ -202 +219 @@
          * the .EXEC attribute is always considered out-of-date.
          */
-        if (gn->type & OP_FORCE) {
-            DEBUGF(MAKE, ("! operator..."));
-        } else if (gn->type & OP_PHONY) {
-            DEBUGF(MAKE, (".PHONY node..."));
-        } else {
-            DEBUGF(MAKE, (".EXEC node..."));
+        if (DEBUG(MAKE)) {
+            if (gn->type & OP_FORCE) {
+                printf("! operator...");
+            } else if (gn->type & OP_PHONY) {
+                printf(".PHONY node...");
+            } else {
+                printf(".EXEC node...");
+            }
         }
         oodate = TRUE;
@@ -221 +240 @@
          * it.
          */
-        if (gn->mtime < gn->cmtime) {
-            DEBUGF(MAKE, ("modified before source..."));
-        } else if (gn->mtime == 0) {
-            DEBUGF(MAKE, ("non-existent and no sources..."));
-        } else {
-            DEBUGF(MAKE, (":: operator and no sources..."));
+        if (DEBUG(MAKE)) {
+            if (gn->mtime < gn->cmtime) {
+                printf("modified before source...");
+            } else if (gn->mtime == 0) {
+                printf("non-existent and no sources...");
+            } else {
+                printf(":: operator and no sources...");
+            }
         }
         oodate = TRUE;
-    } else
+    } else {
+#if 0
+        /* WHY? */
+        if (DEBUG(MAKE)) {
+            printf("source %smade...", gn->childMade ? "" : "not ");
+        }
+        oodate = gn->childMade;
+#else
         oodate = FALSE;
+#endif /* 0 */
+    }
 
     /*
@@ -240 +270 @@
      */
     if (!oodate) {
-        Lst_ForEach (gn->parents, MakeTimeStamp, (void *)gn);
+        Lst_ForEach (gn->parents, MakeTimeStamp, (ClientData)gn);
     }
 
@@ -261 +291 @@
  */
 static int
-MakeAddChild (void *gnp, void *lp)
+MakeAddChild (gnp, lp)
+    ClientData     gnp;         /* the node to add */
+    ClientData     lp;          /* the list to which to add it */
 {
     GNode          *gn = (GNode *) gnp;
@@ -267 +299 @@
 
     if (!gn->make && !(gn->type & OP_USE)) {
-        (void)Lst_EnQueue (l, (void *)gn);
+        (void)Lst_EnQueue (l, (ClientData)gn);
     }
     return (0);
@@ -297 +329 @@
  */
 int
-Make_HandleUse (GNode *cgn, GNode *pgn)
-{
-    GNode       *gn;            /* A child of the .USE node */
-    LstNode     ln;             /* An element in the children list */
+Make_HandleUse (cgn, pgn)
+    register GNode      *cgn;   /* The .USE node */
+    register GNode      *pgn;   /* The target of the .USE node */
+{
+    register GNode      *gn;    /* A child of the .USE node */
+    register LstNode    ln;     /* An element in the children list */
 
     if (cgn->type & (OP_USE|OP_TRANSFORM)) {
@@ -312 +346 @@
 
         if (Lst_Open (cgn->children) == SUCCESS) {
-            while ((ln = Lst_Next (cgn->children)) != NULL) {
+            while ((ln = Lst_Next (cgn->children)) != NILLNODE) {
                 gn = (GNode *)Lst_Datum (ln);
 
-                if (Lst_Member (pgn->children, gn) == NULL) {
+                if (Lst_Member (pgn->children, gn) == NILLNODE) {
                     (void) Lst_AtEnd (pgn->children, gn);
                     (void) Lst_AtEnd (gn->parents, pgn);
@@ -340 +374 @@
 }
 static int
-MakeHandleUse (void *pgn, void *cgn)
+MakeHandleUse (pgn, cgn)
+    ClientData pgn;     /* the current parent */
+    ClientData cgn;     /* the child we've just examined */
 {
     return Make_HandleUse((GNode *) pgn, (GNode *) cgn);
@@ -372 +408 @@
  */
 void
-Make_Update (GNode *cgn)
-{
-    GNode       *pgn;           /* the parent node */
-    char        *cname;         /* the child's name */
-    LstNode     ln;             /* Element in parents and iParents lists */
-    char        *p1;
+Make_Update (cgn)
+    register GNode *cgn;        /* the child node */
+{
+    register GNode      *pgn;   /* the parent node */
+    register char       *cname; /* the child's name */
+    register LstNode    ln;     /* Element in parents and iParents lists */
+    char *p1;
 
     cname = Var_Value (TARGET, cgn, &p1);
@@ -443 +480 @@
             cgn->mtime = now;
         }
-        DEBUGF(MAKE, ("update time: %s\n", Targ_FmtTime(cgn->mtime)));
+        if (DEBUG(MAKE)) {
+            printf("update time: %s\n", Targ_FmtTime(cgn->mtime));
+        }
 #endif
     }
 
     if (Lst_Open (cgn->parents) == SUCCESS) {
-        while ((ln = Lst_Next (cgn->parents)) != NULL) {
+        while ((ln = Lst_Next (cgn->parents)) != NILLNODE) {
             pgn = (GNode *)Lst_Datum (ln);
             if (pgn->make) {
@@ -468 +507 @@
                      * be dealt with in MakeStartJobs.
                      */
-                    (void)Lst_EnQueue (toBeMade, (void *)pgn);
+                    (void)Lst_EnQueue (toBeMade, (ClientData)pgn);
                 } else if (pgn->unmade < 0) {
                     Error ("Graph cycles through %s", pgn->name);
@@ -482 +521 @@
      * before.
      */
-    for (ln = Lst_First(cgn->successors); ln != NULL; ln = Lst_Succ(ln)) {
+    for (ln = Lst_First(cgn->successors); ln != NILLNODE; ln = Lst_Succ(ln)) {
         GNode   *succ = (GNode *)Lst_Datum(ln);
 
         if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&
-            Lst_Member(toBeMade, (void *)succ) == NULL)
+            Lst_Member(toBeMade, (ClientData)succ) == NILLNODE)
         {
-            (void)Lst_EnQueue(toBeMade, (void *)succ);
+            (void)Lst_EnQueue(toBeMade, (ClientData)succ);
         }
     }
@@ -497 +536 @@
      */
     if (Lst_Open (cgn->iParents) == SUCCESS) {
-        char    *ptr;
-        char    *cpref = Var_Value(PREFIX, cgn, &ptr);
-
-        while ((ln = Lst_Next (cgn->iParents)) != NULL) {
+        char    *p1;
+        char    *cpref = Var_Value(PREFIX, cgn, &p1);
+
+        while ((ln = Lst_Next (cgn->iParents)) != NILLNODE) {
             pgn = (GNode *)Lst_Datum (ln);
             if (pgn->make) {
@@ -507 +546 @@
             }
         }
-        efree(ptr);
+        efree(p1);
         Lst_Close (cgn->iParents);
     }
@@ -534 +573 @@
  */
 static int
-MakeAddAllSrc (void *cgnp, void *pgnp)
+MakeAddAllSrc (cgnp, pgnp)
+    ClientData  cgnp;   /* The child to add */
+    ClientData  pgnp;   /* The parent to whose ALLSRC variable it should be */
+                        /* added */
 {
     GNode       *cgn = (GNode *) cgnp;
@@ -605 +647 @@
  */
 void
-Make_DoAllVar (GNode *gn)
-{
-    Lst_ForEach (gn->children, MakeAddAllSrc, (void *) gn);
+Make_DoAllVar (gn)
+    GNode       *gn;
+{
+    Lst_ForEach (gn->children, MakeAddAllSrc, (ClientData) gn);
 
     if (!Var_Exists (OODATE, gn)) {
@@ -641 +684 @@
  */
 static Boolean
-MakeStartJobs (void)
-{
-    GNode       *gn;
+MakeStartJobs ()
+{
+    register GNode      *gn;
 
     while (!Job_Full() && !Lst_IsEmpty (toBeMade)) {
         gn = (GNode *) Lst_DeQueue (toBeMade);
-        DEBUGF(MAKE, ("Examining %s...", gn->name));
+        if (DEBUG(MAKE)) {
+            printf ("Examining %s...", gn->name);
+        }
         /*
          * Make sure any and all predecessors that are going to be made,
@@ -655 +700 @@
             LstNode ln;
 
-            for (ln = Lst_First(gn->preds); ln != NULL; ln = Lst_Succ(ln)){
+            for (ln = Lst_First(gn->preds); ln != NILLNODE; ln = Lst_Succ(ln)){
                 GNode   *pgn = (GNode *)Lst_Datum(ln);
 
                 if (pgn->make && pgn->made == UNMADE) {
-                    DEBUGF(MAKE, ("predecessor %s not made yet.\n", pgn->name));
+                    if (DEBUG(MAKE)) {
+                        printf("predecessor %s not made yet.\n", pgn->name);
+                    }
                     break;
                 }
             }
             /*
-             * If ln isn't NULL, there's a predecessor as yet unmade, so we
+             * If ln isn't nil, there's a predecessor as yet unmade, so we
              * just drop this node on the floor. When the node in question
              * has been made, it will notice this node as being ready to
              * make but as yet unmade and will place the node on the queue.
              */
-            if (ln != NULL) {
+            if (ln != NILLNODE) {
                 continue;
             }
@@ -676 +723 @@
         numNodes--;
         if (Make_OODate (gn)) {
-            DEBUGF(MAKE, ("out-of-date\n"));
+            if (DEBUG(MAKE)) {
+                printf ("out-of-date\n");
+            }
             if (queryFlag) {
                 return (TRUE);
@@ -683 +732 @@
             Job_Make (gn);
         } else {
-            DEBUGF(MAKE, ("up-to-date\n"));
+            if (DEBUG(MAKE)) {
+                printf ("up-to-date\n");
+            }
             gn->made = UPTODATE;
             if (gn->type & OP_JOIN) {
@@ -707 +758 @@
  *      Print the status of a top-level node, viz. it being up-to-date
  *      already or not created due to an error in a lower level.
- *      Callback function for Make_Run via Lst_ForEach.  If gn->unmade is
- *      nonzero and that is meant to imply a cycle in the graph, then
- *      cycle is TRUE.
+ *      Callback function for Make_Run via Lst_ForEach.
  *
  * Results:
@@ -720 +769 @@
  */
 static int
-MakePrintStatus(void *gnp, void *cyclep)
+MakePrintStatus(gnp, cyclep)
+    ClientData  gnp;        /* Node to examine */
+    ClientData  cyclep;     /* True if gn->unmade being non-zero implies
+                             * a cycle in the graph, not an error in an
+                             * inferior */
 {
     GNode       *gn = (GNode *) gnp;
@@ -742 +795 @@
                 Error("Graph cycles through `%s'", gn->name);
                 gn->made = ENDCYCLE;
-                Lst_ForEach(gn->children, MakePrintStatus, (void *) &t);
+                Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t);
                 gn->made = UNMADE;
             } else if (gn->made != ENDCYCLE) {
                 gn->made = CYCLE;
-                Lst_ForEach(gn->children, MakePrintStatus, (void *) &t);
+                Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t);
             }
         } else {
@@ -778 +831 @@
  */
 Boolean
-Make_Run (Lst targs)
-{
-    GNode           *gn;        /* a temporary pointer */
-    Lst             examine;    /* List of targets to examine */
+Make_Run (targs)
+    Lst             targs;      /* the initial list of targets */
+{
+    register GNode  *gn;        /* a temporary pointer */
+    register Lst    examine;    /* List of targets to examine */
     int             errors;     /* Number of errors the Job module reports */
 
@@ -808 +862 @@
              * to make sure everything has commands that should...
              */
-            Lst_ForEach (gn->children, MakeHandleUse, (void *)gn);
+            Lst_ForEach (gn->children, MakeHandleUse, (ClientData)gn);
             Suff_FindDeps (gn);
 
             if (gn->unmade != 0) {
-                Lst_ForEach (gn->children, MakeAddChild, (void *)examine);
+                Lst_ForEach (gn->children, MakeAddChild, (ClientData)examine);
             } else {
-                (void)Lst_EnQueue (toBeMade, (void *)gn);
+                (void)Lst_EnQueue (toBeMade, (ClientData)gn);
             }
         }
@@ -855 +909 @@
     }
 
-    errors = Job_Finish();
+    errors = Job_End();
 
     /*
@@ -862 +916 @@
      */
     errors = ((errors == 0) && (numNodes != 0));
-    Lst_ForEach(targs, MakePrintStatus, (void *) &errors);
+    Lst_ForEach(targs, MakePrintStatus, (ClientData) &errors);
 
     return (TRUE);