BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.bin / make / targ.c

diff --git a/usr/src/usr.bin/make/targ.c b/usr/src/usr.bin/make/targ.c
index ecca92a..7e1475a 100644 (file)
--- a/usr/src/usr.bin/make/targ.c
+++ b/usr/src/usr.bin/make/targ.c
@@ -1,27 +1,43 @@
 /*
 /*

- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * Copyright (c) 1988, 1989 by Adam de Boor
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)targ.c     5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)targ.c     8.2 (Berkeley) 3/19/94";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -67,6 +83,7 @@ static char sccsid[] = "@(#)targ.c    5.6 (Berkeley) %G%";
 #include         <time.h>
 #include         "make.h"
 #include         "hash.h"
 #include         <time.h>
 #include         "make.h"
 #include         "hash.h"

+#include         "dir.h"

 
 static Lst        allTargets;  /* the list of all targets found so far */
 static Hash_Table targets;     /* a hash table of same */
 
 static Lst        allTargets;  /* the list of all targets found so far */
 static Hash_Table targets;     /* a hash table of same */


@@ -89,7 +106,7 @@ void
 Targ_Init ()
 {
     allTargets = Lst_Init (FALSE);
 Targ_Init ()
 {
     allTargets = Lst_Init (FALSE);

-    Hash_InitTable (&targets, HTSIZE, HASH_STRING_KEYS);
+    Hash_InitTable (&targets, HTSIZE);

 }
 
 /*-
 }
 
 /*-


@@ -132,6 +149,7 @@ Targ_NewGN (name)
     gn->preds =        Lst_Init(FALSE);
     gn->context =      Lst_Init (FALSE);
     gn->commands =     Lst_Init (FALSE);
     gn->preds =        Lst_Init(FALSE);
     gn->context =      Lst_Init (FALSE);
     gn->commands =     Lst_Init (FALSE);

+    gn->suffix =       NULL;

 
     return (gn);
 }
 
     return (gn);
 }


@@ -325,6 +343,7 @@ Targ_SetMain (gn)
 }
 
 static int
 }
 
 static int

+/*ARGSUSED*/

 TargPrintName (gn, ppath)
     GNode          *gn;
     int                    ppath;
 TargPrintName (gn, ppath)
     GNode          *gn;
     int                    ppath;


@@ -339,7 +358,7 @@ TargPrintName (gn, ppath)
            printf ("(MAIN NAME)  ");
        }
     }
            printf ("(MAIN NAME)  ");
        }
     }

-#endif notdef
+#endif /* notdef */

     return (0);
 }
 
     return (0);
 }
 


@@ -368,7 +387,7 @@ Targ_PrintCmd (cmd)
  */
 char *
 Targ_FmtTime (time)
  */
 char *
 Targ_FmtTime (time)

-    int    time;
+    time_t    time;

 {
     struct tm          *parts;
     static char                buf[40];
 {
     struct tm          *parts;
     static char                buf[40];


@@ -479,13 +498,13 @@ TargPrintNode (gn, pass)
            if (!Lst_IsEmpty (gn->iParents)) {
                printf("# implicit parents: ");
                Lst_ForEach (gn->iParents, TargPrintName, (ClientData)0);
            if (!Lst_IsEmpty (gn->iParents)) {
                printf("# implicit parents: ");
                Lst_ForEach (gn->iParents, TargPrintName, (ClientData)0);

-               putc ('\n', stdout);
+               fputc ('\n', stdout);

            }
        }
        if (!Lst_IsEmpty (gn->parents)) {
            printf("# parents: ");
            Lst_ForEach (gn->parents, TargPrintName, (ClientData)0);
            }
        }
        if (!Lst_IsEmpty (gn->parents)) {
            printf("# parents: ");
            Lst_ForEach (gn->parents, TargPrintName, (ClientData)0);

-           putc ('\n', stdout);
+           fputc ('\n', stdout);

        }
        
        printf("%-16s", gn->name);
        }
        
        printf("%-16s", gn->name);


@@ -499,7 +518,7 @@ TargPrintNode (gn, pass)
        }
        Targ_PrintType (gn->type);
        Lst_ForEach (gn->children, TargPrintName, (ClientData)0);
        }
        Targ_PrintType (gn->type);
        Lst_ForEach (gn->children, TargPrintName, (ClientData)0);

-       putc ('\n', stdout);
+       fputc ('\n', stdout);

        Lst_ForEach (gn->commands, Targ_PrintCmd, (ClientData)0);
        printf("\n\n");
        if (gn->type & OP_DOUBLEDEP) {
        Lst_ForEach (gn->commands, Targ_PrintCmd, (ClientData)0);
        printf("\n\n");
        if (gn->type & OP_DOUBLEDEP) {


@@ -545,6 +564,7 @@ TargPrintOnlySrc(gn)
  *     lots o' output
  *-----------------------------------------------------------------------
  */
  *     lots o' output
  *-----------------------------------------------------------------------
  */

+void

 Targ_PrintGraph (pass)
     int            pass;       /* Which pass this is. 1 => no processing
                         * 2 => processing done */
 Targ_PrintGraph (pass)
     int            pass;       /* Which pass this is. 1 => no processing
                         * 2 => processing done */