Changeset 24 in kBuild

Timestamp:

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

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

Location:

branches/FREEBSD/src/kmk

Files:

• Makefile (modified) (2 diffs)
• Makefile.dist (modified) (1 diff)
• PSD.doc/stubs (modified) (1 diff)
• PSD.doc/tutorial.ms (modified) (5 diffs)
• arch.c (modified) (46 diffs)
• buf.c (modified) (18 diffs)
• buf.h (modified) (4 diffs)
• compat.c (modified) (28 diffs)
• cond.c (modified) (27 diffs)
• config.h (modified) (7 diffs)
• dir.c (modified) (51 diffs)
• dir.h (modified) (3 diffs)
• for.c (modified) (12 diffs)
• hash.c (modified) (15 diffs)
• hash.h (modified) (6 diffs)
• job.c (modified) (103 diffs)
• job.h (modified) (10 diffs)
• list.h (modified) (12 diffs)
• lst.h (modified) (12 diffs)
• lst.lib/lstAppend.c (modified) (6 diffs)
• lst.lib/lstAtEnd.c (modified) (2 diffs)
• lst.lib/lstAtFront.c (modified) (2 diffs)
• lst.lib/lstClose.c (modified) (1 diff)
• lst.lib/lstConcat.c (modified) (7 diffs)
• lst.lib/lstDatum.c (modified) (3 diffs)
• lst.lib/lstDeQueue.c (modified) (3 diffs)
• lst.lib/lstDestroy.c (modified) (3 diffs)
• lst.lib/lstDupl.c (modified) (4 diffs)
• lst.lib/lstEnQueue.c (modified) (2 diffs)
• lst.lib/lstFind.c (modified) (3 diffs)
• lst.lib/lstFindFrom.c (modified) (5 diffs)
• lst.lib/lstFirst.c (modified) (3 diffs)
• lst.lib/lstForEach.c (modified) (2 diffs)
• lst.lib/lstForEachFrom.c (modified) (3 diffs)
• lst.lib/lstInit.c (modified) (2 diffs)
• lst.lib/lstInsert.c (modified) (5 diffs)
• lst.lib/lstInt.h (modified) (7 diffs)
• lst.lib/lstIsAtEnd.c (modified) (1 diff)
• lst.lib/lstIsEmpty.c (modified) (2 diffs)
• lst.lib/lstLast.c (modified) (3 diffs)
• lst.lib/lstMember.c (modified) (4 diffs)
• lst.lib/lstNext.c (modified) (5 diffs)
• lst.lib/lstOpen.c (modified) (3 diffs)
• lst.lib/lstRemove.c (modified) (6 diffs)
• lst.lib/lstReplace.c (modified) (2 diffs)
• lst.lib/lstSucc.c (modified) (2 diffs)
• main.c (modified) (43 diffs)
• make.1 (modified) (16 diffs)
• make.c (modified) (35 diffs)
• make.h (modified) (14 diffs)
• nonints.h (modified) (1 diff)
• parse.c (modified) (86 diffs)
• pathnames.h (modified) (1 diff)
• sprite.h (modified) (3 diffs)
• str.c (modified) (11 diffs)
• suff.c (modified) (105 diffs)
• targ.c (modified) (32 diffs)
• util.c (modified) (1 diff)
• var.c (modified) (90 diffs)

branches/FREEBSD/src/kmk/Makefile

@@ -1 +1 @@
 #       @(#)Makefile    5.2 (Berkeley) 12/28/90
-#       $Id$
-# $FreeBSD: src/usr.bin/make/Makefile,v 1.29 2002/10/10 19:27:48 jmallett Exp $
+# $FreeBSD: src/usr.bin/make/Makefile,v 1.13.2.1 2001/05/25 08:33:40 sobomax Exp $
 
 PROG=   make
-CFLAGS+=-I${.CURDIR}
+CFLAGS+= -I${.CURDIR}
 SRCS=   arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
-        make.c parse.c str.c suff.c targ.c util.c var.c
+        make.c parse.c str.c suff.c targ.c var.c util.c
 SRCS+=  lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \
         lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \
@@ -16 +15 @@
 NOSHARED?=      YES
 
-CFLAGS+=-DMAKE_VERSION=\"5200209170\"
-.if defined(_UPGRADING)
-CFLAGS+=-D__FBSDID=__RCSID
-.endif
-
-# XXX: kernel currently broken
-# CFLAGS+=-DUSE_KQUEUE
-
-main.o: ${MAKEFILE}
-
-# Set the shell which make(1) uses.  Bourne is the default, but a decent
-# Korn shell works fine, and much faster.  Using the C shell for this
-# will almost certainly break everything, but it's Unix tradition to
-# allow you to shoot yourself in the foot if you want to :-)
-
-MAKE_SHELL?=    sh
-.if ${MAKE_SHELL} == "csh"
-CFLAGS+=        -DDEFSHELL=0
-.elif ${MAKE_SHELL} == "sh"
-CFLAGS+=        -DDEFSHELL=1
-.elif ${MAKE_SHELL} == "ksh"
-CFLAGS+=        -DDEFSHELL=2
-.else
-.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
-.endif
-
 .include <bsd.prog.mk>

branches/FREEBSD/src/kmk/Makefile.dist

@@ -1 @@
-# $FreeBSD: src/usr.bin/make/Makefile.dist,v 1.2 2001/03/01 06:26:32 imp Exp $
 # a very simple makefile...
 pmake:
         @echo 'make started.'
-        cc -DDEFSHELL=1 -I. -c *.c
+        cc -I. -c *.c
         cd lst.lib; cc -I.. -c *.c
         cc *.o lst.lib/*.o -o pmake

branches/FREEBSD/src/kmk/PSD.doc/stubs

@@ -1 @@
-.\" $FreeBSD: src/usr.bin/make/PSD.doc/stubs,v 1.1 2000/11/24 10:05:30 ru Exp $
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/stubs,v 1.1.2.1 2000/11/24 10:08:45 ru Exp $
 .\"
 .de Ix

branches/FREEBSD/src/kmk/PSD.doc/tutorial.ms

@@ -36 +36 @@
 .\"
 .\"     @(#)tutorial.ms 8.1 (Berkeley) 8/18/93
-.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.12 2002/05/16 02:19:09 trhodes Exp $
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.8.2.2 2000/11/24 10:08:45 ru Exp $
 .\"
 .so stubs
@@ -603 +603 @@
 .LP
 The value of a variable may be retrieved by enclosing the variable
-name in parentheses or curly braces and preceding the whole thing
+name in parentheses or curly braces and preceeding the whole thing
 with a dollar sign.
 .LP
@@ -1244 +1244 @@
 and various other information on how PMake was configured.
 .Ix 0 ref configuration
-.Ix 0 ref makefilesystem
+.Ix 0 ref makefile system
 .IP \fB\-i\fP
 .Ix 0 def flags -i
@@ -2401 +2401 @@
 .CW .h
 suffix is already marked in this way in the system makefile.
-.Ix 0 ref makefilesystem
+.Ix 0 ref makefile system
 E.g. if you have
 .DS
@@ -2641 +2641 @@
 You are allowed to use any character except
 colon or exclamation point to separate the two strings. This so-called
-delimiter character may be placed in either string by preceding it
+delimiter character may be placed in either string by preceeding it
 with a backslash.
 .IP T

branches/FREEBSD/src/kmk/arch.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)arch.c   8.2 (Berkeley) 1/2/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/arch.c,v 1.32 2002/10/09 03:42:09 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)arch.c      8.2 (Berkeley) 1/2/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/arch.c,v 1.15.2.1 2001/02/13 03:13:57 will Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -114 +118 @@
 } Arch;
 
-static int ArchFindArchive(void *, void *);
-static void ArchFree(void *);
-static struct ar_hdr *ArchStatMember(char *, char *, Boolean);
-static FILE *ArchFindMember(char *, char *, struct ar_hdr *, char *);
+static int ArchFindArchive __P((ClientData, ClientData));
+static void ArchFree __P((ClientData));
+static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean));
+static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *));
 #if defined(__svr4__) || defined(__SVR4) || defined(__ELF__)
-#define SVR4ARCHIVES
-static int ArchSVR4Entry(Arch *, char *, size_t, FILE *);
+#define SVR4ARCHIVES
+static int ArchSVR4Entry __P((Arch *, char *, size_t, FILE *));
 #endif
 
@@ -137 +141 @@
  */
 static void
-ArchFree(void *ap)
+ArchFree(ap)
+    ClientData ap;
 {
     Arch *a = (Arch *) ap;
@@ -147 +152 @@
          entry != NULL;
          entry = Hash_EnumNext(&search))
-        free(Hash_GetValue(entry));
+        free((Address) Hash_GetValue (entry));
 
     free(a->name);
     efree(a->fnametab);
     Hash_DeleteTable(&a->members);
-    free(a);
+    free((Address) a);
 }
 
@@ -162 +167 @@
  *      Parse the archive specification in the given line and find/create
  *      the nodes for the specified archive members, placing their nodes
- *      on the given list, given the pointer to the start of the
- *      specification, a Lst on which to place the nodes, and a context
- *      in which to expand variables.
+ *      on the given list.
  *
  * Results:
@@ -177 +180 @@
  */
 ReturnStatus
-Arch_ParseArchive (char **linePtr, Lst nodeLst, GNode *ctxt)
-{
-    char            *cp;            /* Pointer into line */
+Arch_ParseArchive (linePtr, nodeLst, ctxt)
+    char            **linePtr;      /* Pointer to start of specification */
+    Lst             nodeLst;        /* Lst on which to place the nodes */
+    GNode           *ctxt;          /* Context in which to expand variables */
+{
+    register char   *cp;            /* Pointer into line */
     GNode           *gn;            /* New node */
     char            *libName;       /* Library-part of specification */
@@ -230 +236 @@
         Boolean doSubst = FALSE; /* TRUE if need to substitute in memName */
 
-        while (*cp != '\0' && *cp != ')' && isspace ((unsigned char) *cp)) {
+        while (*cp != '\0' && *cp != ')' && isspace (*cp)) {
             cp++;
         }
         memName = cp;
-        while (*cp != '\0' && *cp != ')' && !isspace ((unsigned char) *cp)) {
+        while (*cp != '\0' && *cp != ')' && !isspace (*cp)) {
             if (*cp == '$') {
                 /*
@@ -305 +311 @@
              * are just placed at the end of the nodeLst we're returning.
              */
-
             sz = strlen(memName) + strlen(libName) + 3;
             buf = sacrifice = emalloc(sz);
-
             snprintf(buf, sz, "%s(%s)", libName, memName);
 
@@ -319 +323 @@
                 gn = Targ_FindNode(buf, TARG_CREATE);
 
-                if (gn == NULL) {
+                if (gn == NILGNODE) {
                     free(buf);
                     return(FAILURE);
                 } else {
                     gn->type |= OP_ARCHV;
-                    (void)Lst_AtEnd(nodeLst, (void *)gn);
+                    (void)Lst_AtEnd(nodeLst, (ClientData)gn);
                 }
             } else if (Arch_ParseArchive(&sacrifice, nodeLst, ctxt)!=SUCCESS) {
@@ -355 +359 @@
                 free(member);
                 gn = Targ_FindNode (nameBuf, TARG_CREATE);
-                if (gn == NULL) {
+                if (gn == NILGNODE) {
                     free(nameBuf);
                     return (FAILURE);
@@ -367 +371 @@
                      */
                     gn->type |= OP_ARCHV;
-                    (void) Lst_AtEnd (nodeLst, (void *)gn);
+                    (void) Lst_AtEnd (nodeLst, (ClientData)gn);
                 }
             }
@@ -378 +382 @@
             gn = Targ_FindNode (nameBuf, TARG_CREATE);
             free(nameBuf);
-            if (gn == NULL) {
+            if (gn == NILGNODE) {
                 return (FAILURE);
             } else {
@@ -389 +393 @@
                  */
                 gn->type |= OP_ARCHV;
-                (void) Lst_AtEnd (nodeLst, (void *)gn);
+                (void) Lst_AtEnd (nodeLst, (ClientData)gn);
             }
         }
@@ -413 +417 @@
     do {
         cp++;
-    } while (*cp != '\0' && isspace ((unsigned char) *cp));
+    } while (*cp != '\0' && isspace (*cp));
 
     *linePtr = cp;
@@ -423 +427 @@
  * ArchFindArchive --
  *      See if the given archive is the one we are looking for. Called
- *      From ArchStatMember and ArchFindMember via Lst_Find with the
- *      current list element and the name we want.
+ *      From ArchStatMember and ArchFindMember via Lst_Find.
  *
  * Results:
@@ -435 +438 @@
  */
 static int
-ArchFindArchive (void *ar, void *archName)
+ArchFindArchive (ar, archName)
+    ClientData    ar;             /* Current list element */
+    ClientData    archName;       /* Name we want */
 {
     return (strcmp ((char *) archName, ((Arch *) ar)->name));
@@ -444 +449 @@
  * ArchStatMember --
  *      Locate a member of an archive, given the path of the archive and
- *      the path of the desired member, and a boolean representing whether
- *      or not the archive should be hashed (if not already hashed).
+ *      the path of the desired member.
  *
  * Results:
@@ -459 +463 @@
  */
 static struct ar_hdr *
-ArchStatMember (char *archive, char *member, Boolean hash)
-{
-#define AR_MAX_NAME_LEN     (sizeof(arh.ar_name)-1)
+ArchStatMember (archive, member, hash)
+    char          *archive;   /* Path to the archive */
+    char          *member;    /* Name of member. If it is a path, only the
+                               * last component is used. */
+    Boolean       hash;       /* TRUE if archive should be hashed if not
+                               * already so. */
+{
+#define AR_MAX_NAME_LEN     (sizeof(arh.ar_name)-1)
     FILE *        arch;       /* Stream to archive */
     int           size;       /* Size of archive member */
@@ -483 +492 @@
         member = cp + 1;
 
-    ln = Lst_Find (archives, (void *) archive, ArchFindArchive);
-    if (ln != NULL) {
+    ln = Lst_Find (archives, (ClientData) archive, ArchFindArchive);
+    if (ln != NILLNODE) {
         ar = (Arch *) Lst_Datum (ln);
 
@@ -494 +503 @@
             /* Try truncated name */
             char copy[AR_MAX_NAME_LEN+1];
-            size_t len = strlen (member);
+            int len = strlen (member);
 
             if (len > AR_MAX_NAME_LEN) {
@@ -615 +624 @@
                 memName[elen] = '\0';
                 fseek (arch, -elen, SEEK_CUR);
-                /* XXX Multiple levels may be asked for, make this conditional
-                 * on one, and use DEBUGF.
-                 */
                 if (DEBUG(ARCH) || DEBUG(MAKE)) {
-                    fprintf(stderr, "ArchStat: Extended format entry for %s\n", memName);
+                    printf("ArchStat: Extended format entry for %s\n", memName);
                 }
             }
@@ -625 +631 @@
 
             he = Hash_CreateEntry (&ar->members, memName, NULL);
-            Hash_SetValue (he, (void *)emalloc (sizeof (struct ar_hdr)));
-            memcpy (Hash_GetValue (he), &arh,
+            Hash_SetValue (he, (ClientData)emalloc (sizeof (struct ar_hdr)));
+            memcpy ((Address)Hash_GetValue (he), (Address)&arh,
                 sizeof (struct ar_hdr));
         }
@@ -634 +640 @@
     fclose (arch);
 
-    (void) Lst_AtEnd (archives, (void *) ar);
+    (void) Lst_AtEnd (archives, (ClientData) ar);
 
     /*
@@ -652 +658 @@
     Hash_DeleteTable (&ar->members);
     efree(ar->fnametab);
-    free (ar);
+    free ((Address)ar);
     return (NULL);
 }
@@ -678 +684 @@
  */
 static int
-ArchSVR4Entry(Arch *ar, char *name, size_t size, FILE *arch)
-{
-#define ARLONGNAMES1 "//"
-#define ARLONGNAMES2 "/ARFILENAMES"
+ArchSVR4Entry(ar, name, size, arch)
+        Arch *ar;
+        char *name;
+        size_t size;
+        FILE *arch;
+{
+#define ARLONGNAMES1 "//"
+#define ARLONGNAMES2 "/ARFILENAMES"
     size_t entry;
     char *ptr, *eptr;
@@ -689 +699 @@
 
         if (ar->fnametab != NULL) {
-            DEBUGF(ARCH, ("Attempted to redefine an SVR4 name table\n"));
+            if (DEBUG(ARCH)) {
+                printf("Attempted to redefine an SVR4 name table\n");
+            }
             return -1;
         }
@@ -701 +713 @@
 
         if (fread(ar->fnametab, size, 1, arch) != 1) {
-            DEBUGF(ARCH, ("Reading an SVR4 name table failed\n"));
+            if (DEBUG(ARCH)) {
+                printf("Reading an SVR4 name table failed\n");
+            }
             return -1;
         }
@@ -718 +732 @@
                 break;
             }
-        DEBUGF(ARCH, ("Found svr4 archive name table with %zu entries\n", entry));
+        if (DEBUG(ARCH)) {
+            printf("Found svr4 archive name table with %d entries\n", entry);
+        }
         return 0;
     }
@@ -727 +743 @@
     entry = (size_t) strtol(&name[1], &eptr, 0);
     if ((*eptr != ' ' && *eptr != '\0') || eptr == &name[1]) {
-        DEBUGF(ARCH, ("Could not parse SVR4 name %s\n", name));
+        if (DEBUG(ARCH)) {
+            printf("Could not parse SVR4 name %s\n", name);
+        }
         return 2;
     }
     if (entry >= ar->fnamesize) {
-        DEBUGF(ARCH, ("SVR4 entry offset %s is greater than %zu\n",
-               name, ar->fnamesize));
+        if (DEBUG(ARCH)) {
+            printf("SVR4 entry offset %s is greater than %d\n",
+                   name, ar->fnamesize);
+        }
         return 2;
     }
 
-    DEBUGF(ARCH, ("Replaced %s with %s\n", name, &ar->fnametab[entry]));
+    if (DEBUG(ARCH)) {
+        printf("Replaced %s with %s\n", name, &ar->fnametab[entry]);
+    }
 
     (void) strncpy(name, &ar->fnametab[entry], MAXPATHLEN);
@@ -750 +772 @@
  *      Locate a member of an archive, given the path of the archive and
  *      the path of the desired member. If the archive is to be modified,
- *      the mode should be "r+", if not, it should be "r".  arhPtr is a
- *      poitner to the header structure to fill in.
+ *      the mode should be "r+", if not, it should be "r".
  *
  * Results:
@@ -764 +785 @@
  */
 static FILE *
-ArchFindMember (char *archive, char *member, struct ar_hdr *arhPtr, char *mode)
+ArchFindMember (archive, member, arhPtr, mode)
+    char          *archive;   /* Path to the archive */
+    char          *member;    /* Name of member. If it is a path, only the
+                               * last component is used. */
+    struct ar_hdr *arhPtr;    /* Pointer to header structure to be filled in */
+    char          *mode;      /* The mode for opening the stream */
 {
     FILE *        arch;       /* Stream to archive */
@@ -770 +796 @@
     char          *cp;        /* Useful character pointer */
     char          magic[SARMAG];
-    size_t        len, tlen;
+    int           len, tlen;
 
     arch = fopen (archive, mode);
@@ -853 +879 @@
                 }
                 ename[elen] = '\0';
-                /*
-                 * XXX choose one.
-                 */
                 if (DEBUG(ARCH) || DEBUG(MAKE)) {
                     printf("ArchFind: Extended format entry for %s\n", ename);
@@ -907 +930 @@
  */
 void
-Arch_Touch (GNode *gn)
+Arch_Touch (gn)
+    GNode         *gn;    /* Node of member to touch */
 {
     FILE *        arch;   /* Stream open to archive, positioned properly */
@@ -942 +966 @@
  */
 void
-Arch_TouchLib (GNode *gn)
+Arch_TouchLib (gn)
+    GNode           *gn;        /* The node of the library to touch */
 {
 #ifdef RANLIBMAG
@@ -965 +990 @@
  *-----------------------------------------------------------------------
  * Arch_MTime --
- *      Return the modification time of a member of an archive, given its
- *      name.
+ *      Return the modification time of a member of an archive.
  *
  * Results:
@@ -978 +1002 @@
  */
 int
-Arch_MTime(GNode *gn)
+Arch_MTime (gn)
+    GNode         *gn;        /* Node describing archive member */
 {
     struct ar_hdr *arhPtr;    /* Header of desired member */
@@ -1015 +1040 @@
  */
 int
-Arch_MemMTime (GNode *gn)
+Arch_MemMTime (gn)
+    GNode         *gn;
 {
     LstNode       ln;
@@ -1026 +1052 @@
         return (0);
     }
-    while ((ln = Lst_Next (gn->parents)) != NULL) {
+    while ((ln = Lst_Next (gn->parents)) != NILLNODE) {
         pgn = (GNode *) Lst_Datum (ln);
 
@@ -1062 +1088 @@
  *-----------------------------------------------------------------------
  * Arch_FindLib --
- *      Search for a named library along the given search path.
+ *      Search for a library along the given search path.
  *
  * Results:
@@ -1080 +1106 @@
  */
 void
-Arch_FindLib (GNode *gn, Lst path)
+Arch_FindLib (gn, path)
+    GNode           *gn;              /* Node of library to find */
+    Lst             path;             /* Search path */
 {
     char            *libName;   /* file name for archive */
@@ -1104 +1132 @@
  * Arch_LibOODate --
  *      Decide if a node with the OP_LIB attribute is out-of-date. Called
- *      from Make_OODate to make its life easier, with the library's
- *      graph node.
+ *      from Make_OODate to make its life easier.
  *
  *      There are several ways for a library to be out-of-date that are
@@ -1138 +1165 @@
  */
 Boolean
-Arch_LibOODate (GNode *gn)
+Arch_LibOODate (gn)
+    GNode         *gn;          /* The library's graph node */
 {
     Boolean       oodate;
@@ -1156 +1184 @@
             modTimeTOC = (int) strtol(arhPtr->ar_date, NULL, 10);
 
-            /* XXX choose one. */
             if (DEBUG(ARCH) || DEBUG(MAKE)) {
                 printf("%s modified %s...", RANLIBMAG, Targ_FmtTime(modTimeTOC));
@@ -1191 +1218 @@
  */
 void
-Arch_Init (void)
+Arch_Init ()
 {
     archives = Lst_Init (FALSE);
@@ -1212 +1239 @@
  */
 void
-Arch_End (void)
+Arch_End ()
 {
     Lst_Destroy(archives, ArchFree);

branches/FREEBSD/src/kmk/buf.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)buf.c    8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/buf.c,v 1.18 2002/10/09 03:42:09 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)buf.c       8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/buf.c,v 1.11 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -53 +56 @@
 
 #ifndef max
-#define max(a,b)  ((a) > (b) ? (a) : (b))
+#define max(a,b)  ((a) > (b) ? (a) : (b))
 #endif
 
@@ -63 +66 @@
  *      buffer in case it holds a string.
  */
-#define BufExpand(bp,nb) \
+#define BufExpand(bp,nb) \
         if (bp->left < (nb)+1) {\
             int newSize = (bp)->size + max((nb)+1,BUF_ADD_INC); \
@@ -75 +78 @@
         }
 
-#define BUF_DEF_SIZE    256     /* Default buffer size */
-#define BUF_ADD_INC     256     /* Expansion increment when Adding */
-#define BUF_UNGET_INC   16      /* Expansion increment when Ungetting */
+#define BUF_DEF_SIZE    256     /* Default buffer size */
+#define BUF_ADD_INC     256     /* Expansion increment when Adding */
+#define BUF_UNGET_INC   16      /* Expansion increment when Ungetting */
 
 /*-
@@ -93 +96 @@
  */
 void
-Buf_OvAddByte (Buffer bp, int byte)
-{
+Buf_OvAddByte (bp, byte)
+    register Buffer bp;
+    int    byte;
+{
+    int nbytes = 1;
     bp->left = 0;
-    BufExpand (bp, 1);
+    BufExpand (bp, nbytes);
 
     *bp->inPtr++ = byte;
@@ -122 +128 @@
  */
 void
-Buf_AddBytes (Buffer bp, int numBytes, const Byte *bytesPtr)
+Buf_AddBytes (bp, numBytes, bytesPtr)
+    register Buffer bp;
+    int     numBytes;
+    const Byte *bytesPtr;
 {
 
@@ -152 +161 @@
  */
 void
-Buf_UngetByte (Buffer bp, int byte)
+Buf_UngetByte (bp, byte)
+    register Buffer bp;
+    int    byte;
 {
 
@@ -201 +212 @@
  */
 void
-Buf_UngetBytes (Buffer bp, int numBytes, Byte *bytesPtr)
+Buf_UngetBytes (bp, numBytes, bytesPtr)
+    register Buffer bp;
+    int     numBytes;
+    Byte    *bytesPtr;
 {
 
@@ -244 +258 @@
  */
 int
-Buf_GetByte (Buffer bp)
+Buf_GetByte (bp)
+    register Buffer bp;
 {
     int     res;
@@ -277 +292 @@
  */
 int
-Buf_GetBytes (Buffer bp, int numBytes, Byte *bytesPtr)
+Buf_GetBytes (bp, numBytes, bytesPtr)
+    register Buffer bp;
+    int     numBytes;
+    Byte    *bytesPtr;
 {
 
@@ -309 +327 @@
  */
 Byte *
-Buf_GetAll (Buffer bp, int *numBytesPtr)
+Buf_GetAll (bp, numBytesPtr)
+    register Buffer bp;
+    int     *numBytesPtr;
 {
 
@@ -334 +354 @@
  */
 void
-Buf_Discard (Buffer bp, int numBytes)
+Buf_Discard (bp, numBytes)
+    register Buffer bp;
+    int     numBytes;
 {
 
@@ -362 +384 @@
  */
 int
-Buf_Size (Buffer buf)
+Buf_Size (buf)
+    Buffer  buf;
 {
     return (buf->inPtr - buf->outPtr);
@@ -384 +407 @@
  */
 Buffer
-Buf_Init (int size)
+Buf_Init (size)
+    int     size;       /* Initial size for the buffer */
 {
     Buffer bp;          /* New Buffer */
@@ -405 +429 @@
  *-----------------------------------------------------------------------
  * Buf_Destroy --
- *      Destroy a buffer, and optionally free its data, too.
+ *      Nuke a buffer and all its resources.
  *
  * Results:
@@ -416 +440 @@
  */
 void
-Buf_Destroy (Buffer buf, Boolean freeData)
+Buf_Destroy (buf, freeData)
+    Buffer  buf;        /* Buffer to destroy */
+    Boolean freeData;   /* TRUE if the data should be destroyed as well */
 {
 
@@ -441 +467 @@
  */
 void
-Buf_ReplaceLastByte (Buffer buf, int byte)
+Buf_ReplaceLastByte (buf, byte)
+    Buffer buf; /* buffer to augment */
+    int byte;   /* byte to be written */
 {
     if (buf->inPtr == buf->outPtr)

branches/FREEBSD/src/kmk/buf.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)buf.h       8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/buf.h,v 1.12 2002/09/17 21:29:06 jmallett Exp $
+ *      from: @(#)buf.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/buf.h,v 1.9 1999/08/28 01:03:26 peter Exp $
  */
 
@@ -47 +46 @@
 
 #ifndef _BUF_H
-#define _BUF_H
+#define _BUF_H
 
 #include    "sprite.h"
@@ -66 +65 @@
                 (*(bp)->inPtr++ = (byte), *(bp)->inPtr = 0), 1)
 
-#define BUF_ERROR 256
+#define BUF_ERROR 256
 
-void Buf_OvAddByte(Buffer, int);
-void Buf_AddBytes(Buffer, int, const Byte *);
-void Buf_UngetByte(Buffer, int);
-void Buf_UngetBytes(Buffer, int, Byte *);
-int Buf_GetByte(Buffer);
-int Buf_GetBytes(Buffer, int, Byte *);
-Byte *Buf_GetAll(Buffer, int *);
-void Buf_Discard(Buffer, int);
-int Buf_Size(Buffer);
-Buffer Buf_Init(int);
-void Buf_Destroy(Buffer, Boolean);
-void Buf_ReplaceLastByte(Buffer, int);
+void Buf_OvAddByte __P((Buffer, int));
+void Buf_AddBytes __P((Buffer, int, const Byte *));
+void Buf_UngetByte __P((Buffer, int));
+void Buf_UngetBytes __P((Buffer, int, Byte *));
+int Buf_GetByte __P((Buffer));
+int Buf_GetBytes __P((Buffer, int, Byte *));
+Byte *Buf_GetAll __P((Buffer, int *));
+void Buf_Discard __P((Buffer, int));
+int Buf_Size __P((Buffer));
+Buffer Buf_Init __P((int));
+void Buf_Destroy __P((Buffer, Boolean));
+void Buf_ReplaceLastByte __P((Buffer, int));
 
 #endif /* _BUF_H */

branches/FREEBSD/src/kmk/compat.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)compat.c 8.2 (Berkeley) 3/19/94
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/compat.c,v 1.34 2002/10/09 03:42:09 jmallett Exp $");
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)compat.c    8.2 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/compat.c,v 1.16.2.2 2000/07/01 12:24:21 ps Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -63 +66 @@
 #include    <errno.h>
 #include    <signal.h>
-#include    <unistd.h>
 #include    "make.h"
 #include    "hash.h"
@@ -78 +80 @@
 static char         meta[256];
 
-static GNode        *curTarg = NULL;
+static GNode        *curTarg = NILGNODE;
 static GNode        *ENDNode;
-static void CompatInterrupt(int);
-static int CompatRunCommand(void *, void *);
-static int CompatMake(void *, void *);
-static int shellneed(char *);
+static void CompatInterrupt __P((int));
+static int CompatRunCommand __P((ClientData, ClientData));
+static int CompatMake __P((ClientData, ClientData));
 
 static char *sh_builtin[] = { 
@@ -105 +106 @@
  */
 static void
-CompatInterrupt (int signo)
+CompatInterrupt (signo)
+    int     signo;
 {
     GNode   *gn;
 
-    if ((curTarg != NULL) && !Targ_Precious (curTarg)) {
+    if ((curTarg != NILGNODE) && !Targ_Precious (curTarg)) {
         char      *p1;
         char      *file = Var_Value (TARGET, curTarg, &p1);
@@ -123 +125 @@
         if (signo == SIGINT) {
             gn = Targ_FindNode(".INTERRUPT", TARG_NOCREATE);
-            if (gn != NULL) {
-                Lst_ForEach(gn->commands, CompatRunCommand, (void *)gn);
+            if (gn != NILGNODE) {
+                Lst_ForEach(gn->commands, CompatRunCommand, (ClientData)gn);
             }
         }
@@ -150 +152 @@
  */
 static int
-shellneed (char *cmd)
+shellneed (cmd)
+        char *cmd;
 {
         char **av, **p;
@@ -168 +171 @@
  *      Execute the next command for a target. If the command returns an
  *      error, the node's made field is set to ERROR and creation stops.
- *      The node from which the command came is also given.
  *
  * Results:
@@ -179 +181 @@
  */
 static int
-CompatRunCommand (void *cmdp, void *gnp)
+CompatRunCommand (cmdp, gnp)
+    ClientData    cmdp;         /* Command to execute */
+    ClientData    gnp;          /* Node from which the command came */
 {
     char          *cmdStart;    /* Start of expanded command */
-    char          *cp;
+    register char *cp;
     Boolean       silent,       /* Don't print command */
                   errCheck;     /* Check errors */
@@ -188 +192 @@
     int           status;       /* Description of child's death */
     int           cpid;         /* Child actually found */
-    ReturnStatus  rstat;        /* Status of fork */
+    ReturnStatus  stat;         /* Status of fork */
     LstNode       cmdNode;      /* Node where current command is located */
     char          **av;         /* Argument vector for thing to exec */
     int           argc;         /* Number of arguments in av or 0 if not
                                  * dynamically allocated */
+    Boolean       local;        /* TRUE if command should be executed
+                                 * locally */
     int           internal;     /* Various values.. */
     char          *cmd = (char *) cmdp;
@@ -208 +214 @@
     errCheck = !(gn->type & OP_IGNORE);
 
-    cmdNode = Lst_Member (gn->commands, (void *)cmd);
+    cmdNode = Lst_Member (gn->commands, (ClientData)cmd);
     cmdStart = Var_Subst (NULL, cmd, gn, FALSE);
 
@@ -225 +231 @@
         cmd = cmdStart;
     }
-    Lst_Replace (cmdNode, (void *)cmdStart);
+    Lst_Replace (cmdNode, (ClientData)cmdStart);
 
     if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
-        (void)Lst_AtEnd(ENDNode->commands, (void *)cmdStart);
+        (void)Lst_AtEnd(ENDNode->commands, (ClientData)cmdStart);
         return(0);
     } else if (strcmp(cmdStart, "...") == 0) {
@@ -315 +321 @@
     }
 
+    local = TRUE;
+
     /*
      * Fork and execute the single command. If the fork fails, we abort.
@@ -323 +331 @@
     }
     if (cpid == 0) {
-        execvp(av[0], av);
-        (void) write (STDERR_FILENO, av[0], strlen (av[0]));
-        (void) write (STDERR_FILENO, ":", 1);
-        (void) write (STDERR_FILENO, strerror(errno), strlen(strerror(errno)));
-        (void) write (STDERR_FILENO, "\n", 1);
+        if (local) {
+            execvp(av[0], av);
+            (void) write (2, av[0], strlen (av[0]));
+            (void) write (2, ":", 1);
+            (void) write (2, strerror(errno), strlen(strerror(errno)));
+            (void) write (2, "\n", 1);
+        } else {
+            (void)execv(av[0], av);
+        }
         exit(1);
     }
@@ -347 +359 @@
     while (1) {
 
-        while ((rstat = wait(&reason)) != cpid) {
-            if (rstat == -1 && errno != EINTR) {
+        while ((stat = wait(&reason)) != cpid) {
+            if (stat == -1 && errno != EINTR) {
                 break;
             }
         }
 
-        if (rstat > -1) {
+        if (stat > -1) {
             if (WIFSTOPPED(reason)) {
                 status = WSTOPSIG(reason);              /* stopped */
@@ -388 +400 @@
             break;
         } else {
-            Fatal ("error in wait: %d", rstat);
+            Fatal ("error in wait: %d", stat);
             /*NOTREACHED*/
         }
@@ -400 +412 @@
  *-----------------------------------------------------------------------
  * CompatMake --
- *      Make a target, given the parent, to abort if necessary.
+ *      Make a target.
  *
  * Results:
@@ -411 +423 @@
  */
 static int
-CompatMake (void *gnp, void *pgnp)
+CompatMake (gnp, pgnp)
+    ClientData  gnp;        /* The node to make */
+    ClientData  pgnp;       /* Parent to abort if necessary */
 {
     GNode *gn = (GNode *) gnp;
@@ -429 +443 @@
         gn->made = BEINGMADE;
         Suff_FindDeps (gn);
-        Lst_ForEach (gn->children, CompatMake, (void *)gn);
+        Lst_ForEach (gn->children, CompatMake, (ClientData)gn);
         if (!gn->make) {
             gn->made = ABORTED;
@@ -436 +450 @@
         }
 
-        if (Lst_Member (gn->iParents, pgn) != NULL) {
+        if (Lst_Member (gn->iParents, pgn) != NILLNODE) {
             char *p1;
             Var_Set (IMPSRC, Var_Value(TARGET, gn, &p1), pgn);
@@ -448 +462 @@
          * Make_OODate function.
          */
-        DEBUGF(MAKE, ("Examining %s...", gn->name));
+        if (DEBUG(MAKE)) {
+            printf("Examining %s...", gn->name);
+        }
         if (! Make_OODate(gn)) {
             gn->made = UPTODATE;
-            DEBUGF(MAKE, ("up-to-date.\n"));
+            if (DEBUG(MAKE)) {
+                printf("up-to-date.\n");
+            }
             return (0);
-        } else {
-            DEBUGF(MAKE, ("out-of-date.\n"));
+        } else if (DEBUG(MAKE)) {
+            printf("out-of-date.\n");
         }
 
@@ -490 +508 @@
             if (!touchFlag) {
                 curTarg = gn;
-                Lst_ForEach (gn->commands, CompatRunCommand, (void *)gn);
-                curTarg = NULL;
+                Lst_ForEach (gn->commands, CompatRunCommand, (ClientData)gn);
+                curTarg = NILGNODE;
             } else {
                 Job_Touch (gn, gn->type & OP_SILENT);
@@ -561 +579 @@
             if (gn->cmtime > gn->mtime)
                 gn->mtime = gn->cmtime;
-            DEBUGF(MAKE, ("update time: %s\n", Targ_FmtTime(gn->mtime)));
+            if (DEBUG(MAKE)) {
+                printf("update time: %s\n", Targ_FmtTime(gn->mtime));
+            }
 #endif
             if (!(gn->type & OP_EXEC)) {
@@ -583 +603 @@
         pgn->make = FALSE;
     } else {
-        if (Lst_Member (gn->iParents, pgn) != NULL) {
+        if (Lst_Member (gn->iParents, pgn) != NILLNODE) {
             char *p1;
             Var_Set (IMPSRC, Var_Value(TARGET, gn, &p1), pgn);
@@ -617 +637 @@
  *-----------------------------------------------------------------------
  * Compat_Run --
- *      Start making again, given a list of target nodes.
+ *      Initialize this mode and start making.
  *
  * Results:
@@ -628 +648 @@
  */
 void
-Compat_Run(Lst targs)
+Compat_Run(targs)
+    Lst           targs;    /* List of target nodes to re-create */
 {
     char          *cp;      /* Pointer to string of shell meta-characters */
@@ -662 +683 @@
     if (!queryFlag) {
         gn = Targ_FindNode(".BEGIN", TARG_NOCREATE);
-        if (gn != NULL) {
-            Lst_ForEach(gn->commands, CompatRunCommand, (void *)gn);
+        if (gn != NILGNODE) {
+            Lst_ForEach(gn->commands, CompatRunCommand, (ClientData)gn);
             if (gn->made == ERROR) {
                 printf("\n\nStop.\n");
@@ -698 +719 @@
      */
     if (errors == 0) {
-        Lst_ForEach(ENDNode->commands, CompatRunCommand, (void *)gn);
+        Lst_ForEach(ENDNode->commands, CompatRunCommand, (ClientData)gn);
     }
 }

branches/FREEBSD/src/kmk/cond.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)cond.c   8.2 (Berkeley) 1/2/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/cond.c,v 1.24 2002/10/09 03:42:09 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)cond.c      8.2 (Berkeley) 1/2/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/cond.c,v 1.12 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -97 +100 @@
  * last two fields are stored in condInvert and condDefProc, respectively.
  */
-static void CondPushBack(Token);
-static int CondGetArg(char **, char **, char *, Boolean);
-static Boolean CondDoDefined(int, char *);
-static int CondStrMatch(void *, void *);
-static Boolean CondDoMake(int, char *);
-static Boolean CondDoExists(int, char *);
-static Boolean CondDoTarget(int, char *);
-static char * CondCvtArg(char *, double *);
-static Token CondToken(Boolean);
-static Token CondT(Boolean);
-static Token CondF(Boolean);
-static Token CondE(Boolean);
+static void CondPushBack __P((Token));
+static int CondGetArg __P((char **, char **, char *, Boolean));
+static Boolean CondDoDefined __P((int, char *));
+static int CondStrMatch __P((ClientData, ClientData));
+static Boolean CondDoMake __P((int, char *));
+static Boolean CondDoExists __P((int, char *));
+static Boolean CondDoTarget __P((int, char *));
+static char * CondCvtArg __P((char *, double *));
+static Token CondToken __P((Boolean));
+static Token CondT __P((Boolean));
+static Token CondF __P((Boolean));
+static Token CondE __P((Boolean));
 
 static struct If {
@@ -114 +117 @@
     int         formlen;      /* Length of form */
     Boolean     doNot;        /* TRUE if default function should be negated */
-    Boolean     (*defProc)(int, char *); /* Default function to apply */
+    Boolean     (*defProc) __P((int, char *)); /* Default function to apply */
 } ifs[] = {
     { "ifdef",    5,      FALSE,  CondDoDefined },
@@ -126 +129 @@
 static Boolean    condInvert;           /* Invert the default function */
 static Boolean    (*condDefProc)        /* Default function to apply */
-(int, char *);
+                    __P((int, char *));
 static char       *condExpr;            /* The expression to parse */
 static Token      condPushBack=None;    /* Single push-back token used in
@@ -154 +157 @@
  */
 static void
-CondPushBack (Token t)
+CondPushBack (t)
+    Token         t;    /* Token to push back into the "stream" */
 {
     condPushBack = t;
@@ -163 +167 @@
  *-----------------------------------------------------------------------
  * CondGetArg --
- *      Find the argument of a built-in function.  parens is set to TRUE
- *      if the arguments are bounded by parens.
+ *      Find the argument of a built-in function.
  *
  * Results:
@@ -176 +179 @@
  */
 static int
-CondGetArg (char **linePtr, char **argPtr, char *func, Boolean parens)
-{
-    char          *cp;
+CondGetArg (linePtr, argPtr, func, parens)
+    char          **linePtr;
+    char          **argPtr;
+    char          *func;
+    Boolean       parens;       /* TRUE if arg should be bounded by parens */
+{
+    register char *cp;
     int           argLen;
-    Buffer        buf;
+    register Buffer buf;
 
     cp = *linePtr;
@@ -275 +282 @@
  */
 static Boolean
-CondDoDefined (int argLen, char *arg)
+CondDoDefined (argLen, arg)
+    int     argLen;
+    char    *arg;
 {
     char    savec = arg[argLen];
@@ -308 +317 @@
  */
 static int
-CondStrMatch(void *string, void *pattern)
+CondStrMatch(string, pattern)
+    ClientData    string;
+    ClientData    pattern;
 {
     return(!Str_Match((char *) string,(char *) pattern));
@@ -328 +339 @@
  */
 static Boolean
-CondDoMake (int argLen, char *arg)
+CondDoMake (argLen, arg)
+    int     argLen;
+    char    *arg;
 {
     char    savec = arg[argLen];
@@ -334 +347 @@
 
     arg[argLen] = '\0';
-    if (Lst_Find (create, (void *)arg, CondStrMatch) == NULL) {
+    if (Lst_Find (create, (ClientData)arg, CondStrMatch) == NILLNODE) {
         result = FALSE;
     } else {
@@ -358 +371 @@
  */
 static Boolean
-CondDoExists (int argLen, char *arg)
+CondDoExists (argLen, arg)
+    int     argLen;
+    char    *arg;
 {
     char    savec = arg[argLen];
@@ -391 +406 @@
  */
 static Boolean
-CondDoTarget (int argLen, char *arg)
+CondDoTarget (argLen, arg)
+    int     argLen;
+    char    *arg;
 {
     char    savec = arg[argLen];
@@ -399 +416 @@
     arg[argLen] = '\0';
     gn = Targ_FindNode(arg, TARG_NOCREATE);
-    if ((gn != NULL) && !OP_NOP(gn->type)) {
+    if ((gn != NILGNODE) && !OP_NOP(gn->type)) {
         result = TRUE;
     } else {
@@ -430 +447 @@
  */
 static char *
-CondCvtArg(char *str, double *value)
+CondCvtArg(str, value)
+    register char       *str;
+    double              *value;
 {
     if ((*str == '0') && (str[1] == 'x')) {
-        long i;
+        register long i;
 
         for (str += 2, i = 0; ; str++) {
@@ -470 +489 @@
  */
 static Token
-CondToken(Boolean doEval)
+CondToken(doEval)
+    Boolean doEval;
 {
     Token         t;
@@ -649 +669 @@
                     Buf_Destroy(buf, FALSE);
 
-                    DEBUGF(COND, ("lhs = \"%s\", rhs = \"%s\", op = %.2s\n",
-                           lhs, string, op));
+                    if (DEBUG(COND)) {
+                        printf("lhs = \"%s\", rhs = \"%s\", op = %.2s\n",
+                               lhs, string, op);
+                    }
                     /*
                      * Null-terminate rhs and perform the comparison.
@@ -697 +719 @@
                     } else {
                         char *c = CondCvtArg(rhs, &right);
-                        if (*c != '\0' && !isspace((unsigned char) *c))
+                        if (*c != '\0' && !isspace(*c))
                             goto do_string_compare;
                         if (rhs == condExpr) {
@@ -710 +732 @@
                     }
 
-                    DEBUGF(COND, ("left = %f, right = %f, op = %.2s\n", left,
-                           right, op));
+                    if (DEBUG(COND)) {
+                        printf("left = %f, right = %f, op = %.2s\n", left,
+                               right, op);
+                    }
                     switch(op[0]) {
                     case '!':
@@ -743 +767 @@
                         }
                         break;
-                    default:
-                        break;
                     }
                 }
@@ -753 +775 @@
             }
             default: {
-                Boolean (*evalProc)(int, char *);
+                Boolean (*evalProc) __P((int, char *));
                 Boolean invert = FALSE;
                 char    *arg;
@@ -906 +928 @@
  */
 static Token
-CondT(Boolean doEval)
+CondT(doEval)
+    Boolean doEval;
 {
     Token   t;
@@ -955 +978 @@
  */
 static Token
-CondF(Boolean doEval)
+CondF(doEval)
+    Boolean doEval;
 {
     Token   l, o;
@@ -1002 +1026 @@
  */
 static Token
-CondE(Boolean doEval)
+CondE(doEval)
+    Boolean doEval;
 {
     Token   l, o;
@@ -1057 +1082 @@
  */
 int
-Cond_Eval (char *line)
+Cond_Eval (line)
+    char            *line;    /* Line to parse */
 {
     struct If       *ifp;
@@ -1238 +1264 @@
  */
 void
-Cond_End(void)
+Cond_End()
 {
     if (condTop != MAXIF) {

branches/FREEBSD/src/kmk/config.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)config.h    8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/config.h,v 1.12 2002/09/17 21:29:06 jmallett Exp $
+ *      from: @(#)config.h      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/config.h,v 1.9 1999/09/10 20:51:59 julian Exp $
  */
+
+#define DEFSHELL        1                       /* Bourne shell */
 
 /*
@@ -50 +51 @@
  *      to 0, nothing will ever happen...
  */
-#define DEFMAXJOBS      4
-#define DEFMAXLOCAL     1
+#define DEFMAXJOBS      4
+#define DEFMAXLOCAL     1
 
 /*
@@ -62 +63 @@
  *      See suff.c for more details.
  */
-#define INCLUDES
-#define LIBRARIES
+#define INCLUDES
+#define LIBRARIES
 
 /*
@@ -90 +91 @@
  *      - Allow empty command lines if starting with tab.
  */
-#define POSIX
+#define POSIX
 
 /*
@@ -98 +99 @@
  *      Recognize system V like ${VAR:x=y} variable substitutions
  */
-#define SYSVINCLUDE
-#define SYSVVARSUB
+#define SYSVINCLUDE
+#define SYSVVARSUB
 
 /*
@@ -108 +109 @@
  *                              # of ${VAR}
  */
-#define SUNSHCMD
+#define SUNSHCMD
 
 #if !defined(__svr4__) && !defined(__SVR4) && !defined(__ELF__)

branches/FREEBSD/src/kmk/dir.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)dir.c    8.2 (Berkeley) 1/2/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/dir.c,v 1.30 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)dir.c       8.2 (Berkeley) 1/2/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/dir.c,v 1.10.2.1 2001/02/13 03:13:57 will Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -88 +91 @@
 #include <stdio.h>
 #include <sys/types.h>
+#include <dirent.h>
 #include <sys/stat.h>
-#include <dirent.h>
-#include <err.h>
 #include "make.h"
 #include "hash.h"
@@ -190 +192 @@
 
 
-static int DirFindName(void *, void *);
-static int DirMatchFiles(char *, Path *, Lst);
-static void DirExpandCurly(char *, char *, Lst, Lst);
-static void DirExpandInt(char *, Lst, Lst);
-static int DirPrintWord(void *, void *);
-static int DirPrintDir(void *, void *);
+static int DirFindName __P((ClientData, ClientData));
+static int DirMatchFiles __P((char *, Path *, Lst));
+static void DirExpandCurly __P((char *, char *, Lst, Lst));
+static void DirExpandInt __P((char *, Lst, Lst));
+static int DirPrintWord __P((ClientData, ClientData));
+static int DirPrintDir __P((ClientData, ClientData));
 
 /*-
@@ -210 +212 @@
  */
 void
-Dir_Init (void)
+Dir_Init ()
 {
     dirSearchPath = Lst_Init (FALSE);
@@ -247 +249 @@
  */
 void
-Dir_End(void)
+Dir_End()
 {
     dot->refCount -= 1;
-    Dir_Destroy((void *) dot);
+    Dir_Destroy((ClientData) dot);
     Dir_ClearPath(dirSearchPath);
     Lst_Destroy(dirSearchPath, NOFREE);
@@ -273 +275 @@
  */
 static int
-DirFindName (void *p, void *dname)
+DirFindName (p, dname)
+    ClientData    p;          /* Current name */
+    ClientData    dname;      /* Desired name */
 {
     return (strcmp (((Path *)p)->name, (char *) dname));
@@ -281 +285 @@
  *-----------------------------------------------------------------------
  * Dir_HasWildcards  --
- *      See if the given name has any wildcard characters in it.
+ *      see if the given name has any wildcard characters in it
  *
  * Results:
@@ -291 +295 @@
  */
 Boolean
-Dir_HasWildcards (char *name)
-{
-    char *cp;
-    int wild = 0, brace = 0, bracket = 0;
+Dir_HasWildcards (name)
+    char          *name;        /* name to check */
+{
+    register char *cp;
 
     for (cp = name; *cp; cp++) {
         switch(*cp) {
         case '{':
-                brace++;
-                wild = 1;
-                break;
-        case '}':
-                brace--;
-                break;
         case '[':
-                bracket++;
-                wild = 1;
-                break;
-        case ']':
-                bracket--;
-                break;
         case '?':
         case '*':
-                wild = 1;
-                break;
-        default:
-                break;
-        }
-    }
-    return wild && bracket == 0 && brace == 0;
+            return (TRUE);
+        }
+    }
+    return (FALSE);
 }
 
@@ -341 +330 @@
  */
 static int
-DirMatchFiles (char *pattern, Path *p, Lst expansions)
+DirMatchFiles (pattern, p, expansions)
+    char          *pattern;     /* Pattern to look for */
+    Path          *p;           /* Directory to search */
+    Lst           expansions;   /* Place to store the results */
 {
     Hash_Search   search;       /* Index into the directory's table */
@@ -378 +370 @@
  *      Note the special case: if after the piece of the curly brace is
  *      done there are no wildcard characters in the result, the result is
- *      placed on the list WITHOUT CHECKING FOR ITS EXISTENCE.  The
- *      given arguments are the entire word to expand, the first curly
- *      brace in the word, the search path, and the list to store the
- *      expansions in.
+ *      placed on the list WITHOUT CHECKING FOR ITS EXISTENCE.
  *
  * Results:
@@ -392 +381 @@
  */
 static void
-DirExpandCurly(char *word, char *brace, Lst path, Lst expansions)
+DirExpandCurly(word, brace, path, expansions)
+    char          *word;        /* Entire word to expand */
+    char          *brace;       /* First curly brace in it */
+    Lst           path;         /* Search path to use */
+    Lst           expansions;   /* Place to store the expansions */
 {
     char          *end;         /* Character after the closing brace */
@@ -466 +459 @@
                 Dir_Expand(file, path, expansions);
                 goto next;
-            default:
-                break;
             }
         }
@@ -490 +481 @@
  *      Internal expand routine. Passes through the directories in the
  *      path one by one, calling DirMatchFiles for each. NOTE: This still
- *      doesn't handle patterns in directories...  Works given a word to
- *      expand, a path to look in, and a list to store expansions in.
+ *      doesn't handle patterns in directories...
  *
  * Results:
@@ -502 +492 @@
  */
 static void
-DirExpandInt(char *word, Lst path, Lst expansions)
+DirExpandInt(word, path, expansions)
+    char          *word;        /* Word to expand */
+    Lst           path;         /* Path on which to look */
+    Lst           expansions;   /* Place to store the result */
 {
     LstNode       ln;           /* Current node */
@@ -508 +501 @@
 
     if (Lst_Open(path) == SUCCESS) {
-        while ((ln = Lst_Next(path)) != NULL) {
+        while ((ln = Lst_Next(path)) != NILLNODE) {
             p = (Path *)Lst_Datum(ln);
             DirMatchFiles(word, p, expansions);
@@ -531 +524 @@
  */
 static int
-DirPrintWord(void *word, void *dummy __unused)
-{
-    DEBUGF(DIR, ("%s ", (char *) word));
-
-    return (0);
+DirPrintWord(word, dummy)
+    ClientData  word;
+    ClientData  dummy;
+{
+    printf("%s ", (char *) word);
+
+    return(dummy ? 0 : 0);
 }
 
@@ -546 +541 @@
  * Results:
  *      A list of words consisting of the files which exist along the search
- *      path matching the given pattern is placed in expansions.
+ *      path matching the given pattern.
  *
  * Side Effects:
@@ -553 +548 @@
  */
 void
-Dir_Expand (char *word, Lst path, Lst expansions)
+Dir_Expand (word, path, expansions)
+    char    *word;      /* the word to expand */
+    Lst     path;       /* the list of directories in which to find
+                         * the resulting files */
+    Lst     expansions; /* the list on which to place the results */
 {
     char          *cp;
 
-    DEBUGF(DIR, ("expanding \"%s\"...", word));
+    if (DEBUG(DIR)) {
+        printf("expanding \"%s\"...", word);
+    }
 
     cp = strchr(word, '{');
@@ -640 +641 @@
     }
     if (DEBUG(DIR)) {
-        Lst_ForEach(expansions, DirPrintWord, (void *) 0);
-        DEBUGF(DIR, ("\n"));
+        Lst_ForEach(expansions, DirPrintWord, (ClientData) 0);
+        fputc('\n', stdout);
     }
 }
@@ -664 +665 @@
  */
 char *
-Dir_FindFile (char *name, Lst path)
-{
-    char          *p1;      /* pointer into p->name */
-    char          *p2;      /* pointer into name */
+Dir_FindFile (name, path)
+    char          *name;    /* the file to find */
+    Lst           path;     /* the Lst of directories to search */
+{
+    register char *p1;      /* pointer into p->name */
+    register char *p2;      /* pointer into name */
     LstNode       ln;       /* a list element */
-    char          *file;    /* the current filename to check */
-    Path          *p;       /* current path member */
-    char          *cp;      /* index of first slash, if any */
+    register char *file;    /* the current filename to check */
+    register Path *p;       /* current path member */
+    register char *cp;      /* index of first slash, if any */
     Boolean       hasSlash; /* true if 'name' contains a / */
     struct stat   stb;      /* Buffer for stat, if necessary */
@@ -689 +692 @@
     }
 
-    DEBUGF(DIR, ("Searching for %s...", name));
+    if (DEBUG(DIR)) {
+        printf("Searching for %s...", name);
+    }
     /*
      * No matter what, we always look for the file in the current directory
@@ -698 +703 @@
     if ((!hasSlash || (cp - name == 2 && *name == '.')) &&
         (Hash_FindEntry (&dot->files, cp) != (Hash_Entry *)NULL)) {
-            DEBUGF(DIR, ("in '.'\n"));
+            if (DEBUG(DIR)) {
+                printf("in '.'\n");
+            }
             hits += 1;
             dot->hits += 1;
@@ -705 +712 @@
 
     if (Lst_Open (path) == FAILURE) {
-        DEBUGF(DIR, ("couldn't open path, file not found\n"));
+        if (DEBUG(DIR)) {
+            printf("couldn't open path, file not found\n");
+        }
         misses += 1;
         return ((char *) NULL);
@@ -718 +727 @@
      * we go on to phase two...
      */
-    while ((ln = Lst_Next (path)) != NULL) {
+    while ((ln = Lst_Next (path)) != NILLNODE) {
         p = (Path *) Lst_Datum (ln);
-        DEBUGF(DIR, ("%s...", p->name));
+        if (DEBUG(DIR)) {
+            printf("%s...", p->name);
+        }
         if (Hash_FindEntry (&p->files, cp) != (Hash_Entry *)NULL) {
-            DEBUGF(DIR, ("here..."));
+            if (DEBUG(DIR)) {
+                printf("here...");
+            }
             if (hasSlash) {
                 /*
@@ -738 +751 @@
                 }
                 if (p2 >= name || (p1 >= p->name && *p1 != '/')) {
-                    DEBUGF(DIR, ("component mismatch -- continuing..."));
+                    if (DEBUG(DIR)) {
+                        printf("component mismatch -- continuing...");
+                    }
                     continue;
                 }
             }
             file = str_concat (p->name, cp, STR_ADDSLASH);
-            DEBUGF(DIR, ("returning %s\n", file));
+            if (DEBUG(DIR)) {
+                printf("returning %s\n", file);
+            }
             Lst_Close (path);
             p->hits += 1;
@@ -758 +775 @@
             }
             if (*p1 == '\0' && p2 == cp - 1) {
-                DEBUGF(DIR, ("must be here but isn't -- returing NULL\n"));
+                if (DEBUG(DIR)) {
+                    printf("must be here but isn't -- returing NULL\n");
+                }
                 Lst_Close (path);
                 return ((char *) NULL);
@@ -778 +797 @@
      */
     if (!hasSlash) {
-        DEBUGF(DIR, ("failed.\n"));
+        if (DEBUG(DIR)) {
+            printf("failed.\n");
+        }
         misses += 1;
         return ((char *) NULL);
@@ -786 +807 @@
         Boolean checkedDot = FALSE;
 
-        DEBUGF(DIR, ("failed. Trying subdirectories..."));
+        if (DEBUG(DIR)) {
+            printf("failed. Trying subdirectories...");
+        }
         (void) Lst_Open (path);
-        while ((ln = Lst_Next (path)) != NULL) {
+        while ((ln = Lst_Next (path)) != NILLNODE) {
             p = (Path *) Lst_Datum (ln);
             if (p != dot) {
@@ -799 +822 @@
                 checkedDot = TRUE;
             }
-            DEBUGF(DIR, ("checking %s...", file));
+            if (DEBUG(DIR)) {
+                printf("checking %s...", file);
+            }
+
 
             if (stat (file, &stb) == 0) {
-                DEBUGF(DIR, ("got it.\n"));
+                if (DEBUG(DIR)) {
+                    printf("got it.\n");
+                }
 
                 Lst_Close (path);
@@ -825 +853 @@
                  * to fetch it again.
                  */
-                DEBUGF(DIR, ("Caching %s for %s\n", Targ_FmtTime(stb.st_mtime), file));
+                if (DEBUG(DIR)) {
+                    printf("Caching %s for %s\n", Targ_FmtTime(stb.st_mtime),
+                            file);
+                }
                 entry = Hash_CreateEntry(&mtimes, (char *) file,
                                          (Boolean *)NULL);
@@ -836 +867 @@
         }
 
-        DEBUGF(DIR, ("failed. "));
+        if (DEBUG(DIR)) {
+            printf("failed. ");
+        }
         Lst_Close (path);
 
@@ -844 +877 @@
              * so no point in proceeding...
              */
-            DEBUGF(DIR, ("Checked . already, returning NULL\n"));
+            if (DEBUG(DIR)) {
+                printf("Checked . already, returning NULL\n");
+            }
             return(NULL);
         }
@@ -873 +908 @@
     bigmisses += 1;
     ln = Lst_Last (path);
-    if (ln == NULL) {
+    if (ln == NILLNODE) {
         return ((char *) NULL);
     } else {
@@ -885 +920 @@
     }
 #else /* !notdef */
-    DEBUGF(DIR, ("Looking for \"%s\"...", name));
+    if (DEBUG(DIR)) {
+        printf("Looking for \"%s\"...", name);
+    }
 
     bigmisses += 1;
     entry = Hash_FindEntry(&mtimes, name);
     if (entry != (Hash_Entry *)NULL) {
-        DEBUGF(DIR, ("got it (in mtime cache)\n"));
-        return (estrdup(name));
+        if (DEBUG(DIR)) {
+            printf("got it (in mtime cache)\n");
+        }
+        return(estrdup(name));
     } else if (stat (name, &stb) == 0) {
         entry = Hash_CreateEntry(&mtimes, name, (Boolean *)NULL);
-        DEBUGF(DIR, ("Caching %s for %s\n", Targ_FmtTime(stb.st_mtime), name));
+        if (DEBUG(DIR)) {
+            printf("Caching %s for %s\n", Targ_FmtTime(stb.st_mtime),
+                    name);
+        }
         Hash_SetValue(entry, (long)stb.st_mtime);
         return (estrdup (name));
     } else {
-        DEBUGF(DIR, ("failed. Returning NULL\n"));
+        if (DEBUG(DIR)) {
+            printf("failed. Returning NULL\n");
+        }
         return ((char *)NULL);
     }
@@ -920 +964 @@
  */
 int
-Dir_MTime (GNode *gn)
+Dir_MTime (gn)
+    GNode         *gn;        /* the file whose modification time is
+                               * desired */
 {
     char          *fullName;  /* the full pathname of name */
@@ -943 +989 @@
          * Only do this once -- the second time folks are checking to
          * see if the file was actually updated, so we need to actually go
-         * to the filesystem.
+         * to the file system.
          */
-        DEBUGF(DIR, ("Using cached time %s for %s\n",
-               Targ_FmtTime((time_t)(long)Hash_GetValue(entry)), fullName));
+        if (DEBUG(DIR)) {
+            printf("Using cached time %s for %s\n",
+                    Targ_FmtTime((time_t)(long)Hash_GetValue(entry)), fullName);
+        }
         stb.st_mtime = (time_t)(long)Hash_GetValue(entry);
         Hash_DeleteEntry(&mtimes, entry);
@@ -982 +1030 @@
  */
 void
-Dir_AddDir (Lst path, char *name)
+Dir_AddDir (path, name)
+    Lst           path;       /* the path to which the directory should be
+                               * added */
+    char          *name;      /* the name of the directory to add */
 {
     LstNode       ln;         /* node in case Path structure is found */
-    Path          *p;         /* pointer to new Path structure */
+    register Path *p;         /* pointer to new Path structure */
     DIR           *d;         /* for reading directory */
-    struct dirent *dp;        /* entry in directory */
-
-    ln = Lst_Find (openDirectories, (void *)name, DirFindName);
-    if (ln != NULL) {
+    register struct dirent *dp; /* entry in directory */
+
+    ln = Lst_Find (openDirectories, (ClientData)name, DirFindName);
+    if (ln != NILLNODE) {
         p = (Path *)Lst_Datum (ln);
-        if (Lst_Member(path, (void *)p) == NULL) {
+        if (Lst_Member(path, (ClientData)p) == NILLNODE) {
             p->refCount += 1;
-            (void)Lst_AtEnd (path, (void *)p);
+            (void)Lst_AtEnd (path, (ClientData)p);
         }
     } else {
-        DEBUGF(DIR, ("Caching %s...", name));
+        if (DEBUG(DIR)) {
+            printf("Caching %s...", name);
+            fflush(stdout);
+        }
 
         if ((d = opendir (name)) != (DIR *) NULL) {
@@ -1007 +1061 @@
 
             while ((dp = readdir (d)) != (struct dirent *) NULL) {
-#if defined(sun) && defined(d_ino) /* d_ino is a sunos4 #define for d_fileno */
+#if defined(sun) && defined(d_ino) /* d_ino is a sunos4 #define for d_fileno */
                 /*
                  * The sun directory library doesn't check for a 0 inode
@@ -1022 +1076 @@
                  * that order when first going through a directory.  This is
                  * needed for XFS over NFS filesystems since SGI does not
-                 * guarantee that these are the first two entries returned
+                 * guarantee that these are * the first two entries returned
                  * from readdir().
                  */
@@ -1031 +1085 @@
             }
             (void) closedir (d);
-            (void)Lst_AtEnd (openDirectories, (void *)p);
-            (void)Lst_AtEnd (path, (void *)p);
-        }
-        DEBUGF(DIR, ("done\n"));
+            (void)Lst_AtEnd (openDirectories, (ClientData)p);
+            (void)Lst_AtEnd (path, (ClientData)p);
+        }
+        if (DEBUG(DIR)) {
+            printf("done\n");
+        }
     }
 }
@@ -1052 +1108 @@
  *-----------------------------------------------------------------------
  */
-void *
-Dir_CopyDir(void *p)
+ClientData
+Dir_CopyDir(p)
+    ClientData p;
 {
     ((Path *) p)->refCount += 1;
 
-    return ((void *)p);
+    return ((ClientData)p);
 }
 
@@ -1078 +1135 @@
  */
 char *
-Dir_MakeFlags (char *flag, Lst path)
+Dir_MakeFlags (flag, path)
+    char          *flag;  /* flag which should precede each directory */
+    Lst           path;   /* list of directories */
 {
     char          *str;   /* the string which will be returned */
@@ -1088 +1147 @@
 
     if (Lst_Open (path) == SUCCESS) {
-        while ((ln = Lst_Next (path)) != NULL) {
+        while ((ln = Lst_Next (path)) != NILLNODE) {
             p = (Path *) Lst_Datum (ln);
             tstr = str_concat (flag, p->name, 0);
@@ -1115 +1174 @@
  */
 void
-Dir_Destroy (void *pp)
+Dir_Destroy (pp)
+    ClientData    pp;       /* The directory descriptor to nuke */
 {
     Path          *p = (Path *) pp;
@@ -1123 +1183 @@
         LstNode ln;
 
-        ln = Lst_Member (openDirectories, (void *)p);
+        ln = Lst_Member (openDirectories, (ClientData)p);
         (void) Lst_Remove (openDirectories, ln);
 
         Hash_DeleteTable (&p->files);
-        free(p->name);
-        free(p);
+        free((Address)p->name);
+        free((Address)p);
     }
 }
@@ -1147 +1207 @@
  */
 void
-Dir_ClearPath(Lst path)
+Dir_ClearPath(path)
+    Lst     path;       /* Path to clear */
 {
     Path    *p;
     while (!Lst_IsEmpty(path)) {
         p = (Path *)Lst_DeQueue(path);
-        Dir_Destroy((void *) p);
+        Dir_Destroy((ClientData) p);
     }
 }
@@ -1172 +1233 @@
  */
 void
-Dir_Concat(Lst path1, Lst path2)
+Dir_Concat(path1, path2)
+    Lst     path1;      /* Dest */
+    Lst     path2;      /* Source */
 {
     LstNode ln;
     Path    *p;
 
-    for (ln = Lst_First(path2); ln != NULL; ln = Lst_Succ(ln)) {
+    for (ln = Lst_First(path2); ln != NILLNODE; ln = Lst_Succ(ln)) {
         p = (Path *)Lst_Datum(ln);
-        if (Lst_Member(path1, (void *)p) == NULL) {
+        if (Lst_Member(path1, (ClientData)p) == NILLNODE) {
             p->refCount += 1;
-            (void)Lst_AtEnd(path1, (void *)p);
+            (void)Lst_AtEnd(path1, (ClientData)p);
         }
     }
@@ -1188 +1251 @@
 /********** DEBUG INFO **********/
 void
-Dir_PrintDirectories(void)
+Dir_PrintDirectories()
 {
     LstNode     ln;
@@ -1200 +1263 @@
     printf ("# %-20s referenced\thits\n", "directory");
     if (Lst_Open (openDirectories) == SUCCESS) {
-        while ((ln = Lst_Next (openDirectories)) != NULL) {
+        while ((ln = Lst_Next (openDirectories)) != NILLNODE) {
             p = (Path *) Lst_Datum (ln);
             printf ("# %-20s %10d\t%4d\n", p->name, p->refCount, p->hits);
@@ -1208 +1271 @@
 }
 
-static int
-DirPrintDir (void *p, void *dummy __unused)
+static int DirPrintDir (p, dummy)
+    ClientData  p;
+    ClientData  dummy;
 {
     printf ("%s ", ((Path *) p)->name);
-
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
 void
-Dir_PrintPath (Lst path)
-{
-    Lst_ForEach (path, DirPrintDir, (void *)0);
-}
+Dir_PrintPath (path)
+    Lst path;
+{
+    Lst_ForEach (path, DirPrintDir, (ClientData)0);
+}

branches/FREEBSD/src/kmk/dir.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)dir.h       8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/dir.h,v 1.10 2002/04/13 10:57:56 obrien Exp $
+ *      from: @(#)dir.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/dir.h,v 1.7 1999/08/28 01:03:29 peter Exp $
  */
 
@@ -55 +54 @@
 } Path;
 
-void Dir_Init(void);
-void Dir_End(void);
-Boolean Dir_HasWildcards(char *);
-void Dir_Expand(char *, Lst, Lst);
-char *Dir_FindFile(char *, Lst);
-int Dir_MTime(GNode *);
-void Dir_AddDir(Lst, char *);
-char *Dir_MakeFlags(char *, Lst);
-void Dir_ClearPath(Lst);
-void Dir_Concat(Lst, Lst);
-void Dir_PrintDirectories(void);
-void Dir_PrintPath(Lst);
-void Dir_Destroy(void *);
-void * Dir_CopyDir(void *);
+void Dir_Init __P((void));
+void Dir_End __P((void));
+Boolean Dir_HasWildcards __P((char *));
+void Dir_Expand __P((char *, Lst, Lst));
+char *Dir_FindFile __P((char *, Lst));
+int Dir_MTime __P((GNode *));
+void Dir_AddDir __P((Lst, char *));
+char *Dir_MakeFlags __P((char *, Lst));
+void Dir_ClearPath __P((Lst));
+void Dir_Concat __P((Lst, Lst));
+void Dir_PrintDirectories __P((void));
+void Dir_PrintPath __P((Lst));
+void Dir_Destroy __P((ClientData));
+ClientData Dir_CopyDir __P((ClientData));
 
 #endif /* _DIR */

branches/FREEBSD/src/kmk/for.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas.
+ * Copyright (c) 1992, The Regents of the University of California.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +30 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)for.c    8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/for.c,v 1.19 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)for.c       8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/for.c,v 1.10 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -84 +85 @@
 } For;
 
-static int ForExec(void *, void *);
+static int ForExec      __P((ClientData, ClientData));
 
 
@@ -108 +109 @@
  */
 int
-For_Eval (char *line)
+For_Eval (line)
+    char            *line;    /* Line to parse */
 {
     char            *ptr = line, *sub, *wrd;
@@ -176 +178 @@
         sub = Var_Subst(NULL, ptr, VAR_GLOBAL, FALSE);
 
-#define ADDWORD() \
+#define ADDWORD() \
         Buf_AddBytes(buf, ptr - wrd, (Byte *) wrd), \
         Buf_AddByte(buf, (Byte) '\0'), \
-        Lst_AtFront(forLst, (void *) Buf_GetAll(buf, &varlen)), \
+        Lst_AtFront(forLst, (ClientData) Buf_GetAll(buf, &varlen)), \
         Buf_Destroy(buf, FALSE)
 
@@ -193 +195 @@
                 wrd = ptr--;
             }
-        DEBUGF(FOR, ("For: Iterator %s List %s\n", forVar, sub));
+        if (DEBUG(FOR))
+            (void) fprintf(stderr, "For: Iterator %s List %s\n", forVar, sub);
         if (ptr - wrd > 0)
             ADDWORD();
         else
             Buf_Destroy(buf, TRUE);
-        free(sub);
+        free((Address) sub);
 
         forBuf = Buf_Init(0);
@@ -211 +214 @@
         if (strncmp(ptr, "endfor", 6) == 0 &&
             (isspace((unsigned char) ptr[6]) || !ptr[6])) {
-            DEBUGF(FOR, ("For: end for %d\n", forLevel));
+            if (DEBUG(FOR))
+                (void) fprintf(stderr, "For: end for %d\n", forLevel);
             if (--forLevel < 0) {
                 Parse_Error (level, "for-less endfor");
@@ -220 +224 @@
                  isspace((unsigned char) ptr[3])) {
             forLevel++;
-            DEBUGF(FOR, ("For: new loop %d\n", forLevel));
+            if (DEBUG(FOR))
+                (void) fprintf(stderr, "For: new loop %d\n", forLevel);
         }
     }
@@ -248 +253 @@
  */
 static int
-ForExec(void *namep, void *argp)
+ForExec(namep, argp)
+    ClientData namep;
+    ClientData argp;
 {
     char *name = (char *) namep;
@@ -254 +261 @@
     int len;
     Var_Set(arg->var, name, VAR_GLOBAL);
-    DEBUGF(FOR, ("--- %s = %s\n", arg->var, name));
+    if (DEBUG(FOR))
+        (void) fprintf(stderr, "--- %s = %s\n", arg->var, name);
     Parse_FromString(Var_Subst(arg->var, (char *) Buf_GetAll(arg->buf, &len),
                                VAR_GLOBAL, FALSE));
@@ -278 +286 @@
  */
 void
-For_Run(void)
+For_Run()
 {
     For arg;
@@ -291 +299 @@
     forLst = NULL;
 
-    Lst_ForEach(arg.lst, ForExec, (void *) &arg);
-
-    free(arg.var);
-    Lst_Destroy(arg.lst, (void (*)(void *)) free);
+    Lst_ForEach(arg.lst, ForExec, (ClientData) &arg);
+
+    free((Address)arg.var);
+    Lst_Destroy(arg.lst, (void (*) __P((ClientData))) free);
     Buf_Destroy(arg.buf, TRUE);
 }

branches/FREEBSD/src/kmk/hash.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)hash.c   8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/hash.c,v 1.18 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)hash.c      8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/hash.c,v 1.9 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /* hash.c --
@@ -50 +53 @@
  *      information increases.
  */
-#include <unistd.h>
 #include "sprite.h"
 #include "make.h"
@@ -60 +62 @@
  */
 
-static void RebuildTable(Hash_Table *);
+static void RebuildTable __P((Hash_Table *));
 
 /*
@@ -67 +69 @@
  */
 
-#define rebuildLimit 8
+#define rebuildLimit 8
 
 /*
@@ -73 +75 @@
  *
  * Hash_InitTable --
- * 
- *      Set up the hash table t with a given number of buckets, or a
- *      reasonable default if the number requested is less than or
- *      equal to zero.  Hash tables will grow in size as needed.
- *
+ *
+ *      This routine just sets up the hash table.
  *
  * Results:
@@ -89 +88 @@
 
 void
-Hash_InitTable(Hash_Table *t, int numBuckets)
-{
-        int i;
-        struct Hash_Entry **hp;
+Hash_InitTable(t, numBuckets)
+        register Hash_Table *t; /* Structure to use to hold table. */
+        int numBuckets;         /* How many buckets to create for starters.
+                                 * This number is rounded up to a power of
+                                 * two.   If <= 0, a reasonable default is
+                                 * chosen. The table will grow in size later
+                                 * as needed. */
+{
+        register int i;
+        register struct Hash_Entry **hp;
 
         /*
@@ -130 +135 @@
 
 void
-Hash_DeleteTable(Hash_Table *t)
-{
-        struct Hash_Entry **hp, *h, *nexth = NULL;
-        int i;
+Hash_DeleteTable(t)
+        Hash_Table *t;
+{
+        register struct Hash_Entry **hp, *h, *nexth = NULL;
+        register int i;
 
         for (hp = t->bucketPtr, i = t->size; --i >= 0;) {
@@ -169 +175 @@
 
 Hash_Entry *
-Hash_FindEntry(Hash_Table *t, char *key)
-{
-        Hash_Entry *e;
-        unsigned h;
-        char *p;
+Hash_FindEntry(t, key)
+        Hash_Table *t;          /* Hash table to search. */
+        char *key;              /* A hash key. */
+{
+        register Hash_Entry *e;
+        register unsigned h;
+        register char *p;
 
         for (h = 0, p = key; *p;)
@@ -204 +212 @@
 
 Hash_Entry *
-Hash_CreateEntry(Hash_Table *t, char *key, Boolean *newPtr)
-{
-        Hash_Entry *e;
-        unsigned int h;
-        char *p;
+Hash_CreateEntry(t, key, newPtr)
+        register Hash_Table *t; /* Hash table to search. */
+        char *key;              /* A hash key. */
+        Boolean *newPtr;        /* Filled in with TRUE if new entry created,
+                                 * FALSE otherwise. */
+{
+        register Hash_Entry *e;
+        register unsigned h;
+        register char *p;
         int keylen;
         struct Hash_Entry **hp;
@@ -267 +279 @@
 
 void
-Hash_DeleteEntry(Hash_Table *t, Hash_Entry *e)
-{
-        Hash_Entry **hp, *p;
+Hash_DeleteEntry(t, e)
+        Hash_Table *t;
+        Hash_Entry *e;
+{
+        register Hash_Entry **hp, *p;
 
         if (e == NULL)
@@ -282 +296 @@
                 }
         }
-        (void) write(STDERR_FILENO, "bad call to Hash_DeleteEntry\n", 29);
+        (void) write(2, "bad call to Hash_DeleteEntry\n", 29);
         abort();
 }
@@ -306 +320 @@
 
 Hash_Entry *
-Hash_EnumFirst(Hash_Table *t, Hash_Search *searchPtr)
+Hash_EnumFirst(t, searchPtr)
+        Hash_Table *t;                  /* Table to be searched. */
+        register Hash_Search *searchPtr;/* Area in which to keep state
+                                         * about search.*/
 {
         searchPtr->tablePtr = t;
@@ -333 +350 @@
 
 Hash_Entry *
-Hash_EnumNext(Hash_Search *searchPtr)
-{
-        Hash_Entry *e;
+Hash_EnumNext(searchPtr)
+        register Hash_Search *searchPtr; /* Area used to keep state about
+                                            search. */
+{
+        register Hash_Entry *e;
         Hash_Table *t = searchPtr->tablePtr;
 
         /*
          * The hashEntryPtr field points to the most recently returned
-         * entry, or is NULL if we are starting up.  If not NULL, we have
+         * entry, or is nil if we are starting up.  If not nil, we have
          * to start at the next one in the chain.
          */
@@ -377 +396 @@
 
 static void
-RebuildTable(Hash_Table *t)
-{
-        Hash_Entry *e, *next = NULL, **hp, **xp;
-        int i, mask;
-        Hash_Entry **oldhp;
+RebuildTable(t)
+        register Hash_Table *t;
+{
+        register Hash_Entry *e, *next = NULL, **hp, **xp;
+        register int i, mask;
+        register Hash_Entry **oldhp;
         int oldsize;
 

branches/FREEBSD/src/kmk/hash.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)hash.h      8.1 (Berkeley) 6/6/93
- * $FreeBSD: src/usr.bin/make/hash.h,v 1.12 2002/09/17 21:29:06 jmallett Exp $
+ *      from: @(#)hash.h        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/hash.h,v 1.8 1999/08/28 01:03:30 peter Exp $
  */
 
@@ -58 +57 @@
                                          * entries associated with the same
                                          * bucket. */
-    void *            clientData;       /* Arbitrary piece of data associated
+    ClientData        clientData;       /* Arbitrary piece of data associated
                                          * with key. */
     unsigned          namehash;         /* hash value of key */
@@ -88 +87 @@
 
 /*
- * void * Hash_GetValue(h)
+ * ClientData Hash_GetValue(h)
  *     Hash_Entry *h;
  */
 
-#define Hash_GetValue(h) ((h)->clientData)
+#define Hash_GetValue(h) ((h)->clientData)
 
 /*
@@ -100 +99 @@
  */
 
-#define Hash_SetValue(h, val) ((h)->clientData = (void *) (val))
+#define Hash_SetValue(h, val) ((h)->clientData = (ClientData) (val))
 
 /*
@@ -108 +107 @@
 #define Hash_Size(n)    (((n) + sizeof (int) - 1) / sizeof (int))
 
-void Hash_InitTable(Hash_Table *, int);
-void Hash_DeleteTable(Hash_Table *);
-Hash_Entry *Hash_FindEntry(Hash_Table *, char *);
-Hash_Entry *Hash_CreateEntry(Hash_Table *, char *, Boolean *);
-void Hash_DeleteEntry(Hash_Table *, Hash_Entry *);
-Hash_Entry *Hash_EnumFirst(Hash_Table *, Hash_Search *);
-Hash_Entry *Hash_EnumNext(Hash_Search *);
+void Hash_InitTable __P((Hash_Table *, int));
+void Hash_DeleteTable __P((Hash_Table *));
+Hash_Entry *Hash_FindEntry __P((Hash_Table *, char *));
+Hash_Entry *Hash_CreateEntry __P((Hash_Table *, char *, Boolean *));
+void Hash_DeleteEntry __P((Hash_Table *, Hash_Entry *));
+Hash_Entry *Hash_EnumFirst __P((Hash_Table *, Hash_Search *));
+Hash_Entry *Hash_EnumNext __P((Hash_Search *));
 
 #endif /* _HASH */

branches/FREEBSD/src/kmk/job.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)job.c    8.2 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/job.c,v 1.45 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)job.c       8.2 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/job.c,v 1.17.2.2 2001/02/13 03:13:57 will Exp $";
+#endif
+#endif /* not lint */
 
 #ifndef OLD_JOKE
-#define OLD_JOKE 0
+#define OLD_JOKE 0
 #endif /* OLD_JOKE */
 
@@ -84 +87 @@
  *                              FAILURE if the spec was incorrect.
  *
- *      Job_Finish                      Perform any final processing which needs doing.
+ *      Job_End                 Perform any final processing which needs doing.
  *                              This includes the execution of any commands
  *                              which have been/were attached to the .END
@@ -107 +110 @@
 #include <sys/file.h>
 #include <sys/time.h>
-#include <sys/event.h>
 #include <sys/wait.h>
-#include <err.h>
+#include <fcntl.h>
 #include <errno.h>
-#include <fcntl.h>
+#include <utime.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
-#include <unistd.h>
-#include <utime.h>
 #include "make.h"
 #include "hash.h"
@@ -134 +134 @@
 static int      errors = 0;         /* number of errors reported */
 static int      aborting = 0;       /* why is the make aborting? */
-#define ABORT_ERROR     1           /* Because of an error */
-#define ABORT_INTERRUPT 2           /* Because it was interrupted */
-#define ABORT_WAIT      3           /* Waiting for jobs to finish */
+#define ABORT_ERROR     1           /* Because of an error */
+#define ABORT_INTERRUPT 2           /* Because it was interrupted */
+#define ABORT_WAIT      3           /* Waiting for jobs to finish */
 
 /*
@@ -142 +142 @@
  * is a char! So when we go above 127 we turn negative!
  */
-#define FILENO(a) ((unsigned) fileno(a))
+#define FILENO(a) ((unsigned) fileno(a))
 
 /*
@@ -158 +158 @@
  * Return values from JobStart.
  */
-#define JOB_RUNNING     0       /* Job is running */
-#define JOB_ERROR       1       /* Error in starting the job */
-#define JOB_FINISHED    2       /* The job is already finished */
-#define JOB_STOPPED     3       /* The job is stopped */
+#define JOB_RUNNING     0       /* Job is running */
+#define JOB_ERROR       1       /* Error in starting the job */
+#define JOB_FINISHED    2       /* The job is already finished */
+#define JOB_STOPPED     3       /* The job is stopped */
 
 /*
@@ -196 +196 @@
     FALSE, "echo \"%s\"\n", "sh -c '%s || exit 0'\n",
 #endif
-    "v", "e",
-},
-    /*
-     * KSH description. The Korn shell has a superset of
-     * the Bourne shell's functionality.
-     */
-{
-    "ksh",
-    TRUE, "set -", "set -v", "set -", 5,
-    TRUE, "set -e", "set +e",
     "v", "e",
 },
@@ -239 +229 @@
                                  * nLocal equals maxLocal */
 #ifndef RMT_WILL_WATCH
-#ifdef USE_KQUEUE
-static int      kqfd;           /* File descriptor obtained by kqueue() */
-#else
 static fd_set   outputs;        /* Set of descriptors of pipes connected to
                                  * the output channels of children */
-#endif
 #endif
 
@@ -290 +276 @@
  * really ugly, use dramamine sparingly. You have been warned.
  */
-#define W_SETMASKED(st, val, fun)                               \
+#define W_SETMASKED(st, val, fun)                               \
         {                                                       \
                 int sh = (int) ~0;                              \
@@ -300 +286 @@
         }
 
-#define W_SETTERMSIG(st, val) W_SETMASKED(st, val, WTERMSIG)
-#define W_SETEXITSTATUS(st, val) W_SETMASKED(st, val, WEXITSTATUS)
-
-
-static int JobCondPassSig(void *, void *);
-static void JobPassSig(int);
-static int JobCmpPid(void *, void *);
-static int JobPrintCommand(void *, void *);
-static int JobSaveCommand(void *, void *);
-static void JobClose(Job *);
+#define W_SETTERMSIG(st, val) W_SETMASKED(st, val, WTERMSIG)
+#define W_SETEXITSTATUS(st, val) W_SETMASKED(st, val, WEXITSTATUS)
+
+
+static int JobCondPassSig __P((ClientData, ClientData));
+static void JobPassSig __P((int));
+static int JobCmpPid __P((ClientData, ClientData));
+static int JobPrintCommand __P((ClientData, ClientData));
+static int JobSaveCommand __P((ClientData, ClientData));
+static void JobClose __P((Job *));
 #ifdef REMOTE
-static int JobCmpRmtID(Job *, int);
+static int JobCmpRmtID __P((Job *, int));
 # ifdef RMT_WILL_WATCH
-static void JobLocalInput(int, Job *);
+static void JobLocalInput __P((int, Job *));
 # endif
 #else
-static void JobFinish(Job *, int *);
-static void JobExec(Job *, char **);
-#endif
-static void JobMakeArgv(Job *, char **);
-static void JobRestart(Job *);
-static int JobStart(GNode *, int, Job *);
-static char *JobOutput(Job *, char *, char *, int);
-static void JobDoOutput(Job *, Boolean);
-static Shell *JobMatchShell(char *);
-static void JobInterrupt(int, int);
-static void JobRestartJobs(void);
+static void JobFinish __P((Job *, int *));
+static void JobExec __P((Job *, char **));
+#endif
+static void JobMakeArgv __P((Job *, char **));
+static void JobRestart __P((Job *));
+static int JobStart __P((GNode *, int, Job *));
+static char *JobOutput __P((Job *, char *, char *, int));
+static void JobDoOutput __P((Job *, Boolean));
+static Shell *JobMatchShell __P((char *));
+static void JobInterrupt __P((int, int));
+static void JobRestartJobs __P((void));
 
 /*-
@@ -343 +329 @@
  */
 static int
-JobCondPassSig(void *jobp, void *signop)
+JobCondPassSig(jobp, signop)
+    ClientData          jobp;       /* Job to biff */
+    ClientData          signop;     /* Signal to send it */
 {
     Job *job = (Job *) jobp;
@@ -358 +346 @@
      * job as well.
      */
-    DEBUGF(JOB, ("JobCondPassSig passing signal %d to child %d.\n", signo, job->pid));
+    if (DEBUG(JOB)) {
+        (void) fprintf(stdout,
+                       "JobCondPassSig passing signal %d to child %d.\n",
+                       signo, job->pid);
+        (void) fflush(stdout);
+    }
     KILL(job->pid, signo);
 #endif
@@ -379 +372 @@
  */
 static void
-JobPassSig(int signo)
+JobPassSig(signo)
+    int     signo;      /* The signal number we've received */
 {
     sigset_t nmask, omask;
     struct sigaction act;
 
-    DEBUGF(JOB, ("JobPassSig(%d) called.\n", signo));
-    Lst_ForEach(jobs, JobCondPassSig, (void *) &signo);
+    if (DEBUG(JOB)) {
+        (void) fprintf(stdout, "JobPassSig(%d) called.\n", signo);
+        (void) fflush(stdout);
+    }
+    Lst_ForEach(jobs, JobCondPassSig, (ClientData) &signo);
 
     /*
@@ -419 +416 @@
     sigaction(signo, &act, NULL);
 
-    DEBUGF(JOB, ("JobPassSig passing signal to self, mask = %x.\n", ~0 & ~(1 << (signo-1))));
+    if (DEBUG(JOB)) {
+        (void) fprintf(stdout,
+                       "JobPassSig passing signal to self, mask = %x.\n",
+                       ~0 & ~(1 << (signo-1)));
+        (void) fflush(stdout);
+    }
     (void) signal(signo, SIG_DFL);
 
@@ -425 +427 @@
 
     signo = SIGCONT;
-    Lst_ForEach(jobs, JobCondPassSig, (void *) &signo);
+    Lst_ForEach(jobs, JobCondPassSig, (ClientData) &signo);
 
     (void) sigprocmask(SIG_SETMASK, &omask, NULL);
@@ -448 +450 @@
  */
 static int
-JobCmpPid(void *job, void *pid)
+JobCmpPid(job, pid)
+    ClientData        job;      /* job to examine */
+    ClientData        pid;      /* process id desired */
 {
     return *(int *) pid - ((Job *) job)->pid;
@@ -468 +472 @@
  */
 static int
-JobCmpRmtID(void *job, void *rmtID)
+JobCmpRmtID(job, rmtID)
+    ClientData      job;        /* job to examine */
+    ClientData      rmtID;      /* remote id desired */
 {
     return(*(int *) rmtID - *(int *) job->rmtID);
@@ -487 +493 @@
  *      made and return non-zero to signal that the end of the commands
  *      was reached. These commands are later attached to the postCommands
- *      node and executed by Job_Finish when all things are done.
+ *      node and executed by Job_End when all things are done.
  *      This function is called from JobStart via Lst_ForEach.
  *
@@ -502 +508 @@
  */
 static int
-JobPrintCommand(void *cmdp, void *jobp)
+JobPrintCommand(cmdp, jobp)
+    ClientData    cmdp;             /* command string to print */
+    ClientData    jobp;             /* job for which to print it */
 {
     Boolean       noSpecials;       /* true if we shouldn't worry about
@@ -525 +533 @@
         if ((job->flags & JOB_IGNDOTS) == 0) {
             job->tailCmds = Lst_Succ(Lst_Member(job->node->commands,
-                                                (void *)cmd));
+                                                (ClientData)cmd));
             return 1;
         }
@@ -531 +539 @@
     }
 
-#define DBPRINTF(fmt, arg)                      \
-   DEBUGF(JOB, (fmt, arg));                     \
+#define DBPRINTF(fmt, arg) if (DEBUG(JOB)) {    \
+        (void) fprintf(stdout, fmt, arg);       \
+        (void) fflush(stdout);                  \
+    }                                           \
    (void) fprintf(job->cmdFILE, fmt, arg);      \
    (void) fflush(job->cmdFILE);
@@ -542 +552 @@
      * the variables in the command.
      */
-    cmdNode = Lst_Member(job->node->commands, (void *)cmd);
+    cmdNode = Lst_Member(job->node->commands, (ClientData)cmd);
     cmdStart = cmd = Var_Subst(NULL, cmd, job->node, FALSE);
-    Lst_Replace(cmdNode, (void *)cmdStart);
+    Lst_Replace(cmdNode, (ClientData)cmdStart);
 
     cmdTemplate = "%s\n";
@@ -659 +669 @@
  */
 static int
-JobSaveCommand(void *cmd, void *gn)
-{
-    cmd = (void *) Var_Subst(NULL, (char *) cmd, (GNode *) gn, FALSE);
+JobSaveCommand(cmd, gn)
+    ClientData   cmd;
+    ClientData   gn;
+{
+    cmd = (ClientData) Var_Subst(NULL, (char *) cmd, (GNode *) gn, FALSE);
     (void) Lst_AtEnd(postCommands->commands, cmd);
     return(0);
@@ -681 +693 @@
  */
 static void
-JobClose(Job *job)
+JobClose(job)
+    Job *job;
 {
     if (usePipes) {
 #ifdef RMT_WILL_WATCH
         Rmt_Ignore(job->inPipe);
-#elif !defined(USE_KQUEUE)
+#else
         FD_CLR(job->inPipe, &outputs);
 #endif
@@ -725 +738 @@
 /*ARGSUSED*/
 static void
-JobFinish(Job *job, int *status)
+JobFinish(job, status)
+    Job         *job;             /* job to finish */
+    int         *status;          /* sub-why job went away */
 {
     Boolean      done;
@@ -794 +809 @@
              */
             out = fdopen(job->outFd, "w");
-            if (out == NULL)
-                Punt("Cannot fdopen");
         } else {
             out = stdout;
@@ -801 +814 @@
 
         if (WIFEXITED(*status)) {
-            DEBUGF(JOB, ("Process %d exited.\n", job->pid));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "Process %d exited.\n", job->pid);
+                (void) fflush(stdout);
+            }
             if (WEXITSTATUS(*status) != 0) {
                 if (usePipes && job->node != lastNode) {
@@ -822 +838 @@
             }
         } else if (WIFSTOPPED(*status)) {
-            DEBUGF(JOB, ("Process %d stopped.\n", job->pid));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "Process %d stopped.\n", job->pid);
+                (void) fflush(stdout);
+            }
             if (usePipes && job->node != lastNode) {
                 MESSAGE(out, job->node);
@@ -832 +851 @@
             }
             job->flags |= JOB_RESUME;
-            (void)Lst_AtEnd(stoppedJobs, (void *)job);
+            (void)Lst_AtEnd(stoppedJobs, (ClientData)job);
 #ifdef REMOTE
             if (job->flags & JOB_REMIGRATE)
@@ -853 +872 @@
             }
             if (!(job->flags & JOB_CONTINUING)) {
-                DEBUGF(JOB, ("Warning: process %d was not continuing.\n", job->pid));
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout,
+                                   "Warning: process %d was not continuing.\n",
+                                   job->pid);
+                    (void) fflush(stdout);
+                }
 #ifdef notdef
                 /*
@@ -865 +889 @@
             }
             job->flags &= ~JOB_CONTINUING;
-            Lst_AtEnd(jobs, (void *)job);
+            Lst_AtEnd(jobs, (ClientData)job);
             nJobs += 1;
             if (!(job->flags & JOB_REMOTE)) {
-                DEBUGF(JOB, ("Process %d is continuing locally.\n", job->pid));
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout,
+                                   "Process %d is continuing locally.\n",
+                                   job->pid);
+                    (void) fflush(stdout);
+                }
                 nLocal += 1;
             }
             if (nJobs == maxJobs) {
                 jobFull = TRUE;
-                DEBUGF(JOB, ("Job queue is full.\n"));
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout, "Job queue is full.\n");
+                    (void) fflush(stdout);
+                }
             }
             (void) fflush(out);
@@ -913 +945 @@
             done = FALSE;
             break;
-        default:
-            break;
         }
     } else {
@@ -932 +962 @@
          * on the .END target.
          */
-        if (job->tailCmds != NULL) {
+        if (job->tailCmds != NILLNODE) {
             Lst_ForEachFrom(job->node->commands, job->tailCmds,
                              JobSaveCommand,
-                            (void *)job->node);
+                            (ClientData)job->node);
         }
         job->node->made = MADE;
         Make_Update(job->node);
-        free(job);
+        free((Address)job);
     } else if (*status != 0) {
         errors += 1;
-        free(job);
+        free((Address)job);
     }
 
@@ -970 +1000 @@
  * Job_Touch --
  *      Touch the given target. Called by JobStart when the -t flag was
- *      given.  Prints messages unless told to be silent.
+ *      given
  *
  * Results:
@@ -981 +1011 @@
  */
 void
-Job_Touch(GNode *gn, Boolean silent)
+Job_Touch(gn, silent)
+    GNode         *gn;          /* the node of the file to touch */
+    Boolean       silent;       /* TRUE if should not print messages */
 {
     int           streamID;     /* ID of stream opened to do the touch */
@@ -1022 +1054 @@
                  */
                 if (read(streamID, &c, 1) == 1) {
-                    (void) lseek(streamID, (off_t)0, SEEK_SET);
+                    (void) lseek(streamID, 0L, SEEK_SET);
                     (void) write(streamID, &c, 1);
                 }
@@ -1050 +1082 @@
  */
 Boolean
-Job_CheckCommands(GNode *gn, void (*abortProc)(const char *, ...))
+Job_CheckCommands(gn, abortProc)
+    GNode          *gn;             /* The target whose commands need
+                                     * verifying */
+    void         (*abortProc) __P((char *, ...));
+                        /* Function to abort with message */
 {
     if (OP_NOP(gn->type) && Lst_IsEmpty(gn->commands) &&
@@ -1058 +1094 @@
          * commands
          */
-        if ((DEFAULT != NULL) && !Lst_IsEmpty(DEFAULT->commands)) {
+        if ((DEFAULT != NILGNODE) && !Lst_IsEmpty(DEFAULT->commands)) {
             char *p1;
             /*
@@ -1118 +1154 @@
 /*ARGSUSED*/
 static void
-JobLocalInput(int stream, Job *job)
+JobLocalInput(stream, job)
+    int     stream;     /* Stream that's ready (ignored) */
+    Job     *job;       /* Job to which the stream belongs */
 {
     JobDoOutput(job, FALSE);
@@ -1140 +1178 @@
  */
 static void
-JobExec(Job *job, char **argv)
+JobExec(job, argv)
+    Job           *job;         /* Job to execute */
+    char          **argv;
 {
     int           cpid;         /* ID of new child */
@@ -1147 +1187 @@
         int       i;
 
-        DEBUGF(JOB, ("Running %s %sly\n", job->node->name,
-               job->flags&JOB_REMOTE?"remote":"local"));
-        DEBUGF(JOB, ("\tCommand: "));
+        (void) fprintf(stdout, "Running %s %sly\n", job->node->name,
+                       job->flags&JOB_REMOTE?"remote":"local");
+        (void) fprintf(stdout, "\tCommand: ");
         for (i = 0; argv[i] != NULL; i++) {
-            DEBUGF(JOB, ("%s ", argv[i]));
-        }
-        DEBUGF(JOB, ("\n"));
+            (void) fprintf(stdout, "%s ", argv[i]);
+        }
+        (void) fprintf(stdout, "\n");
+        (void) fflush(stdout);
     }
 
@@ -1186 +1227 @@
             Punt("Cannot dup2: %s", strerror(errno));
         (void) fcntl(0, F_SETFD, 0);
-        (void) lseek(0, (off_t)0, SEEK_SET);
+        (void) lseek(0, 0, SEEK_SET);
 
         if (usePipes) {
@@ -1234 +1275 @@
            (void) execv(shellPath, argv);
 
-        (void) write(STDERR_FILENO, "Could not execute shell\n",
+        (void) write(2, "Could not execute shell\n",
                      sizeof("Could not execute shell"));
         _exit(1);
@@ -1249 +1290 @@
              * stream to watch in the outputs mask
              */
-#ifdef USE_KQUEUE
-            struct kevent       kev[2];
-#endif
             job->curPos = 0;
 
 #ifdef RMT_WILL_WATCH
             Rmt_Watch(job->inPipe, JobLocalInput, job);
-#elif defined(USE_KQUEUE)
-            EV_SET(&kev[0], job->inPipe, EVFILT_READ, EV_ADD, 0, 0, job);
-            EV_SET(&kev[1], job->pid, EVFILT_PROC, EV_ADD | EV_ONESHOT,
-                NOTE_EXIT, 0, NULL);
-            if (kevent(kqfd, kev, 2, NULL, 0, NULL) != 0) {
-                /* kevent() will fail if the job is already finished */
-                if (errno != EBADF && errno != ESRCH)
-                    Punt("kevent: %s", strerror(errno));
-            }
 #else
             FD_SET(job->inPipe, &outputs);
@@ -1298 +1327 @@
      */
     nJobs += 1;
-    (void) Lst_AtEnd(jobs, (void *)job);
+    (void) Lst_AtEnd(jobs, (ClientData)job);
     if (nJobs == maxJobs) {
         jobFull = TRUE;
@@ -1317 +1346 @@
  */
 static void
-JobMakeArgv(Job *job, char **argv)
+JobMakeArgv(job, argv)
+    Job           *job;
+    char          **argv;
 {
     int           argc;
@@ -1371 +1402 @@
  */
 static void
-JobRestart(Job *job)
+JobRestart(job)
+    Job           *job;         /* Job to restart */
 {
 #ifdef REMOTE
@@ -1430 +1462 @@
                    (void) fflush(stdout);
                 }
-                (void)Lst_AtFront(stoppedJobs, (void *)job);
+                (void)Lst_AtFront(stoppedJobs, (ClientData)job);
                 jobFull = TRUE;
-                DEBUGF(JOB, ("Job queue is full.\n"));
+                if (DEBUG(JOB)) {
+                   (void) fprintf(stdout, "Job queue is full.\n");
+                   (void) fflush(stdout);
+                }
                 return;
             }
@@ -1448 +1483 @@
 #endif
 
-        (void)Lst_AtEnd(jobs, (void *)job);
+        (void)Lst_AtEnd(jobs, (ClientData)job);
         nJobs += 1;
         if (nJobs == maxJobs) {
             jobFull = TRUE;
-            DEBUGF(JOB, ("Job queue is full.\n"));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "Job queue is full.\n");
+                (void) fflush(stdout);
+            }
         }
     } else if (job->flags & JOB_RESTART) {
@@ -1467 +1505 @@
         JobMakeArgv(job, argv);
 
-        DEBUGF(JOB, ("Restarting %s...", job->node->name));
+        if (DEBUG(JOB)) {
+            (void) fprintf(stdout, "Restarting %s...", job->node->name);
+            (void) fflush(stdout);
+        }
 #ifdef REMOTE
         if ((job->node->type&OP_NOEXPORT) ||
@@ -1483 +1524 @@
                  * back on the hold queue and mark the table full
                  */
-                DEBUGF(JOB, ("holding\n"));
-                (void)Lst_AtFront(stoppedJobs, (void *)job);
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout, "holding\n");
+                    (void) fflush(stdout);
+                }
+                (void)Lst_AtFront(stoppedJobs, (ClientData)job);
                 jobFull = TRUE;
-                DEBUGF(JOB, ("Job queue is full.\n"));
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout, "Job queue is full.\n");
+                    (void) fflush(stdout);
+                }
                 return;
             } else {
@@ -1492 +1539 @@
                  * Job may be run locally.
                  */
-                DEBUGF(JOB, ("running locally\n"));
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout, "running locally\n");
+                    (void) fflush(stdout);
+                }
                 job->flags &= ~JOB_REMOTE;
             }
@@ -1501 +1551 @@
              * Can be exported. Hooray!
              */
-            DEBUGF(JOB, ("exporting\n"));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "exporting\n");
+                (void) fflush(stdout);
+            }
             job->flags |= JOB_REMOTE;
         }
@@ -1511 +1564 @@
          * we don't know...
          */
-        DEBUGF(JOB, ("Resuming %s...", job->node->name));
+        if (DEBUG(JOB)) {
+           (void) fprintf(stdout, "Resuming %s...", job->node->name);
+           (void) fflush(stdout);
+        }
         if (((job->flags & JOB_REMOTE) ||
             (nLocal < maxLocal) ||
@@ -1551 +1607 @@
 
                 job->flags &= ~(JOB_RESUME|JOB_CONTINUING);
-                DEBUGF(JOB, ("done\n"));
+                if (DEBUG(JOB)) {
+                   (void) fprintf(stdout, "done\n");
+                   (void) fflush(stdout);
+                }
             } else {
                 Error("couldn't resume %s: %s",
@@ -1564 +1623 @@
              * place the job back on the list of stopped jobs.
              */
-            DEBUGF(JOB, ("table full\n"));
-            (void) Lst_AtFront(stoppedJobs, (void *)job);
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "table full\n");
+                (void) fflush(stdout);
+            }
+            (void) Lst_AtFront(stoppedJobs, (ClientData)job);
             jobFull = TRUE;
-            DEBUGF(JOB, ("Job queue is full.\n"));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "Job queue is full.\n");
+                (void) fflush(stdout);
+            }
         }
     }
@@ -1589 +1654 @@
  */
 static int
-JobStart(GNode *gn, int flags, Job *previous)
-{
-    Job           *job;       /* new job descriptor */
+JobStart(gn, flags, previous)
+    GNode         *gn;        /* target to create */
+    int            flags;      /* flags for the job to override normal ones.
+                               * e.g. JOB_SPECIAL or JOB_IGNDOTS */
+    Job           *previous;  /* The previous Job structure for this node,
+                               * if any. */
+{
+    register Job  *job;       /* new job descriptor */
     char          *argv[4];   /* Argument vector to shell */
     Boolean       cmdsOK;     /* true if the nodes commands were all right */
@@ -1603 +1673 @@
     } else {
         job = (Job *) emalloc(sizeof(Job));
+        if (job == NULL) {
+            Punt("JobStart out of memory");
+        }
         flags |= JOB_FIRST;
     }
 
     job->node = gn;
-    job->tailCmds = NULL;
+    job->tailCmds = NILLNODE;
 
     /*
@@ -1682 +1755 @@
                 LstNode ln = Lst_Next(gn->commands);
 
-                if ((ln == NULL) ||
-                    JobPrintCommand((void *) Lst_Datum(ln),
-                                    (void *) job))
+                if ((ln == NILLNODE) ||
+                    JobPrintCommand((ClientData) Lst_Datum(ln),
+                                    (ClientData) job))
                 {
                     noExec = TRUE;
@@ -1709 +1782 @@
              */
             numCommands = 0;
-            Lst_ForEach(gn->commands, JobPrintCommand, (void *)job);
+            Lst_ForEach(gn->commands, JobPrintCommand, (ClientData)job);
 
             /*
@@ -1735 +1808 @@
          */
         if (cmdsOK) {
-            Lst_ForEach(gn->commands, JobPrintCommand, (void *)job);
+            Lst_ForEach(gn->commands, JobPrintCommand, (ClientData)job);
         }
         /*
@@ -1773 +1846 @@
         if (cmdsOK) {
             if (aborting == 0) {
-                if (job->tailCmds != NULL) {
+                if (job->tailCmds != NILLNODE) {
                     Lst_ForEachFrom(job->node->commands, job->tailCmds,
                                     JobSaveCommand,
-                                   (void *)job->node);
+                                   (ClientData)job->node);
                 }
                 job->node->made = MADE;
                 Make_Update(job->node);
             }
-            free(job);
+            free((Address)job);
             return(JOB_FINISHED);
         } else {
-            free(job);
+            free((Address)job);
             return(JOB_ERROR);
         }
@@ -1855 +1928 @@
         jobFull = TRUE;
 
-        DEBUGF(JOB, ("Can only run job locally.\n"));
+        if (DEBUG(JOB)) {
+           (void) fprintf(stdout, "Can only run job locally.\n");
+           (void) fflush(stdout);
+        }
         job->flags |= JOB_RESTART;
-        (void) Lst_AtEnd(stoppedJobs, (void *)job);
+        (void) Lst_AtEnd(stoppedJobs, (ClientData)job);
     } else {
         if ((nLocal >= maxLocal) && local) {
@@ -1865 +1941 @@
              */
             jobFull = TRUE;
-            DEBUGF(JOB, ("Local job queue is full.\n"));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "Local job queue is full.\n");
+                (void) fflush(stdout);
+            }
         }
         JobExec(job, argv);
@@ -1873 +1952 @@
 
 static char *
-JobOutput(Job *job, char *cp, char *endp, int msg)
-{
-    char *ecp;
+JobOutput(job, cp, endp, msg)
+    register Job *job;
+    register char *cp, *endp;
+    int msg;
+{
+    register char *ecp;
 
     if (commandShell->noPrint) {
@@ -1943 +2025 @@
  */
 STATIC void
-JobDoOutput(Job *job, Boolean finish)
+JobDoOutput(job, finish)
+    register Job   *job;          /* the job whose output needs printing */
+    Boolean        finish;        /* TRUE if this is the last time we'll be
+                                   * called for this job */
 {
     Boolean       gotNL = FALSE;  /* true if got a newline */
     Boolean       fbuf;           /* true if our buffer filled up */
-    int           nr;             /* number of bytes read */
-    int           i;              /* auxiliary index into outBuf */
-    int           max;            /* limit for i (end of current data) */
+    register int  nr;             /* number of bytes read */
+    register int  i;              /* auxiliary index into outBuf */
+    register int  max;            /* limit for i (end of current data) */
     int           nRead;          /* (Temporary) number of bytes read */
 
@@ -1967 +2052 @@
                          JOB_BUFSIZE - job->curPos);
         if (nRead < 0) {
-            DEBUGF(JOB, ("JobDoOutput(piperead)"));
+            if (DEBUG(JOB)) {
+                perror("JobDoOutput(piperead)");
+            }
             nr = 0;
         } else {
@@ -2021 +2108 @@
              * first, overwriting the newline character if there was one.
              * So long as the line isn't one we should filter (according
-             * to the shell description), we print the line, preceded
+             * to the shell description), we print the line, preceeded
              * by a target banner if this target isn't the same as the
              * one for which we last printed something.
@@ -2087 +2174 @@
             (void) fflush(stdout);
             while (fgets(inLine, sizeof(inLine), oFILE) != NULL) {
-                char    *cp, *endp, *oendp;
+                register char   *cp, *endp, *oendp;
 
                 cp = inLine;
@@ -2134 +2221 @@
  */
 void
-Job_CatchChildren(Boolean block)
+Job_CatchChildren(block)
+    Boolean       block;        /* TRUE if should block on the wait. */
 {
     int           pid;          /* pid of dead child */
-    Job           *job;         /* job descriptor for dead child */
+    register Job  *job;         /* job descriptor for dead child */
     LstNode       jnode;        /* list element for finding job */
     int           status;       /* Exit/termination status */
@@ -2151 +2239 @@
                           (block?0:WNOHANG)|WUNTRACED)) > 0)
     {
-        DEBUGF(JOB, ("Process %d exited or stopped.\n", pid));
-
-        jnode = Lst_Find(jobs, (void *)&pid, JobCmpPid);
-
-        if (jnode == NULL) {
+        if (DEBUG(JOB)) {
+            (void) fprintf(stdout, "Process %d exited or stopped.\n", pid);
+            (void) fflush(stdout);
+        }
+
+
+        jnode = Lst_Find(jobs, (ClientData)&pid, JobCmpPid);
+
+        if (jnode == NILLNODE) {
             if (WIFSIGNALED(status) && (WTERMSIG(status) == SIGCONT)) {
-                jnode = Lst_Find(stoppedJobs, (void *) &pid, JobCmpPid);
-                if (jnode == NULL) {
+                jnode = Lst_Find(stoppedJobs, (ClientData) &pid, JobCmpPid);
+                if (jnode == NILLNODE) {
                     Error("Resumed child (%d) not in table", pid);
                     continue;
@@ -2172 +2264 @@
             (void) Lst_Remove(jobs, jnode);
             nJobs -= 1;
-            DEBUGF(JOB, ("Job queue is no longer full.\n"));
+            if (jobFull && DEBUG(JOB)) {
+                (void) fprintf(stdout, "Job queue is no longer full.\n");
+                (void) fflush(stdout);
+            }
             jobFull = FALSE;
 #ifdef REMOTE
             if (!(job->flags & JOB_REMOTE)) {
-                DEBUGF(JOB, ("Job queue has one fewer local process.\n"));
+                if (DEBUG(JOB)) {
+                    (void) fprintf(stdout,
+                                   "Job queue has one fewer local process.\n");
+                    (void) fflush(stdout);
+                }
                 nLocal -= 1;
             }
@@ -2205 +2304 @@
  */
 void
-Job_CatchOutput(void)
+Job_CatchOutput()
 {
     int                   nfds;
-#ifdef USE_KQUEUE
-#define KEV_SIZE        4
-    struct kevent         kev[KEV_SIZE];
-    int                   i;
-#else
     struct timeval        timeout;
     fd_set                readfds;
-    LstNode               ln;
-    Job                   *job;
-#endif
+    register LstNode      ln;
+    register Job          *job;
 #ifdef RMT_WILL_WATCH
     int                   pnJobs;       /* Previous nJobs */
@@ -2247 +2340 @@
 #else
     if (usePipes) {
-#ifdef USE_KQUEUE
-        if ((nfds = kevent(kqfd, NULL, 0, kev, KEV_SIZE, NULL)) == -1) {
-            Punt("kevent: %s", strerror(errno));
-        } else {
-            for (i = 0; i < nfds; i++) {
-                if (kev[i].flags & EV_ERROR) {
-                    warnc(kev[i].data, "kevent");
-                    continue;
-                }
-                switch (kev[i].filter) {
-                case EVFILT_READ:
-                    JobDoOutput(kev[i].udata, FALSE);
-                    break;
-                case EVFILT_PROC:
-                    /* Just wake up and let Job_CatchChildren() collect the
-                     * terminated job. */
-                    break;
-                }
-            }
-        }
-#else
         readfds = outputs;
         timeout.tv_sec = SEL_SEC;
@@ -2279 +2351 @@
                 Punt("Cannot open job table");
             }
-            while (nfds && (ln = Lst_Next(jobs)) != NULL) {
+            while (nfds && (ln = Lst_Next(jobs)) != NILLNODE) {
                 job = (Job *) Lst_Datum(ln);
                 if (FD_ISSET(job->inPipe, &readfds)) {
@@ -2288 +2360 @@
             Lst_Close(jobs);
         }
-#endif /* !USE_KQUEUE */
     }
 #endif /* RMT_WILL_WATCH */
@@ -2308 +2379 @@
  */
 void
-Job_Make(GNode *gn)
+Job_Make(gn)
+    GNode   *gn;
 {
     (void) JobStart(gn, 0, NULL);
@@ -2316 +2388 @@
  *-----------------------------------------------------------------------
  * Job_Init --
- *      Initialize the process module, given a maximum number of jobs, and
- *      a maximum number of local jobs.
+ *      Initialize the process module
  *
  * Results:
@@ -2327 +2398 @@
  */
 void
-Job_Init(int maxproc, int maxlocal)
+Job_Init(maxproc, maxlocal)
+    int           maxproc;  /* the greatest number of jobs which may be
+                             * running at one time */
+    int           maxlocal; /* the greatest number of local jobs which may
+                             * be running at once. */
 {
     GNode         *begin;     /* node for commands to do at the very start */
@@ -2342 +2417 @@
     errors =      0;
 
-    lastNode =    NULL;
+    lastNode =    NILGNODE;
 
     if (maxJobs == 1 || beVerbose == 0
@@ -2414 +2489 @@
 #endif
 
-#ifdef USE_KQUEUE
-    if ((kqfd = kqueue()) == -1) {
-        Punt("kqueue: %s", strerror(errno));
-    }
-#endif
-
     begin = Targ_FindNode(".BEGIN", TARG_NOCREATE);
 
-    if (begin != NULL) {
+    if (begin != NILGNODE) {
         JobStart(begin, JOB_SPECIAL, (Job *)0);
         while (nJobs) {
@@ -2449 +2518 @@
  */
 Boolean
-Job_Full(void)
+Job_Full()
 {
     return(aborting || jobFull);
@@ -2471 +2540 @@
  */
 Boolean
-Job_Empty(void)
+Job_Empty()
 {
     if (nJobs == 0) {
@@ -2504 +2573 @@
  */
 static Shell *
-JobMatchShell(char *name)
-{
-    Shell         *sh;        /* Pointer into shells table */
-    Shell         *match;     /* Longest-matching shell */
-    char          *cp1,
+JobMatchShell(name)
+    char          *name;      /* Final component of shell path */
+{
+    register Shell *sh;       /* Pointer into shells table */
+    Shell          *match;    /* Longest-matching shell */
+    register char *cp1,
                   *cp2;
     char          *eoname;
@@ -2575 +2645 @@
  */
 ReturnStatus
-Job_ParseShell(char *line)
+Job_ParseShell(line)
+    char          *line;  /* The shell spec */
 {
     char          **words;
     int           wordCount;
-    char          **argv;
-    int           argc;
+    register char **argv;
+    register int  argc;
     char          *path;
     Shell         newShell;
     Boolean       fullSpec = FALSE;
 
-    while (isspace((unsigned char) *line)) {
+    while (isspace(*line)) {
         line++;
     }
     words = brk_string(line, &wordCount, TRUE);
 
-    memset(&newShell, 0, sizeof(newShell));
+    memset((Address)&newShell, 0, sizeof(newShell));
 
     /*
@@ -2686 +2757 @@
     }
 
+    /*
+     * Do not free up the words themselves, since they might be in use by the
+     * shell specification...
+     */
+    free(words);
     return SUCCESS;
 }
@@ -2703 +2779 @@
  */
 static void
-JobInterrupt(int runINTERRUPT, int signo)
+JobInterrupt(runINTERRUPT, signo)
+    int     runINTERRUPT;       /* Non-zero if commands for the .INTERRUPT
+                                 * target should be executed */
+    int     signo;              /* signal received */
 {
     LstNode       ln;           /* element in job table */
@@ -2711 +2790 @@
     aborting = ABORT_INTERRUPT;
 
-    (void) Lst_Open(jobs);
-    while ((ln = Lst_Next(jobs)) != NULL) {
+   (void) Lst_Open(jobs);
+    while ((ln = Lst_Next(jobs)) != NILLNODE) {
         job = (Job *) Lst_Datum(ln);
 
@@ -2744 +2823 @@
 #else
         if (job->pid) {
-            DEBUGF(JOB, ("JobInterrupt passing signal to child %d.\n",
-                   job->pid));
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout,
+                               "JobInterrupt passing signal to child %d.\n",
+                               job->pid);
+                (void) fflush(stdout);
+            }
             KILL(job->pid, signo);
         }
@@ -2752 +2835 @@
 
 #ifdef REMOTE
-    (void)Lst_Open(stoppedJobs);
-    while ((ln = Lst_Next(stoppedJobs)) != NULL) {
+   (void)Lst_Open(stoppedJobs);
+    while ((ln = Lst_Next(stoppedJobs)) != NILLNODE) {
         job = (Job *) Lst_Datum(ln);
 
         if (job->flags & JOB_RESTART) {
-            DEBUGF(JOB, "JobInterrupt skipping job on stopped queue"
-                   "-- it was waiting to be restarted.\n");
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout, "%s%s",
+                               "JobInterrupt skipping job on stopped queue",
+                               "-- it was waiting to be restarted.\n");
+                (void) fflush(stdout);
+            }
             continue;
         }
@@ -2772 +2859 @@
          * Resume the thing so it will take the signal.
          */
-        DEBUGF(JOB, ("JobInterrupt passing CONT to stopped child %d.\n", job->pid));
+        if (DEBUG(JOB)) {
+            (void) fprintf(stdout,
+                           "JobInterrupt passing CONT to stopped child %d.\n",
+                           job->pid);
+            (void) fflush(stdout);
+        }
         KILL(job->pid, SIGCONT);
 #ifdef RMT_WANTS_SIGNALS
@@ -2790 +2882 @@
             }
         } else if (job->pid) {
-            DEBUGF(JOB, "JobInterrupt passing interrupt to stopped child %d.\n",
-                   job->pid);
+            if (DEBUG(JOB)) {
+                (void) fprintf(stdout,
+                       "JobInterrupt passing interrupt to stopped child %d.\n",
+                               job->pid);
+                (void) fflush(stdout);
+            }
             KILL(job->pid, SIGINT);
         }
@@ -2801 +2897 @@
     if (runINTERRUPT && !touchFlag) {
         interrupt = Targ_FindNode(".INTERRUPT", TARG_NOCREATE);
-        if (interrupt != NULL) {
+        if (interrupt != NILGNODE) {
             ignoreErrors = FALSE;
 
@@ -2817 +2913 @@
 /*
  *-----------------------------------------------------------------------
- * Job_Finish --
+ * Job_End --
  *      Do final processing such as the running of the commands
  *      attached to the .END target.
@@ -2826 +2922 @@
  */
 int
-Job_Finish(void)
-{
-    if (postCommands != NULL && !Lst_IsEmpty(postCommands->commands)) {
+Job_End()
+{
+    if (postCommands != NILGNODE && !Lst_IsEmpty(postCommands->commands)) {
         if (errors) {
             Error("Errors reported so .END ignored");
@@ -2860 +2956 @@
  */
 void
-Job_Wait(void)
+Job_Wait()
 {
     aborting = ABORT_WAIT;
@@ -2887 +2983 @@
  */
 void
-Job_AbortAll(void)
+Job_AbortAll()
 {
     LstNode             ln;     /* element in job table */
@@ -2898 +2994 @@
 
         (void) Lst_Open(jobs);
-        while ((ln = Lst_Next(jobs)) != NULL) {
+        while ((ln = Lst_Next(jobs)) != NILLNODE) {
             job = (Job *) Lst_Datum(ln);
 
@@ -2932 +3028 @@
  * JobFlagForMigration --
  *      Handle the eviction of a child. Called from RmtStatusChange.
- *      Flags the child as remigratable and then suspends it.  Takes
- *      the ID of the host we used, for matching children.
+ *      Flags the child as remigratable and then suspends it.
  *
  * Results:
@@ -2944 +3039 @@
  */
 void
-JobFlagForMigration(int hostID)
-{
-    Job           *job;         /* job descriptor for dead child */
+JobFlagForMigration(hostID)
+    int           hostID;       /* ID of host we used, for matching children. */
+{
+    register Job  *job;         /* job descriptor for dead child */
     LstNode       jnode;        /* list element for finding job */
 
-    DEBUGF(JOB, ("JobFlagForMigration(%d) called.\n", hostID));
-    jnode = Lst_Find(jobs, (void *)hostID, JobCmpRmtID);
-
-    if (jnode == NULL) {
-        jnode = Lst_Find(stoppedJobs, (void *)hostID, JobCmpRmtID);
-                if (jnode == NULL) {
+    if (DEBUG(JOB)) {
+        (void) fprintf(stdout, "JobFlagForMigration(%d) called.\n", hostID);
+        (void) fflush(stdout);
+    }
+    jnode = Lst_Find(jobs, (ClientData)hostID, JobCmpRmtID);
+
+    if (jnode == NILLNODE) {
+        jnode = Lst_Find(stoppedJobs, (ClientData)hostID, JobCmpRmtID);
+                if (jnode == NILLNODE) {
                     if (DEBUG(JOB)) {
                         Error("Evicting host(%d) not in table", hostID);
@@ -2963 +3062 @@
     job = (Job *) Lst_Datum(jnode);
 
-    DEBUGF(JOB, ("JobFlagForMigration(%d) found job '%s'.\n", hostID, job->node->name));
+    if (DEBUG(JOB)) {
+        (void) fprintf(stdout,
+                       "JobFlagForMigration(%d) found job '%s'.\n", hostID,
+                       job->node->name);
+        (void) fflush(stdout);
+    }
 
     KILL(job->pid, SIGSTOP);
@@ -2989 +3093 @@
  */
 static void
-JobRestartJobs(void)
+JobRestartJobs()
 {
     while (!jobFull && !Lst_IsEmpty(stoppedJobs)) {
-        DEBUGF(JOB, ("Job queue is not full. Restarting a stopped job.\n"));
+        if (DEBUG(JOB)) {
+            (void) fprintf(stdout,
+                       "Job queue is not full. Restarting a stopped job.\n");
+            (void) fflush(stdout);
+        }
         JobRestart((Job *)Lst_DeQueue(stoppedJobs));
     }

branches/FREEBSD/src/kmk/job.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)job.h       8.1 (Berkeley) 6/6/93
- * $FreeBSD: src/usr.bin/make/job.h,v 1.20 2002/10/09 01:56:02 jmallett Exp $
+ *      from: @(#)job.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/job.h,v 1.11 2000/01/17 06:43:41 kris Exp $
  */
 
@@ -47 +46 @@
  */
 #ifndef _JOB_H_
-#define _JOB_H_
-
-#define TMPPAT  "/tmp/makeXXXXXXXXXX"
-
-#ifndef USE_KQUEUE
+#define _JOB_H_
+
+#define TMPPAT  "/tmp/makeXXXXXXXXXX"
+
 /*
  * The SEL_ constants determine the maximum amount of time spent in select
@@ -57 +55 @@
  * seconds and SEL_USEC is the number of micro-seconds
  */
-#define SEL_SEC         0
-#define SEL_USEC        100000
-#endif /* !USE_KQUEUE */
+#define SEL_SEC         0
+#define SEL_USEC        100000
 
 
@@ -70 +67 @@
  *      2) The graph node describing the target being made by this job
  *      3) A LstNode for the first command to be saved after the job
- *         completes. This is NULL if there was no "..." in the job's
+ *         completes. This is NILLNODE if there was no "..." in the job's
  *         commands.
  *      4) An FILE* for writing out the commands. This is only
@@ -95 +92 @@
  * traversal of the dependency graph.
  */
-#define JOB_BUFSIZE     1024
+#define JOB_BUFSIZE     1024
 typedef struct Job {
     int         pid;        /* The child's process ID */
@@ -109 +106 @@
 #define JOB_IGNERR      0x001   /* Ignore non-zero exits */
 #define JOB_SILENT      0x002   /* no output */
-#define JOB_SPECIAL     0x004   /* Target is a special one. i.e. run it locally
+#define JOB_SPECIAL     0x004   /* Target is a special one. i.e. run it locally
                                  * if we can't export it and maxLocal is 0 */
-#define JOB_IGNDOTS     0x008   /* Ignore "..." lines when processing
+#define JOB_IGNDOTS     0x008   /* Ignore "..." lines when processing
                                  * commands */
-#define JOB_REMOTE      0x010   /* Job is running remotely */
-#define JOB_FIRST       0x020   /* Job is first job for the node */
-#define JOB_REMIGRATE   0x040   /* Job needs to be remigrated */
-#define JOB_RESTART     0x080   /* Job needs to be completely restarted */
-#define JOB_RESUME      0x100   /* Job needs to be resumed b/c it stopped,
+#define JOB_REMOTE      0x010   /* Job is running remotely */
+#define JOB_FIRST       0x020   /* Job is first job for the node */
+#define JOB_REMIGRATE   0x040   /* Job needs to be remigrated */
+#define JOB_RESTART     0x080   /* Job needs to be completely restarted */
+#define JOB_RESUME      0x100   /* Job needs to be resumed b/c it stopped,
                                  * for some reason */
-#define JOB_CONTINUING  0x200   /* We are in the process of resuming this job.
+#define JOB_CONTINUING  0x200   /* We are in the process of resuming this job.
                                  * Used to avoid infinite recursion between
                                  * JobFinish and JobRestart */
@@ -148 +145 @@
 } Job;
 
-#define outPipe         output.o_pipe.op_outPipe
-#define inPipe          output.o_pipe.op_inPipe
-#define outBuf          output.o_pipe.op_outBuf
-#define curPos          output.o_pipe.op_curPos
-#define outFile         output.o_file.of_outFile
-#define outFd           output.o_file.of_outFd
+#define outPipe         output.o_pipe.op_outPipe
+#define inPipe          output.o_pipe.op_inPipe
+#define outBuf          output.o_pipe.op_outBuf
+#define curPos          output.o_pipe.op_curPos
+#define outFile         output.o_file.of_outFile
+#define outFd           output.o_file.of_outFd
 
 
@@ -208 +205 @@
 }               Shell;
 
-/*
- * If REMOTE is defined then these things need exposed, otherwise they are
- * static to job.c!
- */
-#ifdef REMOTE
+
 extern char     *targFmt;       /* Format string for banner that separates
                                  * output from multiple jobs. Contains a
@@ -227 +220 @@
                                  * quite get started */
 extern Boolean  jobFull;        /* Non-zero if no more jobs should/will start*/
-#endif
-
-extern int      maxJobs;        /* Number of jobs that may run */
-
-
-void Job_Touch(GNode *, Boolean);
-Boolean Job_CheckCommands(GNode *, void (*abortProc)(const char *, ...));
-void Job_CatchChildren(Boolean);
-void Job_CatchOutput(void);
-void Job_Make(GNode *);
-void Job_Init(int, int);
-Boolean Job_Full(void);
-Boolean Job_Empty(void);
-ReturnStatus Job_ParseShell(char *);
-int Job_Finish(void);
-void Job_Wait(void);
-void Job_AbortAll(void);
-void JobFlagForMigration(int);
+
+
+void Job_Touch __P((GNode *, Boolean));
+Boolean Job_CheckCommands __P((GNode *, void (*abortProc )(char *, ...)));
+void Job_CatchChildren __P((Boolean));
+void Job_CatchOutput __P((void));
+void Job_Make __P((GNode *));
+void Job_Init __P((int, int));
+Boolean Job_Full __P((void));
+Boolean Job_Empty __P((void));
+ReturnStatus Job_ParseShell __P((char *));
+int Job_End __P((void));
+void Job_Wait __P((void));
+void Job_AbortAll __P((void));
+void JobFlagForMigration __P((int));
 
 #endif /* _JOB_H_ */

branches/FREEBSD/src/kmk/list.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)list.h      8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/list.h,v 1.11 2002/09/17 21:29:06 jmallett Exp $
+ *      from: @(#)list.h        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/list.h,v 1.8 1999/08/28 01:03:32 peter Exp $
  */
 
@@ -48 +47 @@
 
 #ifndef _LIST
-#define _LIST
+#define _LIST
 
 #ifndef _SPRITE
@@ -131 +130 @@
  * ----------------------------------------------------------------------------
  */
-#define List_InitElement(elementPtr) \
-    (elementPtr)->prevPtr = (List_Links *) NULL; \
-    (elementPtr)->nextPtr = (List_Links *) NULL;
+#define List_InitElement(elementPtr) \
+    (elementPtr)->prevPtr = (List_Links *) NIL; \
+    (elementPtr)->nextPtr = (List_Links *) NIL;
 
 /*
@@ -163 +162 @@
  */
 
-#define LIST_FORALL(headerPtr, itemPtr) \
+#define LIST_FORALL(headerPtr, itemPtr) \
         for (itemPtr = List_First(headerPtr); \
              !List_IsAtEnd((headerPtr),itemPtr); \
@@ -181 +180 @@
  */
 
-#define List_IsEmpty(headerPtr) \
+#define List_IsEmpty(headerPtr) \
         ((headerPtr) == (headerPtr)->nextPtr)
 
@@ -198 +197 @@
 
 
-#define List_IsAtEnd(headerPtr, itemPtr) \
+#define List_IsAtEnd(headerPtr, itemPtr) \
         ((itemPtr) == (headerPtr))
 
@@ -216 +215 @@
  */
 
-#define List_First(headerPtr) ((headerPtr)->nextPtr)
+#define List_First(headerPtr) ((headerPtr)->nextPtr)
 
 /*
@@ -231 +230 @@
  */
 
-#define List_Last(headerPtr) ((headerPtr)->prevPtr)
+#define List_Last(headerPtr) ((headerPtr)->prevPtr)
 
 /*
@@ -247 +246 @@
  */
 
-#define List_Prev(itemPtr) ((itemPtr)->prevPtr)
+#define List_Prev(itemPtr) ((itemPtr)->prevPtr)
 
 /*
@@ -263 +262 @@
  */
 
-#define List_Next(itemPtr) ((itemPtr)->nextPtr)
+#define List_Next(itemPtr) ((itemPtr)->nextPtr)
 
 
@@ -294 +293 @@
  */
 
-#define LIST_AFTER(itemPtr) ((List_Links *) itemPtr)
-
-#define LIST_BEFORE(itemPtr) (((List_Links *) itemPtr)->prevPtr)
-
-#define LIST_ATFRONT(headerPtr) ((List_Links *) headerPtr)
-
-#define LIST_ATREAR(headerPtr) (((List_Links *) headerPtr)->prevPtr)
+#define LIST_AFTER(itemPtr) ((List_Links *) itemPtr)
+
+#define LIST_BEFORE(itemPtr) (((List_Links *) itemPtr)->prevPtr)
+
+#define LIST_ATFRONT(headerPtr) ((List_Links *) headerPtr)
+
+#define LIST_ATREAR(headerPtr) (((List_Links *) headerPtr)->prevPtr)
 
 #endif /* _LIST */

branches/FREEBSD/src/kmk/lst.h

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -37 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)lst.h       8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/lst.h,v 1.15 2002/09/17 21:29:06 jmallett Exp $
+ *      from: @(#)lst.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.h,v 1.9 1999/08/28 01:03:32 peter Exp $
  */
 
@@ -46 +45 @@
  */
 #ifndef _LST_H_
-#define _LST_H_
+#define _LST_H_
 
 #include        <sys/param.h>
+#ifdef __STDC__
 #include        <stdlib.h>
+#endif
 #include        "sprite.h"
 
@@ -59 +60 @@
 typedef struct  LstNode *LstNode;
 
+#define NILLST          ((Lst) NIL)
+#define NILLNODE        ((LstNode) NIL)
+
 /*
  * NOFREE can be used as the freeProc to Lst_Destroy when the elements are
@@ -64 +68 @@
  * NOCOPY performs similarly when given as the copyProc to Lst_Duplicate.
  */
-#define NOFREE          ((void (*)(void *)) 0)
-#define NOCOPY          ((void * (*)(void *)) 0)
+#define NOFREE          ((void (*) __P((ClientData))) 0)
+#define NOCOPY          ((ClientData (*) __P((ClientData))) 0)
 
-#define LST_CONCNEW     0   /* create new LstNode's when using Lst_Concat */
-#define LST_CONCLINK    1   /* relink LstNode's when using Lst_Concat */
+#define LST_CONCNEW     0   /* create new LstNode's when using Lst_Concat */
+#define LST_CONCLINK    1   /* relink LstNode's when using Lst_Concat */
 
 /*
@@ -74 +78 @@
  */
 /* Create a new list */
-Lst             Lst_Init(Boolean);
+Lst             Lst_Init __P((Boolean));
 /* Duplicate an existing list */
-Lst             Lst_Duplicate(Lst, void * (*)(void *));
+Lst             Lst_Duplicate __P((Lst, ClientData (*)(ClientData)));
 /* Destroy an old one */
-void            Lst_Destroy(Lst, void (*)(void *));
+void            Lst_Destroy __P((Lst, void (*)(ClientData)));
 /* True if list is empty */
-Boolean         Lst_IsEmpty(Lst);
+Boolean         Lst_IsEmpty __P((Lst));
 
 /*
@@ -86 +90 @@
  */
 /* Insert an element before another */
-ReturnStatus    Lst_Insert(Lst, LstNode, void *);
+ReturnStatus    Lst_Insert __P((Lst, LstNode, ClientData));
 /* Insert an element after another */
-ReturnStatus    Lst_Append(Lst, LstNode, void *);
+ReturnStatus    Lst_Append __P((Lst, LstNode, ClientData));
 /* Place an element at the front of a lst. */
-ReturnStatus    Lst_AtFront(Lst, void *);
+ReturnStatus    Lst_AtFront __P((Lst, ClientData));
 /* Place an element at the end of a lst. */
-ReturnStatus    Lst_AtEnd(Lst, void *);
+ReturnStatus    Lst_AtEnd __P((Lst, ClientData));
 /* Remove an element */
-ReturnStatus    Lst_Remove(Lst, LstNode);
+ReturnStatus    Lst_Remove __P((Lst, LstNode));
 /* Replace a node with a new value */
-ReturnStatus    Lst_Replace(LstNode, void *);
+ReturnStatus    Lst_Replace __P((LstNode, ClientData));
 /* Concatenate two lists */
-ReturnStatus    Lst_Concat(Lst, Lst, int);
+ReturnStatus    Lst_Concat __P((Lst, Lst, int));
 
 /*
@@ -104 +108 @@
  */
 /* Return first element in list */
-LstNode         Lst_First(Lst);
+LstNode         Lst_First __P((Lst));
 /* Return last element in list */
-LstNode         Lst_Last(Lst);
+LstNode         Lst_Last __P((Lst));
 /* Return successor to given element */
-LstNode         Lst_Succ(LstNode);
+LstNode         Lst_Succ __P((LstNode));
 /* Get datum from LstNode */
-void *  Lst_Datum(LstNode);
+ClientData      Lst_Datum __P((LstNode));
 
 /*
@@ -116 +120 @@
  */
 /* Find an element in a list */
-LstNode         Lst_Find(Lst, void *, int (*)(void *, void *));
+LstNode         Lst_Find __P((Lst, ClientData,
+                              int (*)(ClientData, ClientData)));
 /* Find an element starting from somewhere */
-LstNode         Lst_FindFrom(Lst, LstNode, void *, int (*cProc)(void *, void *));
+LstNode         Lst_FindFrom __P((Lst, LstNode, ClientData,
+                                  int (*cProc)(ClientData, ClientData)));
 /*
  * See if the given datum is on the list. Returns the LstNode containing
  * the datum
  */
-LstNode         Lst_Member(Lst, void *);
+LstNode         Lst_Member __P((Lst, ClientData));
 /* Apply a function to all elements of a lst */
-void            Lst_ForEach(Lst, int (*)(void *, void *), void *);
+void            Lst_ForEach __P((Lst, int (*)(ClientData, ClientData),
+                                 ClientData));
 /*
  * Apply a function to all elements of a lst starting from a certain point.
@@ -131 +138 @@
  * beginning of the list again.
  */
-void            Lst_ForEachFrom(Lst, LstNode, int (*)(void *, void *), void *);
+void            Lst_ForEachFrom __P((Lst, LstNode,
+                                     int (*)(ClientData, ClientData),
+                                     ClientData));
 /*
  * these functions are for dealing with a list as a table, of sorts.
@@ -138 +147 @@
  */
 /* Open the list */
-ReturnStatus    Lst_Open(Lst);
+ReturnStatus    Lst_Open __P((Lst));
 /* Next element please */
-LstNode         Lst_Next(Lst);
+LstNode         Lst_Next __P((Lst));
 /* Done yet? */
-Boolean         Lst_IsAtEnd(Lst);
+Boolean         Lst_IsAtEnd __P((Lst));
 /* Finish table access */
-void            Lst_Close(Lst);
+void            Lst_Close __P((Lst));
 
 /*
@@ -150 +159 @@
  */
 /* Place an element at tail of queue */
-ReturnStatus    Lst_EnQueue(Lst, void *);
+ReturnStatus    Lst_EnQueue __P((Lst, ClientData));
 /* Remove an element from head of queue */
-void *  Lst_DeQueue(Lst);
+ClientData      Lst_DeQueue __P((Lst));
 
 #endif /* _LST_H_ */

branches/FREEBSD/src/kmk/lst.lib/lstAppend.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstAppend.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAppend.c,v 1.6 1999/08/28 01:03:45 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAppend.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstAppend.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -61 +60 @@
  *      field of the List will be altered if ln is the last node in the
  *      list. lastPtr and firstPtr will alter if the list was empty and
- *      ln was NULL.
+ *      ln was NILLNODE.
  *
  *-----------------------------------------------------------------------
@@ -69 +68 @@
     Lst         l;      /* affected list */
     LstNode     ln;     /* node after which to append the datum */
-    void *      d;      /* said datum */
+    ClientData  d;      /* said datum */
 {
     register List       list;
@@ -75 +74 @@
     register ListNode   nLNode;
 
-    if (LstValid (l) && (ln == NULL && LstIsEmpty (l))) {
+    if (LstValid (l) && (ln == NILLNODE && LstIsEmpty (l))) {
         goto ok;
     }
@@ -91 +90 @@
     nLNode->useCount = nLNode->flags = 0;
 
-    if (lNode == NULL) {
+    if (lNode == NilListNode) {
         if (list->isCirc) {
             nLNode->nextPtr = nLNode->prevPtr = nLNode;
         } else {
-            nLNode->nextPtr = nLNode->prevPtr = NULL;
+            nLNode->nextPtr = nLNode->prevPtr = NilListNode;
         }
         list->firstPtr = list->lastPtr = nLNode;
@@ -103 +102 @@
 
         lNode->nextPtr = nLNode;
-        if (nLNode->nextPtr != NULL) {
+        if (nLNode->nextPtr != NilListNode) {
             nLNode->nextPtr->prevPtr = nLNode;
         }

branches/FREEBSD/src/kmk/lst.lib/lstAtEnd.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstAtEnd.c       8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAtEnd.c,v 1.6 1999/08/28 01:03:46 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAtEnd.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstAtEnd.c  8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -65 +64 @@
 Lst_AtEnd (l, d)
     Lst         l;      /* List to which to add the datum */
-    void *      d;      /* Datum to add */
+    ClientData  d;      /* Datum to add */
 {
     register LstNode    end;

branches/FREEBSD/src/kmk/lst.lib/lstAtFront.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstAtFront.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAtFront.c,v 1.6 1999/08/28 01:03:47 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstAtFront.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstAtFront.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -66 +65 @@
 Lst_AtFront (l, d)
     Lst         l;
-    void *      d;
+    ClientData  d;
 {
     register LstNode    front;

branches/FREEBSD/src/kmk/lst.lib/lstClose.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstClose.c       8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstClose.c,v 1.6 1999/08/28 01:03:47 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstClose.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstClose.c  8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 

branches/FREEBSD/src/kmk/lst.lib/lstConcat.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstConcat.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.7 1999/08/28 01:03:47 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -85 +84 @@
 
     if (flags == LST_CONCLINK) {
-        if (list2->firstPtr != NULL) {
+        if (list2->firstPtr != NilListNode) {
             /*
              * We set the nextPtr of the
-             * last element of list two to be NULL to make the loop easier and
+             * last element of list two to be NIL to make the loop easier and
              * so we don't need an extra case should the first list turn
              * out to be non-circular -- the final element will already point
-             * to NULL space and the first element will be untouched if it
-             * existed before and will also point to NULL space if it didn't.
+             * to NIL space and the first element will be untouched if it
+             * existed before and will also point to NIL space if it didn't.
              */
-            list2->lastPtr->nextPtr = NULL;
+            list2->lastPtr->nextPtr = NilListNode;
             /*
              * So long as the second list isn't empty, we just link the
@@ -104 +103 @@
              */
             list2->firstPtr->prevPtr = list1->lastPtr;
-            if (list1->lastPtr != NULL) {
+            if (list1->lastPtr != NilListNode) {
                 list1->lastPtr->nextPtr = list2->firstPtr;
             } else {
@@ -111 +110 @@
             list1->lastPtr = list2->lastPtr;
         }
-        if (list1->isCirc && list1->firstPtr != NULL) {
+        if (list1->isCirc && list1->firstPtr != NilListNode) {
             /*
              * If the first list is supposed to be circular and it is (now)
@@ -120 +119 @@
             list1->lastPtr->nextPtr = list1->firstPtr;
         }
-        free (l2);
-    } else if (list2->firstPtr != NULL) {
+        free ((Address)l2);
+    } else if (list2->firstPtr != NilListNode) {
         /*
-         * We set the nextPtr of the last element of list 2 to be NULL to make
+         * We set the nextPtr of the last element of list 2 to be nil to make
          * the loop less difficult. The loop simply goes through the entire
          * second list creating new LstNodes and filling in the nextPtr, and
@@ -130 +129 @@
          * follows the last of the new nodes along until the entire l2 has
          * been appended. Only then does the bookkeeping catch up with the
-         * changes. During the first iteration of the loop, if 'last' is NULL,
+         * changes. During the first iteration of the loop, if 'last' is nil,
          * the first list must have been empty so the newly-created node is
          * made the first node of the list.
          */
-        list2->lastPtr->nextPtr = NULL;
+        list2->lastPtr->nextPtr = NilListNode;
         for (last = list1->lastPtr, ln = list2->firstPtr;
-             ln != NULL;
+             ln != NilListNode;
              ln = ln->nextPtr)
         {
             PAlloc (nln, ListNode);
             nln->datum = ln->datum;
-            if (last != NULL) {
+            if (last != NilListNode) {
                 last->nextPtr = nln;
             } else {
@@ -167 +166 @@
             list1->firstPtr->prevPtr = list1->lastPtr;
         } else {
-            last->nextPtr = NULL;
+            last->nextPtr = NilListNode;
         }
 

branches/FREEBSD/src/kmk/lst.lib/lstDatum.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstDatum.c       8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDatum.c,v 1.5 1999/08/28 01:03:48 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDatum.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstDatum.c  8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -55 +54 @@
  *
  * Results:
- *      The datum or (ick!) NULL if the node is invalid.
+ *      The datum or (ick!) NIL if the node is invalid.
  *
  * Side Effects:
@@ -62 +61 @@
  *-----------------------------------------------------------------------
  */
-void *
+ClientData
 Lst_Datum (ln)
     LstNode     ln;
 {
-    if (ln != NULL) {
+    if (ln != NILLNODE) {
         return (((ListNode)ln)->datum);
     } else {
-        return ((void *) NULL);
+        return ((ClientData) NIL);
     }
 }

branches/FREEBSD/src/kmk/lst.lib/lstDeQueue.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstDeQueue.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDeQueue.c,v 1.6 1999/08/28 01:03:48 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDeQueue.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstDeQueue.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -55 +54 @@
  *
  * Results:
- *      The datum in the node at the head or (ick) NULL if the list
+ *      The datum in the node at the head or (ick) NIL if the list
  *      is empty.
  *
@@ -63 +62 @@
  *-----------------------------------------------------------------------
  */
-void *
+ClientData
 Lst_DeQueue (l)
     Lst           l;
 {
-    void *        rd;
+    ClientData    rd;
     register ListNode   tln;
 
     tln = (ListNode) Lst_First (l);
-    if (tln == NULL) {
-        return ((void *) NULL);
+    if (tln == NilListNode) {
+        return ((ClientData) NIL);
     }
 
     rd = tln->datum;
     if (Lst_Remove (l, (LstNode)tln) == FAILURE) {
-        return ((void *) NULL);
+        return ((ClientData) NIL);
     } else {
         return (rd);

branches/FREEBSD/src/kmk/lst.lib/lstDestroy.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstDestroy.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.7 1999/08/28 01:03:49 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstDestroy.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -67 +66 @@
 Lst_Destroy (l, freeProc)
     Lst                 l;
-    register void       (*freeProc)(void *);
+    register void       (*freeProc) __P((ClientData));
 {
     register ListNode   ln;
-    register ListNode   tln = NULL;
+    register ListNode   tln = NilListNode;
     register List       list = (List)l;
 
-    if (l == NULL || ! l) {
+    if (l == NILLST || ! l) {
         /*
          * Note the check for l == (Lst)0 to catch uninitialized static Lst's.
@@ -82 +81 @@
 
     /* To ease scanning */
-    if (list->lastPtr != NULL)
-        list->lastPtr->nextPtr = NULL;
+    if (list->lastPtr != NilListNode)
+        list->lastPtr->nextPtr = NilListNode;
     else {
-        free (l);
+        free ((Address)l);
         return;
     }
 
     if (freeProc) {
-        for (ln = list->firstPtr; ln != NULL; ln = tln) {
+        for (ln = list->firstPtr; ln != NilListNode; ln = tln) {
              tln = ln->nextPtr;
              (*freeProc) (ln->datum);
-             free (ln);
+             free ((Address)ln);
         }
     } else {
-        for (ln = list->firstPtr; ln != NULL; ln = tln) {
+        for (ln = list->firstPtr; ln != NilListNode; ln = tln) {
              tln = ln->nextPtr;
-             free (ln);
+             free ((Address)ln);
         }
     }
 
-    free (l);
+    free ((Address)l);
 }

branches/FREEBSD/src/kmk/lst.lib/lstDupl.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstDupl.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.7 1999/08/28 01:03:49 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstDupl.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -53 +52 @@
  *-----------------------------------------------------------------------
  * Lst_Duplicate --
- *      Duplicate an entire list. If a function to copy a void * is
+ *      Duplicate an entire list. If a function to copy a ClientData is
  *      given, the individual client elements will be duplicated as well.
  *
  * Results:
- *      The new Lst structure or NULL if failure.
+ *      The new Lst structure or NILLST if failure.
  *
  * Side Effects:
@@ -66 +65 @@
 Lst_Duplicate (l, copyProc)
     Lst           l;             /* the list to duplicate */
-    /* A function to duplicate each void * */
-    void *        (*copyProc)(void *);
+    /* A function to duplicate each ClientData */
+    ClientData    (*copyProc) __P((ClientData));
 {
     register Lst        nl;
@@ -74 +73 @@
 
     if (!LstValid (l)) {
-        return (NULL);
+        return (NILLST);
     }
 
     nl = Lst_Init (list->isCirc);
-    if (nl == NULL) {
-        return (NULL);
+    if (nl == NILLST) {
+        return (NILLST);
     }
 
     ln = list->firstPtr;
-    while (ln != NULL) {
+    while (ln != NilListNode) {
         if (copyProc != NOCOPY) {
             if (Lst_AtEnd (nl, (*copyProc) (ln->datum)) == FAILURE) {
-                return (NULL);
+                return (NILLST);
             }
         } else if (Lst_AtEnd (nl, ln->datum) == FAILURE) {
-            return (NULL);
+            return (NILLST);
         }
 
         if (list->isCirc && ln == list->lastPtr) {
-            ln = NULL;
+            ln = NilListNode;
         } else {
             ln = ln->nextPtr;

branches/FREEBSD/src/kmk/lst.lib/lstEnQueue.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstEnQueue.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstEnQueue.c,v 1.6 1999/08/28 01:03:50 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstEnQueue.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstEnQueue.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -66 +65 @@
 Lst_EnQueue (l, d)
     Lst           l;
-    void *        d;
+    ClientData    d;
 {
     if (LstValid (l) == FALSE) {

branches/FREEBSD/src/kmk/lst.lib/lstFind.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstFind.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.6 1999/08/28 01:03:50 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.11 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstFind.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -56 +55 @@
  *
  * Results:
- *      The found node or NULL if none matches.
+ *      The found node or NILLNODE if none matches.
  *
  * Side Effects:
@@ -66 +65 @@
 Lst_Find (l, d, cProc)
     Lst         l;
-    void *      d;
-    int         (*cProc)(void *, void *);
+    ClientData  d;
+    int         (*cProc) __P((ClientData, ClientData));
 {
     return (Lst_FindFrom (l, Lst_First(l), d, cProc));

branches/FREEBSD/src/kmk/lst.lib/lstFindFrom.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstFindFrom.c    8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.7 1999/08/28 01:03:50 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstFindFrom.c       8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -57 +56 @@
  *
  * Results:
- *      The found node or NULL
+ *      The found node or NILLNODE
  *
  * Side Effects:
@@ -68 +67 @@
     Lst                 l;
     register LstNode    ln;
-    register void * d;
-    register int        (*cProc)(void *, void *);
+    register ClientData d;
+    register int        (*cProc) __P((ClientData, ClientData));
 {
     register ListNode   tln;
@@ -75 +74 @@
 
     if (!LstValid (l) || LstIsEmpty (l) || !LstNodeValid (ln, l)) {
-        return (NULL);
+        return (NILLNODE);
     }
 
@@ -87 +86 @@
             tln = tln->nextPtr;
         }
-    } while (tln != (ListNode)ln && tln != NULL);
+    } while (tln != (ListNode)ln && tln != NilListNode);
 
     if (found) {
         return ((LstNode)tln);
     } else {
-        return (NULL);
+        return (NILLNODE);
     }
 }

branches/FREEBSD/src/kmk/lst.lib/lstFirst.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstFirst.c       8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFirst.c,v 1.5 1999/08/28 01:03:51 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstFirst.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstFirst.c  8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -55 +54 @@
  *
  * Results:
- *      The first node or NULL if the list is empty.
+ *      The first node or NILLNODE if the list is empty.
  *
  * Side Effects:
@@ -67 +66 @@
 {
     if (!LstValid (l) || LstIsEmpty (l)) {
-        return (NULL);
+        return (NILLNODE);
     } else {
         return ((LstNode)((List)l)->firstPtr);

branches/FREEBSD/src/kmk/lst.lib/lstForEach.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstForEach.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.6 1999/08/28 01:03:51 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstForEach.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -68 +67 @@
 Lst_ForEach (l, proc, d)
     Lst                 l;
-    register int        (*proc)(void *, void *);
-    register void *     d;
+    register int        (*proc) __P((ClientData, ClientData));
+    register ClientData d;
 {
     Lst_ForEachFrom(l, Lst_First(l), proc, d);

branches/FREEBSD/src/kmk/lst.lib/lstForEachFrom.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstForEachFrom.c 8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.7 1999/08/28 01:03:52 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.12 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstForEachFrom.c    8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -70 +69 @@
     Lst                 l;
     LstNode             ln;
-    register int        (*proc)(void *, void *);
-    register void *     d;
+    register int        (*proc) __P((ClientData, ClientData));
+    register ClientData d;
 {
     register ListNode   tln = (ListNode)ln;
@@ -102 +101 @@
          */
         done = (next == tln->nextPtr &&
-                (next == NULL || next == list->firstPtr));
+                (next == NilListNode || next == list->firstPtr));
 
         next = tln->nextPtr;

branches/FREEBSD/src/kmk/lst.lib/lstInit.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstInit.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInit.c,v 1.6 1999/08/28 01:03:52 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstInit.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstInit.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -70 +69 @@
     PAlloc (nList, List);
 
-    nList->firstPtr = NULL;
-    nList->lastPtr = NULL;
+    nList->firstPtr = NilListNode;
+    nList->lastPtr = NilListNode;
     nList->isOpen = FALSE;
     nList->isCirc = circ;

branches/FREEBSD/src/kmk/lst.lib/lstInsert.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstInsert.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInsert.c,v 1.6 1999/08/28 01:03:52 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstInsert.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstInsert.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -68 +67 @@
     Lst                 l;      /* list to manipulate */
     LstNode             ln;     /* node before which to insert d */
-    void *              d;      /* datum to be inserted */
+    ClientData          d;      /* datum to be inserted */
 {
     register ListNode   nLNode; /* new lnode for d */
@@ -78 +77 @@
      * check validity of arguments
      */
-    if (LstValid (l) && (LstIsEmpty (l) && ln == NULL))
+    if (LstValid (l) && (LstIsEmpty (l) && ln == NILLNODE))
         goto ok;
 
@@ -91 +90 @@
     nLNode->useCount = nLNode->flags = 0;
 
-    if (ln == NULL) {
+    if (ln == NILLNODE) {
         if (list->isCirc) {
             nLNode->prevPtr = nLNode->nextPtr = nLNode;
         } else {
-            nLNode->prevPtr = nLNode->nextPtr = NULL;
+            nLNode->prevPtr = nLNode->nextPtr = NilListNode;
         }
         list->firstPtr = list->lastPtr = nLNode;
@@ -102 +101 @@
         nLNode->nextPtr = lNode;
 
-        if (nLNode->prevPtr != NULL) {
+        if (nLNode->prevPtr != NilListNode) {
             nLNode->prevPtr->nextPtr = nLNode;
         }

branches/FREEBSD/src/kmk/lst.lib/lstInt.h

@@ -35 +35 @@
  *
  *      from: @(#)lstInt.h      8.1 (Berkeley) 6/6/93
- * $FreeBSD: src/usr.bin/make/lst.lib/lstInt.h,v 1.10 2002/07/15 06:57:25 jmallett Exp $
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInt.h,v 1.7 1999/08/28 01:03:53 peter Exp $
  */
 
@@ -51 +51 @@
         struct ListNode *prevPtr;   /* previous element in list */
         struct ListNode *nextPtr;   /* next in list */
-        int             useCount:8, /* Count of functions using the node.
+        short           useCount:8, /* Count of functions using the node.
                                      * node may not be deleted until count
                                      * goes to 0 */
                         flags:8;    /* Node status flags */
-        void *  datum;      /* datum associated with this element */
+        ClientData      datum;      /* datum associated with this element */
 } *ListNode;
 /*
@@ -61 +61 @@
  */
 #define LN_DELETED      0x0001      /* List node should be removed when done */
+
+#define NilListNode     ((ListNode)-1)
 
 typedef enum {
@@ -76 +78 @@
         Where           atEnd;    /* Where in the list the last access was */
         Boolean         isOpen;   /* true if list has been Lst_Open'ed */
-        ListNode        curPtr;   /* current node, if open. NULL if
+        ListNode        curPtr;   /* current node, if open. NilListNode if
                                    * *just* opened */
         ListNode        prevPtr;  /* Previous node, if open. Used by
                                    * Lst_Remove */
 } *List;
+
+#define NilList         ((List)-1)
 
 /*
@@ -92 +96 @@
  *      Return TRUE if the list l is valid
  */
-#define LstValid(l)     (((Lst)l == NULL) ? FALSE : TRUE)
+#define LstValid(l)     (((Lst)l == NILLST) ? FALSE : TRUE)
 
 /*
@@ -98 +102 @@
  *      Return TRUE if the LstNode ln is valid with respect to l
  */
-#define LstNodeValid(ln, l)     ((((LstNode)ln) == NULL) ? FALSE : TRUE)
+#define LstNodeValid(ln, l)     ((((LstNode)ln) == NILLNODE) ? FALSE : TRUE)
 
 /*
@@ -104 +108 @@
  *      TRUE if the list l is empty.
  */
-#define LstIsEmpty(l)   (((List)l)->firstPtr == NULL)
+#define LstIsEmpty(l)   (((List)l)->firstPtr == NilListNode)
 
 #endif /* _LSTINT_H_ */

branches/FREEBSD/src/kmk/lst.lib/lstIsAtEnd.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstIsAtEnd.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstIsAtEnd.c,v 1.5 1999/08/28 01:03:53 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstIsAtEnd.c,v 1.7 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstIsAtEnd.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 

branches/FREEBSD/src/kmk/lst.lib/lstIsEmpty.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstIsEmpty.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstIsEmpty.c,v 1.5 1999/08/28 01:03:54 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstIsEmpty.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstIsEmpty.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -60 +59 @@
  *      None.
  *
- *      A list is considered empty if its firstPtr == NULL (or if
- *      the list itself is NULLLIST).
+ *      A list is considered empty if its firstPtr == NilListNode (or if
+ *      the list itself is NILLIST).
  *-----------------------------------------------------------------------
  */

branches/FREEBSD/src/kmk/lst.lib/lstLast.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstLast.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstLast.c,v 1.5 1999/08/28 01:03:55 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstLast.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstLast.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -55 +54 @@
  *
  * Results:
- *      The requested node or NULL if the list is empty.
+ *      The requested node or NILLNODE if the list is empty.
  *
  * Side Effects:
@@ -67 +66 @@
 {
     if (!LstValid(l) || LstIsEmpty (l)) {
-        return (NULL);
+        return (NILLNODE);
     } else {
         return ((LstNode)((List)l)->lastPtr);

branches/FREEBSD/src/kmk/lst.lib/lstMember.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstMember.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstMember.c,v 1.6 1999/08/28 01:03:55 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstMember.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstMember.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -52 +51 @@
 Lst_Member (l, d)
     Lst                 l;
-    void *              d;
+    ClientData          d;
 {
     List                list = (List) l;
@@ -58 +57 @@
 
     lNode = list->firstPtr;
-    if (lNode == NULL) {
-        return NULL;
+    if (lNode == NilListNode) {
+        return NILLNODE;
     }
 
@@ -67 +66 @@
         }
         lNode = lNode->nextPtr;
-    } while (lNode != NULL && lNode != list->firstPtr);
+    } while (lNode != NilListNode && lNode != list->firstPtr);
 
-    return NULL;
+    return NILLNODE;
 }

branches/FREEBSD/src/kmk/lst.lib/lstNext.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstNext.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstNext.c,v 1.6 1999/08/28 01:03:55 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstNext.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstNext.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -60 +59 @@
  *
  * Results:
- *      The next node or NULL if the list has yet to be opened. Also
- *      if the list is non-circular and the end has been reached, NULL
+ *      The next node or NILLNODE if the list has yet to be opened. Also
+ *      if the list is non-circular and the end has been reached, NILLNODE
  *      is returned.
  *
@@ -78 +77 @@
     if ((LstValid (l) == FALSE) ||
         (list->isOpen == FALSE)) {
-            return (NULL);
+            return (NILLNODE);
     }
 
     list->prevPtr = list->curPtr;
 
-    if (list->curPtr == NULL) {
+    if (list->curPtr == NilListNode) {
         if (list->atEnd == Unknown) {
             /*
@@ -93 +92 @@
             list->atEnd = Middle;
         } else {
-            tln = NULL;
+            tln = NilListNode;
             list->atEnd = Tail;
         }
@@ -100 +99 @@
         list->curPtr = tln;
 
-        if (tln == list->firstPtr || tln == NULL) {
+        if (tln == list->firstPtr || tln == NilListNode) {
             /*
              * If back at the front, then we've hit the end...

branches/FREEBSD/src/kmk/lst.lib/lstOpen.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstOpen.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstOpen.c,v 1.5 1999/08/28 01:03:56 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstOpen.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstOpen.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -63 +62 @@
  *
  * Side Effects:
- *      isOpen is set TRUE and curPtr is set to NULL so the
+ *      isOpen is set TRUE and curPtr is set to NilListNode so the
  *      other sequential functions no it was just opened and can choose
  *      the first element accessed based on this.
@@ -78 +77 @@
         ((List) l)->isOpen = TRUE;
         ((List) l)->atEnd = LstIsEmpty (l) ? Head : Unknown;
-        ((List) l)->curPtr = NULL;
+        ((List) l)->curPtr = NilListNode;
 
         return (SUCCESS);

branches/FREEBSD/src/kmk/lst.lib/lstRemove.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstRemove.c      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.6 1999/08/28 01:03:56 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.10 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstRemove.c 8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -58 +57 @@
  *
  * Side Effects:
- *      The list's firstPtr will be set to NULL if ln is the last
+ *      The list's firstPtr will be set to NilListNode if ln is the last
  *      node on the list. firsPtr and lastPtr will be altered if ln is
  *      either the first or last node, respectively, on the list.
@@ -80 +79 @@
      * unlink it from the list
      */
-    if (lNode->nextPtr != NULL) {
+    if (lNode->nextPtr != NilListNode) {
         lNode->nextPtr->prevPtr = lNode->prevPtr;
     }
-    if (lNode->prevPtr != NULL) {
+    if (lNode->prevPtr != NilListNode) {
         lNode->prevPtr->nextPtr = lNode->nextPtr;
     }
@@ -101 +100 @@
      * Sequential access stuff. If the node we're removing is the current
      * node in the list, reset the current node to the previous one. If the
-     * previous one was non-existent (prevPtr == NULL), we set the
+     * previous one was non-existent (prevPtr == NilListNode), we set the
      * end to be Unknown, since it is.
      */
     if (list->isOpen && (list->curPtr == lNode)) {
         list->curPtr = list->prevPtr;
-        if (list->curPtr == NULL) {
+        if (list->curPtr == NilListNode) {
             list->atEnd = Unknown;
         }
@@ -117 +116 @@
      */
     if (list->firstPtr == lNode) {
-        list->firstPtr = NULL;
+        list->firstPtr = NilListNode;
     }
 
@@ -125 +124 @@
      */
     if (lNode->useCount == 0) {
-        free (ln);
+        free ((Address)ln);
     } else {
         lNode->flags |= LN_DELETED;

branches/FREEBSD/src/kmk/lst.lib/lstReplace.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstReplace.c     8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstReplace.c,v 1.5 1999/08/28 01:03:56 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstReplace.c,v 1.9 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstReplace.c        8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -65 +64 @@
 Lst_Replace (ln, d)
     register LstNode    ln;
-    void *              d;
+    ClientData          d;
 {
-    if (ln == NULL) {
+    if (ln == NILLNODE) {
         return (FAILURE);
     } else {

branches/FREEBSD/src/kmk/lst.lib/lstSucc.c

@@ -34 +34 @@
  * SUCH DAMAGE.
  *
- * @(#)lstSucc.c        8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.5 1999/08/28 01:03:57 peter Exp $
  */
 
 #ifndef lint
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.8 2002/10/09 02:00:22 jmallett Exp $");
+static char sccsid[] = "@(#)lstSucc.c   8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
@@ -68 +67 @@
     LstNode     ln;
 {
-    if (ln == NULL) {
-        return (NULL);
+    if (ln == NILLNODE) {
+        return (NILLNODE);
     } else {
         return ((LstNode) ((ListNode) ln)->nextPtr);

branches/FREEBSD/src/kmk/main.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)main.c      8.3 (Berkeley) 3/19/94
- */
+ */
+
+#ifndef lint
+static const char copyright[] =
+"@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
+        The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
 
 #ifndef lint
 #if 0
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
-        The Regents of the University of California.  All rights reserved.\n";
+static char sccsid[] = "@(#)main.c      8.3 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/main.c,v 1.35.2.6 2002/07/24 16:50:18 ru Exp $";
 #endif
 #endif /* not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/main.c,v 1.79 2002/10/10 19:27:48 jmallett Exp $");
 
 /*-
@@ -59 +62 @@
  *                              invoked. Used by the parse module to implement
  *                              the .MFLAGS target.
+ *
+ *      Error                   Print a tagged error message. The global
+ *                              MAKE variable must have been defined. This
+ *                              takes a format string and two optional
+ *                              arguments for it.
+ *
+ *      Fatal                   Print an error message and exit. Also takes
+ *                              a format string and two arguments.
+ *
+ *      Punt                    Aborts all jobs and exits with a message. Also
+ *                              takes a format string and two arguments.
+ *
+ *      Finish                  Finish things up by printing the number of
+ *                              errors which occured, as passed to it, and
+ *                              exiting.
  */
 
@@ -80 +98 @@
 #include <stdio.h>
 #include <sysexits.h>
+#ifdef __STDC__
 #include <stdarg.h>
-#include <unistd.h>
+#else
+#include <varargs.h>
+#endif
 #include "make.h"
 #include "hash.h"
@@ -88 +109 @@
 #include "pathnames.h"
 
-#define WANT_ENV_MKLVL  1
-
 #ifndef DEFMAXLOCAL
 #define DEFMAXLOCAL DEFMAXJOBS
@@ -103 +122 @@
 static Boolean          noBuiltins;     /* -r flag */
 static Lst              makefiles;      /* ordered list of makefiles to read */
+static Boolean          printVars;      /* print value of one or more vars */
 static Boolean          expandVars;     /* fully expand printed variables */
 static Lst              variables;      /* list of variables to print */
@@ -121 +141 @@
 Boolean                 checkEnvFirst;  /* -e flag */
 Lst                     envFirstVars;   /* (-E) vars to override from env */
-Boolean                 jobsRunning;    /* TRUE if the jobs might be running */
-
-static void             MainParseArgs(int, char **);
-char *                  chdir_verify_path(char *, char *);
-static int              ReadMakefile(void *, void *);
-static void             usage(void);
+static Boolean          jobsRunning;    /* TRUE if the jobs might be running */
+
+static void             MainParseArgs __P((int, char **));
+char *                  chdir_verify_path __P((char *, char *));
+static int              ReadMakefile __P((ClientData, ClientData));
+static void             usage __P((void));
 
 static char *curdir;                    /* startup directory */
@@ -146 +166 @@
  */
 static void
-MainParseArgs(int argc, char **argv)
-{
+MainParseArgs(argc, argv)
+        int argc;
+        char **argv;
+{
+        extern int optind;
+        extern char *optarg;
         char *p;
         int c;
@@ -153 +177 @@
         optind = 1;     /* since we're called more than once */
 #ifdef REMOTE
-# define OPTFLAGS "BC:D:E:I:L:PSV:Xd:ef:ij:km:nqrstv"
+# define OPTFLAGS "BD:E:I:L:PSV:Xd:ef:ij:km:nqrstv"
 #else
-# define OPTFLAGS "BC:D:E:I:PSV:Xd:ef:ij:km:nqrstv"
+# define OPTFLAGS "BD:E:I:PSV:Xd:ef:ij:km:nqrstv"
 #endif
 rearg:  while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
                 switch(c) {
-                case 'C':
-                        chdir(optarg);
-                        break;
                 case 'D':
                         Var_Set(optarg, "1", VAR_GLOBAL);
@@ -173 +194 @@
                         break;
                 case 'V':
-                        (void)Lst_AtEnd(variables, (void *)optarg);
+                        printVars = TRUE;
+                        (void)Lst_AtEnd(variables, (ClientData)optarg);
                         Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL);
                         Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
@@ -264 +286 @@
                 }
                 case 'E':
-                        p = emalloc(strlen(optarg) + 1);
+                        p = malloc(strlen(optarg) + 1);
+                        if (!p)
+                                Punt("make: cannot allocate memory.");
                         (void)strcpy(p, optarg);
-                        (void)Lst_AtEnd(envFirstVars, (void *)p);
+                        (void)Lst_AtEnd(envFirstVars, (ClientData)p);
                         Var_Append(MAKEFLAGS, "-E", VAR_GLOBAL);
                         Var_Append(MAKEFLAGS, optarg, VAR_GLOBAL);
@@ -275 +299 @@
                         break;
                 case 'f':
-                        (void)Lst_AtEnd(makefiles, (void *)optarg);
+                        (void)Lst_AtEnd(makefiles, (ClientData)optarg);
                         break;
                 case 'i':
@@ -358 +382 @@
                                 goto rearg;
                         }
-                        (void)Lst_AtEnd(create, (void *)estrdup(*argv));
+                        (void)Lst_AtEnd(create, (ClientData)estrdup(*argv));
                 }
 }
@@ -378 +402 @@
  */
 void
-Main_ParseArgLine(char *line)
+Main_ParseArgLine(line)
+        char *line;                     /* Line to fracture */
 {
         char **argv;                    /* Manufactured argument vector */
@@ -395 +420 @@
 
 char *
-chdir_verify_path(char *path, char *obpath)
+chdir_verify_path(path, obpath)
+        char *path;
+        char *obpath;
 {
         struct stat sb;
 
         if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
-                if (chdir(path) == -1 || getcwd(obpath, MAXPATHLEN) == NULL) {
+                if (chdir(path)) {
                         warn("warning: %s", path);
                         return 0;
                 }
-                return obpath;
+                else {
+                        if (path[0] != '/') {
+                                (void) snprintf(obpath, MAXPATHLEN, "%s/%s",
+                                                curdir, path);
+                                return obpath;
+                        }
+                        else
+                                return path;
+                }
         }
 
@@ -429 +464 @@
  */
 int
-main(int argc, char **argv)
+main(argc, argv)
+        int argc;
+        char **argv;
 {
         Lst targs;      /* target nodes to create -- passed to Make_Init */
@@ -435 +472 @@
         struct stat sa;
         char *p, *p1, *path, *pathp;
-#ifdef WANT_ENV_MKLVL
-#define MKLVL_MAXVAL    500
-#define MKLVL_ENVVAR    "__MKLVL__"
-        int iMkLvl = 0;
-        char *szMkLvl = getenv(MKLVL_ENVVAR);
-#endif  /* WANT_ENV_MKLVL */
-        char mdpath[MAXPATHLEN];
-        char obpath[MAXPATHLEN];
-        char cdpath[MAXPATHLEN];
+#ifdef WANT_ENV_PWD
+        struct stat sb;
+        char *pwd;
+#endif
+        char mdpath[MAXPATHLEN + 1];
+        char obpath[MAXPATHLEN + 1];
+        char cdpath[MAXPATHLEN + 1];
         char *machine = getenv("MACHINE");
         char *machine_arch = getenv("MACHINE_ARCH");
@@ -452 +487 @@
         static char syspath[] = _PATH_DEFSYSPATH;
 
-#ifdef WANT_ENV_MKLVL
-        if ((iMkLvl = szMkLvl ? atoi(szMkLvl) : 0) < 0) {
-          iMkLvl = 0;
-        }
-        if (iMkLvl++ > MKLVL_MAXVAL) {
-          errc(2, EAGAIN, 
-               "Max recursion level (%d) exceeded.", MKLVL_MAXVAL);
-        }
-        bzero(szMkLvl = emalloc(32), 32);
-        sprintf(szMkLvl, "%d", iMkLvl);
-        setenv(MKLVL_ENVVAR, szMkLvl, 1);
-#endif /* WANT_ENV_MKLVL */
-
-#if DEFSHELL == 2
-        /*
-         * Turn off ENV to make ksh happier.
-         */
-        unsetenv("ENV");
-#endif
-
 #ifdef RLIMIT_NOFILE
         /*
@@ -486 +501 @@
 #endif
         /*
-         * Find where we are...
+         * Find where we are and take care of PWD for the automounter...
          * All this code is so that we know where we are when we start up
          * on a different machine with pmake.
@@ -496 +511 @@
         if (stat(curdir, &sa) == -1)
             err(2, "%s", curdir);
+
+#ifdef WANT_ENV_PWD
+        if ((pwd = getenv("PWD")) != NULL) {
+            if (stat(pwd, &sb) == 0 && sa.st_ino == sb.st_ino &&
+                sa.st_dev == sb.st_dev)
+                (void) strcpy(curdir, pwd);
+        }
+#endif
 
 #if defined(__i386__) && defined(__FreeBSD_version) && \
@@ -532 +555 @@
             struct utsname utsname;
 
-            if (uname(&utsname) == -1)
-                    err(2, "uname");
+            if (uname(&utsname) == -1) {
+                    perror("make: uname");
+                    exit(2);
+            }
             machine = utsname.machine;
 #else
@@ -603 +628 @@
         }
 
+#ifdef WANT_ENV_PWD
+        setenv("PWD", objdir, 1);
+#endif
+
         create = Lst_Init(FALSE);
         makefiles = Lst_Init(FALSE);
         envFirstVars = Lst_Init(FALSE);
+        printVars = FALSE;
         expandVars = TRUE;
         variables = Lst_Init(FALSE);
@@ -659 +689 @@
         Var_Set("MACHINE_ARCH", machine_arch, VAR_GLOBAL);
         Var_Set("MACHINE_CPU", machine_cpu, VAR_GLOBAL);
-#ifdef MAKE_VERSION
-        Var_Set("MAKE_VERSION", MAKE_VERSION, VAR_GLOBAL);
-#endif
 
         /*
@@ -691 +718 @@
         Suff_Init();
 
-        DEFAULT = NULL;
+        DEFAULT = NILGNODE;
         (void)time(&now);
 
@@ -702 +729 @@
                 LstNode ln;
 
-                for (ln = Lst_First(create); ln != NULL;
+                for (ln = Lst_First(create); ln != NILLNODE;
                     ln = Lst_Succ(ln)) {
                         char *name = (char *)Lst_Datum(ln);
@@ -742 +769 @@
                 if (Lst_IsEmpty(sysMkPath))
                         Fatal("make: no system rules (%s).", _PATH_DEFSYSMK);
-                ln = Lst_Find(sysMkPath, (void *)NULL, ReadMakefile);
-                if (ln != NULL)
+                ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
+                if (ln != NILLNODE)
                         Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
         }
@@ -750 +777 @@
                 LstNode ln;
 
-                ln = Lst_Find(makefiles, (void *)NULL, ReadMakefile);
-                if (ln != NULL)
+                ln = Lst_Find(makefiles, (ClientData)NULL, ReadMakefile);
+                if (ln != NILLNODE)
                         Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
-        } else if (!ReadMakefile("BSDmakefile", NULL))
-            if (!ReadMakefile("makefile", NULL))
+        } else if (!ReadMakefile("makefile", NULL))
                 (void)ReadMakefile("Makefile", NULL);
 
@@ -778 +804 @@
          */
         if (Var_Exists("VPATH", VAR_CMD)) {
-                char *vpath, savec;
+                char *vpath, *path, *cp, savec;
                 /*
                  * GCC stores string constants in read-only memory, but
@@ -800 +826 @@
                         path = cp + 1;
                 } while (savec == ':');
-                (void)free(vpath);
+                (void)free((Address)vpath);
         }
 
@@ -814 +840 @@
 
         /* print the values of any variables requested by the user */
-        if (!Lst_IsEmpty(variables)) {
+        if (printVars) {
                 LstNode ln;
 
-                for (ln = Lst_First(variables); ln != NULL;
+                for (ln = Lst_First(variables); ln != NILLNODE;
                     ln = Lst_Succ(ln)) {
                         char *value;
                         if (expandVars) {
-                                p1 = emalloc(strlen((char *)Lst_Datum(ln)) + 1 + 3);
+                                p1 = malloc(strlen((char *)Lst_Datum(ln)) + 1 + 3);
+                                if (!p1)
+                                        Punt("make: cannot allocate memory.");
                                 /* This sprintf is safe, because of the malloc above */
                                 (void)sprintf(p1, "${%s}", (char *)Lst_Datum(ln));
@@ -833 +861 @@
                                 free(p1);
                 }
-        } else {
-
+        }
+
+        /*
+         * Have now read the entire graph and need to make a list of targets
+         * to create. If none was given on the command line, we consult the
+         * parsing module to find the main target(s) to create.
+         */
+        if (Lst_IsEmpty(create))
+                targs = Parse_MainName();
+        else
+                targs = Targ_FindList(create, TARG_CREATE);
+
+        if (!compatMake && !printVars) {
                 /*
-                 * Have now read the entire graph and need to make a list of targets
-                 * to create. If none was given on the command line, we consult the
-                 * parsing module to find the main target(s) to create.
+                 * Initialize job module before traversing the graph, now that
+                 * any .BEGIN and .END targets have been read.  This is done
+                 * only if the -q flag wasn't given (to prevent the .BEGIN from
+                 * being executed should it exist).
                  */
-                if (Lst_IsEmpty(create))
-                        targs = Parse_MainName();
-                else
-                        targs = Targ_FindList(create, TARG_CREATE);
-
-                if (!compatMake) {
-                        /*
-                         * Initialize job module before traversing the graph, now that
-                         * any .BEGIN and .END targets have been read.  This is done
-                         * only if the -q flag wasn't given (to prevent the .BEGIN from
-                         * being executed should it exist).
-                         */
-                        if (!queryFlag) {
-                                if (maxLocal == -1)
-                                        maxLocal = maxJobs;
-                                Job_Init(maxJobs, maxLocal);
-                                jobsRunning = TRUE;
-                        }
-
-                        /* Traverse the graph, checking on all the targets */
-                        outOfDate = Make_Run(targs);
-                } else {
-                        /*
-                         * Compat_Init will take care of creating all the targets as
-                         * well as initializing the module.
-                         */
-                        Compat_Run(targs);
-                }
-                Lst_Destroy(targs, NOFREE);
-        }
-
+                if (!queryFlag) {
+                        if (maxLocal == -1)
+                                maxLocal = maxJobs;
+                        Job_Init(maxJobs, maxLocal);
+                        jobsRunning = TRUE;
+                }
+
+                /* Traverse the graph, checking on all the targets */
+                outOfDate = Make_Run(targs);
+        } else if (!printVars) {
+                /*
+                 * Compat_Init will take care of creating all the targets as
+                 * well as initializing the module.
+                 */
+                Compat_Run(targs);
+        }
+
+        Lst_Destroy(targs, NOFREE);
         Lst_Destroy(variables, NOFREE);
         Lst_Destroy(makefiles, NOFREE);
-        Lst_Destroy(create, (void (*)(void *)) free);
+        Lst_Destroy(create, (void (*) __P((ClientData))) free);
 
         /* print the graph now it's been processed if the user requested it */
@@ -904 +931 @@
  */
 static Boolean
-ReadMakefile(void *p, void *q __unused)
-{
-        char *fname;                    /* makefile to read */
+ReadMakefile(p, q)
+        ClientData p, q;
+{
+        char *fname = p;                /* makefile to read */
+        extern Lst parseIncPath;
         FILE *stream;
-        char *name, path[MAXPATHLEN];
+        char *name, path[MAXPATHLEN + 1];
         char *MAKEFILE;
         int setMAKEFILE;
-
-        fname = p;
 
         if (!strcmp(fname, "-")) {
@@ -923 +950 @@
                 if (curdir != objdir && *fname != '/') {
                         (void)snprintf(path, MAXPATHLEN, "%s/%s", curdir, fname);
-                        /*
-                         * XXX The realpath stuff breaks relative includes
-                         * XXX in some cases.   The problem likely is in
-                         * XXX parse.c where it does special things in
-                         * XXX ParseDoInclude if the file is relateive
-                         * XXX or absolute and not a system file.  There
-                         * XXX it assumes that if the current file that's
-                         * XXX being included is absolute, that any files
-                         * XXX that it includes shouldn't do the -I path
-                         * XXX stuff, which is inconsistant with historical
-                         * XXX behavior.  However, I can't pentrate the mists
-                         * XXX further, so I'm putting this workaround in
-                         * XXX here until such time as the underlying bug
-                         * XXX can be fixed.
-                         */
-#if THIS_BREAKS_THINGS
                         if (realpath(path, path) != NULL &&
                             (stream = fopen(path, "r")) != NULL) {
@@ -951 +962 @@
                                 goto found;
                 }
-#else
-                        if ((stream = fopen(path, "r")) != NULL) {
-                                MAKEFILE = fname;
-                                fname = path;
-                                goto found;
-                        }
-                } else {
-                        MAKEFILE = fname;
-                        if ((stream = fopen(fname, "r")) != NULL)
-                                goto found;
-                }
-#endif
                 /* look in -I and system include directories. */
                 name = Dir_FindFile(fname, parseIncPath);
@@ -991 +990 @@
  * Results:
  *      A string containing the output of the command, or the empty string
- *      If error is not NULL, it contains the reason for the command failure
+ *      If err is not NULL, it contains the reason for the command failure
  *
  * Side Effects:
@@ -997 +996 @@
  */
 char *
-Cmd_Exec(char *cmd, char **error)
+Cmd_Exec(cmd, err)
+    char *cmd;
+    char **err;
 {
     char        *args[4];       /* Args for invoking the shell */
@@ -1009 +1010 @@
     int         cc;
 
-    *error = NULL;
+
+    *err = NULL;
 
     /*
@@ -1023 +1025 @@
      */
     if (pipe(fds) == -1) {
-        *error = "Couldn't create pipe for \"%s\"";
+        *err = "Couldn't create pipe for \"%s\"";
         goto bad;
     }
@@ -1045 +1047 @@
         (void) close(fds[1]);
 
-#if defined(DEFSHELL) && DEFSHELL == 0
-        (void) execv("/bin/csh", args);
-#elif DEFSHELL == 1
         (void) execv("/bin/sh", args);
-#elif DEFSHELL == 2
-        (void) execv("/bin/ksh", args);
-#else
-#error "DEFSHELL must be 1 or 2."
-#endif
         _exit(1);
         /*NOTREACHED*/
 
     case -1:
-        *error = "Couldn't exec \"%s\"";
+        *err = "Couldn't exec \"%s\"";
         goto bad;
 
@@ -1089 +1083 @@
 
         if (cc == -1)
-            *error = "Error reading shell's output for \"%s\"";
+            *err = "Error reading shell's output for \"%s\"";
 
         res = (char *)Buf_GetAll (buf, &cc);
@@ -1095 +1089 @@
 
         if (status)
-            *error = "\"%s\" returned non-zero status";
+            *err = "\"%s\" returned non-zero status";
 
         /*
@@ -1125 +1119 @@
 }
 
+/*-
+ * Error --
+ *      Print an error message given its format.
+ *
+ * Results:
+ *      None.
+ *
+ * Side Effects:
+ *      The message is printed.
+ */
+/* VARARGS */
+void
+#ifdef __STDC__
+Error(char *fmt, ...)
+#else
+Error(va_alist)
+        va_dcl
+#endif
+{
+        va_list ap;
+#ifdef __STDC__
+        va_start(ap, fmt);
+#else
+        char *fmt;
+
+        va_start(ap);
+        fmt = va_arg(ap, char *);
+#endif
+        (void)vfprintf(stderr, fmt, ap);
+        va_end(ap);
+        (void)fprintf(stderr, "\n");
+        (void)fflush(stderr);
+}
+
+/*-
+ * Fatal --
+ *      Produce a Fatal error message. If jobs are running, waits for them
+ *      to finish.
+ *
+ * Results:
+ *      None
+ *
+ * Side Effects:
+ *      The program exits
+ */
+/* VARARGS */
+void
+#ifdef __STDC__
+Fatal(char *fmt, ...)
+#else
+Fatal(va_alist)
+        va_dcl
+#endif
+{
+        va_list ap;
+#ifdef __STDC__
+        va_start(ap, fmt);
+#else
+        char *fmt;
+
+        va_start(ap);
+        fmt = va_arg(ap, char *);
+#endif
+        if (jobsRunning)
+                Job_Wait();
+
+        (void)vfprintf(stderr, fmt, ap);
+        va_end(ap);
+        (void)fprintf(stderr, "\n");
+        (void)fflush(stderr);
+
+        if (DEBUG(GRAPH2))
+                Targ_PrintGraph(2);
+        exit(2);                /* Not 1 so -q can distinguish error */
+}
+
+/*
+ * Punt --
+ *      Major exception once jobs are being created. Kills all jobs, prints
+ *      a message and exits.
+ *
+ * Results:
+ *      None
+ *
+ * Side Effects:
+ *      All children are killed indiscriminately and the program Lib_Exits
+ */
+/* VARARGS */
+void
+#ifdef __STDC__
+Punt(char *fmt, ...)
+#else
+Punt(va_alist)
+        va_dcl
+#endif
+{
+        va_list ap;
+#if __STDC__
+        va_start(ap, fmt);
+#else
+        char *fmt;
+
+        va_start(ap);
+        fmt = va_arg(ap, char *);
+#endif
+
+        (void)fprintf(stderr, "make: ");
+        (void)vfprintf(stderr, fmt, ap);
+        va_end(ap);
+        (void)fprintf(stderr, "\n");
+        (void)fflush(stderr);
+
+        DieHorribly();
+}
+
+/*-
+ * DieHorribly --
+ *      Exit without giving a message.
+ *
+ * Results:
+ *      None
+ *
+ * Side Effects:
+ *      A big one...
+ */
+void
+DieHorribly()
+{
+        if (jobsRunning)
+                Job_AbortAll();
+        if (DEBUG(GRAPH2))
+                Targ_PrintGraph(2);
+        exit(2);                /* Not 1, so -q can distinguish error */
+}
+
+/*
+ * Finish --
+ *      Called when aborting due to errors in child shell to signal
+ *      abnormal exit.
+ *
+ * Results:
+ *      None
+ *
+ * Side Effects:
+ *      The program exits
+ */
+void
+Finish(errors)
+        int errors;     /* number of errors encountered in Make_Make */
+{
+        Fatal("%d error%s", errors, errors == 1 ? "" : "s");
+}
+
+/*
+ * emalloc --
+ *      malloc, but die on error.
+ */
+void *
+emalloc(len)
+        size_t len;
+{
+        void *p;
+
+        if ((p = malloc(len)) == NULL)
+                enomem();
+        return(p);
+}
+
+/*
+ * estrdup --
+ *      strdup, but die on error.
+ */
+char *
+estrdup(str)
+        const char *str;
+{
+        char *p;
+
+        if ((p = strdup(str)) == NULL)
+                enomem();
+        return(p);
+}
+
+/*
+ * erealloc --
+ *      realloc, but die on error.
+ */
+void *
+erealloc(ptr, size)
+        void *ptr;
+        size_t size;
+{
+        if ((ptr = realloc(ptr, size)) == NULL)
+                enomem();
+        return(ptr);
+}
+
+/*
+ * enomem --
+ *      die when out of memory.
+ */
+void
+enomem()
+{
+        err(2, NULL);
+}
+
+/*
+ * enunlink --
+ *      Remove a file carefully, avoiding directories.
+ */
+int
+eunlink(file)
+        const char *file;
+{
+        struct stat st;
+
+        if (lstat(file, &st) == -1)
+                return -1;
+
+        if (S_ISDIR(st.st_mode)) {
+                errno = EISDIR;
+                return -1;
+        }
+        return unlink(file);
+}
+
 /*
  * usage --
@@ -1130 +1351 @@
  */
 static void
-usage(void)
+usage()
 {
         (void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -1138 +1359 @@
         exit(2);
 }
+
+
+int
+PrintAddr(a, b)
+    ClientData a;
+    ClientData b;
+{
+    printf("%lx ", (unsigned long) a);
+    return b ? 0 : 0;
+}

branches/FREEBSD/src/kmk/make.1

@@ -30 +30 @@
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)make.1      8.8 (Berkeley) 6/13/95
-.\" $FreeBSD: src/usr.bin/make/make.1,v 1.59 2002/09/27 09:21:07 ru Exp $
+.\"     from: @(#)make.1        8.4 (Berkeley) 3/19/94
+.\" $FreeBSD: src/usr.bin/make/make.1,v 1.29.2.14 2002/09/09 19:06:16 archie Exp $
 .\"
-.Dd June 13, 1995
+.Dd March 19, 1994
 .Dt MAKE 1
 .Os
@@ -42 +42 @@
 .Nm
 .Op Fl BPSXeiknqrstv
-.Op Fl C Ar directory
 .Op Fl D Ar variable
 .Op Fl d Ar flags
@@ -63 +62 @@
 files and programs.
 The first of
-.Ql Pa BSDmakefile ,
 .Ql Pa makefile
 and
@@ -90 +88 @@
 .Fl j
 is used.
-.It Fl C Ar directory
-Change to
-.Ar directory
-while running.
 .It Fl D Ar variable
 Define
@@ -178 +172 @@
 that do not depend on the target whose creation caused the error.
 .It Fl m Ar directory
-Specify a directory in which to search for
-.Pa sys.mk
-and makefiles included via the <...> style.
+Specify a directory in which to search for sys.mk and makefiles included
+via the <...> style.
 Multiple directories can be added to form a search path.
 This path will override the default system include path:
@@ -519 +512 @@
 is unable to change into any of the remaining three directories,
 then the current directory is used.
-.Pp
-The
-.Nm
-utility sets
-.Va .OBJDIR
-to the canonical path given by
-.Xr getcwd 3 .
 .It Va .MAKEFLAGS
 The environment variable
@@ -551 +537 @@
 .Va .MAKEFLAGS
 provided for backward compatibility.
+.It Ev PWD
+Alternate path to the current directory.
+Supported if built with WANT_ENV_PWD defined.
+.Nm
+normally sets
+.Ql Va .CURDIR
+to the canonical path given by
+.Xr getcwd 3 .
+However, if the environment variable
+.Ev PWD
+is set and gives a path to the current directory, then
+.Nm
+sets
+.Ql Va .CURDIR
+to the value of
+.Ev PWD
+instead.
+.Ev PWD
+is always set to the value of
+.Ql Va .OBJDIR
+for all programs which
+.Nm
+executes.
 .It Va .TARGETS
 List of targets
@@ -580 +589 @@
 These directories will be searched for source files by
 .Nm
-after it has finished parsing all input makefiles.
+after
+.Nm
+has finished parsing all input makefiles.
 .El
 .Pp
@@ -700 +711 @@
 .Pq Ql \&$ ,
 not a preceding dollar sign as is usual.
+.It Cm T
+Replaces each word in the variable with its last component.
 .It Ar old_string=new_string
 This is the
@@ -720 +733 @@
 to be replaced in
 .Ar new_string
-.It Cm T
-Replaces each word in the variable with its last component.
 .It Cm U
 Converts variable to upper-case letters.
@@ -853 +864 @@
 .Bl -tag -width "Cm XX"
 .It Cm \&|\&|
-logical
-.Tn OR
+logical OR
 .It Cm \&&&
 Logical
@@ -1107 +1117 @@
 Disable parallel mode.
 .It Ic .NO_PARALLEL
-Same as above, for compatibility with other
-.Nm pmake
-variants.
+Same as above, for compatibility with other pmake variants.
 .It Ic .ORDER
 The named targets are made in sequence.
@@ -1191 +1199 @@
 .Ev MAKEFLAGS ,
 .Ev MAKEOBJDIR ,
+.Ev MAKEOBJDIRPREFIX ,
 and
-.Ev MAKEOBJDIRPREFIX .
+.Ev PWD .
 .Sh FILES
 .Bl -tag -width /usr/share/doc/psd/12.make -compact
@@ -1245 +1254 @@
 .Pp
 For loops are expanded before tests, so a fragment such as:
-.Bd -literal -offset indent
+.Bd -literal
 \&.for TMACHINE in ${SHARED_ARCHS}
 \&.if ${TMACHINE} = ${MACHINE}
@@ -1252 +1261 @@
 \&.endfor
 .Ed
-.Pp
 won't work, and should be rewritten the other way around.
-.Pp
-The parsing code is broken with respect to handling a semicolon
-after a colon, so a fragment like this will fail:
-.Bd -literal -offset indent
-HDRS=   foo.h bar.h
-
-all:
-\&.for h in ${HDRS:S;^;${.CURDIR}/;}
-     ...
-\&.endfor
-.Ed
 .Sh SEE ALSO
 .Xr mkdep 1 ,
@@ -1276 +1273 @@
 A
 .Nm
-command appeared in PWB UNIX.
+command appeared in
+.At v7 .

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);

branches/FREEBSD/src/kmk/make.h

@@ -36 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)make.h      8.3 (Berkeley) 6/13/95
- * $FreeBSD: src/usr.bin/make/make.h,v 1.23 2002/10/10 19:27:48 jmallett Exp $
+ *      from: @(#)make.h        8.3 (Berkeley) 6/13/95
+ * $FreeBSD: src/usr.bin/make/make.h,v 1.12.2.2 2001/02/13 03:13:58 will Exp $
  */
 
@@ -46 +46 @@
 
 #ifndef _MAKE_H_
-#define _MAKE_H_
+#define _MAKE_H_
 
 #include <sys/types.h>
@@ -52 +52 @@
 #include <string.h>
 #include <ctype.h>
-
+#include <err.h>
+
+#if !defined(MAKE_BOOTSTRAP) && defined(BSD4_4)
+# include <sys/cdefs.h>
+#else
+# ifndef __P
+#  if defined(__STDC__) || defined(__cplusplus)
+#   define      __P(protos)     protos          /* full-blown ANSI C */
+#  else
+#   define      __P(protos)     ()              /* traditional C preprocessor */
+#  endif
+# endif
+# ifndef __STDC__
+#  ifndef const
+#   define const
+#  endif
+#  ifndef volatile
+#   define volatile
+#  endif
+# endif
+#endif
+
+#ifdef __STDC__
 #include <stdlib.h>
 #include <unistd.h>
+#endif
 #include "sprite.h"
 #include "lst.h"
@@ -64 +87 @@
  * pieces of data associated with it.
  *      1) the name of the target it describes
- *      2) the location of the target file in the filesystem.
+ *      2) the location of the target file in the file system.
  *      3) the type of operator used to define its sources (qv. parse.c)
  *      4) whether it is involved in this invocation of make
@@ -143 +166 @@
 
 /*
+ * Manifest constants
+ */
+#define NILGNODE        ((GNode *) NIL)
+
+/*
  * The OP_ constants are used when parsing a dependency line as a way of
  * communicating to other parts of the program the way in which a target
@@ -151 +179 @@
  * righthand side...
  */
-#define OP_DEPENDS      0x00000001  /* Execution of commands depends on
+#define OP_DEPENDS      0x00000001  /* Execution of commands depends on
                                      * kids (:) */
-#define OP_FORCE        0x00000002  /* Always execute commands (!) */
-#define OP_DOUBLEDEP    0x00000004  /* Execution of commands depends on kids
+#define OP_FORCE        0x00000002  /* Always execute commands (!) */
+#define OP_DOUBLEDEP    0x00000004  /* Execution of commands depends on kids
                                      * per line (::) */
-#define OP_OPMASK       (OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP)
-
-#define OP_OPTIONAL     0x00000008  /* Don't care if the target doesn't
+#define OP_OPMASK       (OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP)
+
+#define OP_OPTIONAL     0x00000008  /* Don't care if the target doesn't
                                      * exist and can't be created */
-#define OP_USE          0x00000010  /* Use associated commands for parents */
-#define OP_EXEC         0x00000020  /* Target is never out of date, but always
+#define OP_USE          0x00000010  /* Use associated commands for parents */
+#define OP_EXEC         0x00000020  /* Target is never out of date, but always
                                      * execute commands anyway. Its time
                                      * doesn't matter, so it has none...sort
                                      * of */
-#define OP_IGNORE       0x00000040  /* Ignore errors when creating the node */
-#define OP_PRECIOUS     0x00000080  /* Don't remove the target when
+#define OP_IGNORE       0x00000040  /* Ignore errors when creating the node */
+#define OP_PRECIOUS     0x00000080  /* Don't remove the target when
                                      * interrupted */
-#define OP_SILENT       0x00000100  /* Don't echo commands when executed */
-#define OP_MAKE         0x00000200  /* Target is a recurrsive make so its
+#define OP_SILENT       0x00000100  /* Don't echo commands when executed */
+#define OP_MAKE         0x00000200  /* Target is a recurrsive make so its
                                      * commands should always be executed when
                                      * it is out of date, regardless of the
                                      * state of the -n or -t flags */
-#define OP_JOIN         0x00000400  /* Target is out-of-date only if any of its
+#define OP_JOIN         0x00000400  /* Target is out-of-date only if any of its
                                      * children was out-of-date */
-#define OP_INVISIBLE    0x00004000  /* The node is invisible to its parents.
+#define OP_INVISIBLE    0x00004000  /* The node is invisible to its parents.
                                      * I.e. it doesn't show up in the parents's
                                      * local variables. */
-#define OP_NOTMAIN      0x00008000  /* The node is exempt from normal 'main
+#define OP_NOTMAIN      0x00008000  /* The node is exempt from normal 'main
                                      * target' processing in parse.c */
-#define OP_PHONY        0x00010000  /* Not a file target; run always */
+#define OP_PHONY        0x00010000  /* Not a file target; run always */
 /* Attributes applied by PMake */
-#define OP_TRANSFORM    0x80000000  /* The node is a transformation rule */
-#define OP_MEMBER       0x40000000  /* Target is a member of an archive */
-#define OP_LIB          0x20000000  /* Target is a library */
-#define OP_ARCHV        0x10000000  /* Target is an archive construct */
-#define OP_HAS_COMMANDS 0x08000000  /* Target has all the commands it should.
+#define OP_TRANSFORM    0x80000000  /* The node is a transformation rule */
+#define OP_MEMBER       0x40000000  /* Target is a member of an archive */
+#define OP_LIB          0x20000000  /* Target is a library */
+#define OP_ARCHV        0x10000000  /* Target is an archive construct */
+#define OP_HAS_COMMANDS 0x08000000  /* Target has all the commands it should.
                                      * Used when parsing to catch multiple
                                      * commands for a target */
-#define OP_SAVE_CMDS    0x04000000  /* Saving commands on .END (Compat) */
-#define OP_DEPS_FOUND   0x02000000  /* Already processed by Suff_FindDeps */
+#define OP_SAVE_CMDS    0x04000000  /* Saving commands on .END (Compat) */
+#define OP_DEPS_FOUND   0x02000000  /* Already processed by Suff_FindDeps */
 
 /*
@@ -196 +224 @@
  * object of a dependency operator
  */
-#define OP_NOP(t)       (((t) & OP_OPMASK) == 0x00000000)
+#define OP_NOP(t)       (((t) & OP_OPMASK) == 0x00000000)
 
 /*
@@ -204 +232 @@
  * is given, a new, empty node will be created for the target, placed in the
  * table of all targets and its address returned. If TARG_NOCREATE is given,
- * a NULL pointer will be returned.
- */
-#define TARG_CREATE     0x01      /* create node if not found */
-#define TARG_NOCREATE   0x00      /* don't create it */
+ * a NIL pointer will be returned.
+ */
+#define TARG_CREATE     0x01      /* create node if not found */
+#define TARG_NOCREATE   0x00      /* don't create it */
 
 /*
@@ -218 +246 @@
  * schemes allocate in powers of two.
  */
-#define MAKE_BSIZE              256     /* starting size for expandable buffers */
+#define MAKE_BSIZE              256     /* starting size for expandable buffers */
 
 /*
@@ -229 +257 @@
  * Str_Concat returns.
  */
-#define STR_ADDSPACE    0x01    /* add a space when Str_Concat'ing */
-#define STR_DOFREE      0x02    /* free source strings after concatenation */
-#define STR_ADDSLASH    0x04    /* add a slash when Str_Concat'ing */
+#define STR_ADDSPACE    0x01    /* add a space when Str_Concat'ing */
+#define STR_DOFREE      0x02    /* free source strings after concatenation */
+#define STR_ADDSLASH    0x04    /* add a slash when Str_Concat'ing */
 
 /*
@@ -238 +266 @@
  * as the first argument to Parse_Error.
  */
-#define PARSE_WARNING   2
-#define PARSE_FATAL     1
+#define PARSE_WARNING   2
+#define PARSE_FATAL     1
 
 /*
  * Values returned by Cond_Eval.
  */
-#define COND_PARSE      0       /* Parse the next lines */
-#define COND_SKIP       1       /* Skip the next lines */
-#define COND_INVALID    2       /* Not a conditional statement */
+#define COND_PARSE      0       /* Parse the next lines */
+#define COND_SKIP       1       /* Skip the next lines */
+#define COND_INVALID    2       /* Not a conditional statement */
 
 /*
  * Definitions for the "local" variables. Used only for clarity.
  */
-#define TARGET            "@"   /* Target of dependency */
-#define OODATE            "?"   /* All out-of-date sources */
-#define ALLSRC            ">"   /* All sources */
-#define IMPSRC            "<"   /* Source implied by transformation */
-#define PREFIX            "*"   /* Common prefix */
-#define ARCHIVE           "!"   /* Archive in "archive(member)" syntax */
-#define MEMBER            "%"   /* Member in "archive(member)" syntax */
-
-#define FTARGET           "@F"  /* file part of TARGET */
-#define DTARGET           "@D"  /* directory part of TARGET */
-#define FIMPSRC           "<F"  /* file part of IMPSRC */
-#define DIMPSRC           "<D"  /* directory part of IMPSRC */
-#define FPREFIX           "*F"  /* file part of PREFIX */
-#define DPREFIX           "*D"  /* directory part of PREFIX */
+#define TARGET            "@"   /* Target of dependency */
+#define OODATE            "?"   /* All out-of-date sources */
+#define ALLSRC            ">"   /* All sources */
+#define IMPSRC            "<"   /* Source implied by transformation */
+#define PREFIX            "*"   /* Common prefix */
+#define ARCHIVE           "!"   /* Archive in "archive(member)" syntax */
+#define MEMBER            "%"   /* Member in "archive(member)" syntax */
+
+#define FTARGET           "@F"  /* file part of TARGET */
+#define DTARGET           "@D"  /* directory part of TARGET */
+#define FIMPSRC           "<F"  /* file part of IMPSRC */
+#define DIMPSRC           "<D"  /* directory part of IMPSRC */
+#define FPREFIX           "*F"  /* file part of PREFIX */
+#define DPREFIX           "*D"  /* directory part of PREFIX */
 
 /*
@@ -274 +302 @@
 extern Lst      dirSearchPath;  /* The list of directories to search when
                                  * looking for targets */
-extern Lst      parseIncPath;   /* The list of directories to search when
-                                 * looking for includes */
-
-extern Boolean  jobsRunning;    /* True if jobs are running */
+
 extern Boolean  compatMake;     /* True if we are make compatible */
 extern Boolean  ignoreErrors;   /* True if should ignore all errors */
@@ -336 +361 @@
 #define DEBUG_TARG      0x0100
 #define DEBUG_VAR       0x0200
-#define DEBUG_FOR       0x0400
-#define DEBUG_LOUD      0x0800
-
-#define CONCAT(a,b)     a##b
+#define DEBUG_FOR       0x0400
+#define DEBUG_LOUD      0x0800
+
+#ifdef __STDC__
+#define CONCAT(a,b)     a##b
+#else
+#define I(a)            a
+#define CONCAT(a,b)     I(a)b
+#endif /* __STDC__ */
 
 #define DEBUG(module)   (debug & CONCAT(DEBUG_,module))
-#define DEBUGF(module,args)             \
-do {                                            \
-        if (DEBUG(module)) {                    \
-                Debug args ;                    \
-        }                                       \
-} while (0)
-#define ISDOT(c) ((c)[0] == '.' && (((c)[1] == '\0') || ((c)[1] == '/')))
-#define ISDOTDOT(c) ((c)[0] == '.' && ISDOT(&((c)[1])))
+#define ISDOT(c) ((c)[0] == '.' && (((c)[1] == '\0') || ((c)[1] == '/')))
+#define ISDOTDOT(c) ((c)[0] == '.' && ISDOT(&((c)[1])))
 
 /*
@@ -357 +381 @@
 #include "nonints.h"
 
-int Make_TimeStamp(GNode *, GNode *);
-Boolean Make_OODate(GNode *);
-int Make_HandleUse(GNode *, GNode *);
-void Make_Update(GNode *);
-void Make_DoAllVar(GNode *);
-Boolean Make_Run(Lst);
+int Make_TimeStamp __P((GNode *, GNode *));
+Boolean Make_OODate __P((GNode *));
+int Make_HandleUse __P((GNode *, GNode *));
+void Make_Update __P((GNode *));
+void Make_DoAllVar __P((GNode *));
+Boolean Make_Run __P((Lst));
 
 #endif /* _MAKE_H_ */

branches/FREEBSD/src/kmk/nonints.h

@@ -36 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)nonints.h   8.4 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/nonints.h,v 1.17 2002/09/18 16:13:03 jmallett Exp $
+ *      from: @(#)nonints.h     8.3 (Berkeley) 3/19/94
+ * $FreeBSD: src/usr.bin/make/nonints.h,v 1.8 1999/08/28 01:03:35 peter Exp $
  */
 
 /* arch.c */
-ReturnStatus Arch_ParseArchive(char **, Lst, GNode *);
-void Arch_Touch(GNode *);
-void Arch_TouchLib(GNode *);
-int Arch_MTime(GNode *);
-int Arch_MemMTime(GNode *);
-void Arch_FindLib(GNode *, Lst);
-Boolean Arch_LibOODate(GNode *);
-void Arch_Init(void);
-void Arch_End(void);
+ReturnStatus Arch_ParseArchive __P((char **, Lst, GNode *));
+void Arch_Touch __P((GNode *));
+void Arch_TouchLib __P((GNode *));
+int Arch_MTime __P((GNode *));
+int Arch_MemMTime __P((GNode *));
+void Arch_FindLib __P((GNode *, Lst));
+Boolean Arch_LibOODate __P((GNode *));
+void Arch_Init __P((void));
+void Arch_End __P((void));
 
 /* compat.c */
-void Compat_Run(Lst);
+void Compat_Run __P((Lst));
 
 /* cond.c */
-int Cond_Eval(char *);
-void Cond_End(void);
+int Cond_Eval __P((char *));
+void Cond_End __P((void));
 
 /* for.c */
-int For_Eval(char *);
-void For_Run(void);
+int For_Eval __P((char *));
+void For_Run  __P((void));
 
 /* main.c */
-void Main_ParseArgLine(char *);
-char *Cmd_Exec(char *, char **);
-void Debug(const char *, ...);
-void Error(const char *, ...);
-void Fatal(const char *, ...);
-void Punt(const char *, ...);
-void DieHorribly(void);
-int PrintAddr(void *, void *);
-void Finish(int);
-char *estrdup(const char *);
-void *emalloc(size_t);
+void Main_ParseArgLine __P((char *));
+int main __P((int, char **));
+char *Cmd_Exec __P((char *, char **));
+void Error __P((char *, ...));
+void Fatal __P((char *, ...));
+void Punt __P((char *, ...));
+void DieHorribly __P((void));
+int PrintAddr __P((ClientData, ClientData));
+void Finish __P((int));
+char *estrdup __P((const char *));
+void *emalloc __P((size_t));
 /* efree(x) works when x==NULL. STDC behavior, may need some different
  * definition for cross-builds on deficient systems */
-#define efree   free
-void *erealloc(void *, size_t);
-void enomem(void);
-int eunlink(const char *);
+#define efree   free
+void *erealloc __P((void *, size_t));
+void enomem __P((void));
+int eunlink __P((const char *));
 
 /* parse.c */
-void Parse_Error(int, const char *, ...);
-Boolean Parse_AnyExport(void);
-Boolean Parse_IsVar(char *);
-void Parse_DoVar(char *, GNode *);
-void Parse_AddIncludeDir(char *);
-void Parse_File(char *, FILE *);
-void Parse_Init(void);
-void Parse_End(void);
-void Parse_FromString(char *);
-Lst Parse_MainName(void);
+void Parse_Error __P((int, char *, ...));
+Boolean Parse_AnyExport __P((void));
+Boolean Parse_IsVar __P((char *));
+void Parse_DoVar __P((char *, GNode *));
+void Parse_AddIncludeDir __P((char *));
+void Parse_File __P((char *, FILE *));
+void Parse_Init __P((void));
+void Parse_End __P((void));
+void Parse_FromString __P((char *));
+Lst Parse_MainName __P((void));
 
 /* str.c */
-void str_init(void);
-void str_end(void);
-char *str_concat(char *, char *, int);
-char **brk_string(char *, int *, Boolean);
-char *Str_FindSubstring(char *, char *);
-int Str_Match(char *, char *);
-char *Str_SYSVMatch(char *, char *, int *len);
-void Str_SYSVSubst(Buffer, char *, char *, int);
+void str_init __P((void));
+void str_end __P((void));
+char *str_concat __P((char *, char *, int));
+char **brk_string __P((char *, int *, Boolean));
+char *Str_FindSubstring __P((char *, char *));
+int Str_Match __P((char *, char *));
+char *Str_SYSVMatch __P((char *, char *, int *len));
+void Str_SYSVSubst __P((Buffer, char *, char *, int));
 
 /* suff.c */
-void Suff_ClearSuffixes(void);
-Boolean Suff_IsTransform(char *);
-GNode *Suff_AddTransform(char *);
-int Suff_EndTransform(void *, void *);
-void Suff_AddSuffix(char *);
-Lst Suff_GetPath(char *);
-void Suff_DoPaths(void);
-void Suff_AddInclude(char *);
-void Suff_AddLib(char *);
-void Suff_FindDeps(GNode *);
-void Suff_SetNull(char *);
-void Suff_Init(void);
-void Suff_End(void);
-void Suff_PrintAll(void);
+void Suff_ClearSuffixes __P((void));
+Boolean Suff_IsTransform __P((char *));
+GNode *Suff_AddTransform __P((char *));
+int Suff_EndTransform __P((ClientData, ClientData));
+void Suff_AddSuffix __P((char *));
+Lst Suff_GetPath __P((char *));
+void Suff_DoPaths __P((void));
+void Suff_AddInclude __P((char *));
+void Suff_AddLib __P((char *));
+void Suff_FindDeps __P((GNode *));
+void Suff_SetNull __P((char *));
+void Suff_Init __P((void));
+void Suff_End __P((void));
+void Suff_PrintAll __P((void));
 
 /* targ.c */
-void Targ_Init(void);
-void Targ_End(void);
-GNode *Targ_NewGN(char *);
-GNode *Targ_FindNode(char *, int);
-Lst Targ_FindList(Lst, int);
-Boolean Targ_Ignore(GNode *);
-Boolean Targ_Silent(GNode *);
-Boolean Targ_Precious(GNode *);
-void Targ_SetMain(GNode *);
-int Targ_PrintCmd(void *, void *);
-char *Targ_FmtTime(time_t);
-void Targ_PrintType(int);
-void Targ_PrintGraph(int);
+void Targ_Init __P((void));
+void Targ_End __P((void));
+GNode *Targ_NewGN __P((char *));
+GNode *Targ_FindNode __P((char *, int));
+Lst Targ_FindList __P((Lst, int));
+Boolean Targ_Ignore __P((GNode *));
+Boolean Targ_Silent __P((GNode *));
+Boolean Targ_Precious __P((GNode *));
+void Targ_SetMain __P((GNode *));
+int Targ_PrintCmd __P((ClientData, ClientData));
+char *Targ_FmtTime __P((time_t));
+void Targ_PrintType __P((int));
+void Targ_PrintGraph __P((int));
 
 /* var.c */
-void Var_Delete(char *, GNode *);
-void Var_Set(char *, char *, GNode *);
-void Var_Append(char *, char *, GNode *);
-Boolean Var_Exists(char *, GNode *);
-char *Var_Value(char *, GNode *, char **);
-char *Var_Parse(char *, GNode *, Boolean, int *, Boolean *);
-char *Var_Subst(char *, char *, GNode *, Boolean);
-char *Var_GetTail(char *);
-char *Var_GetHead(char *);
-void Var_Init(void);
-void Var_End(void);
-void Var_Dump(GNode *);
+void Var_Delete __P((char *, GNode *));
+void Var_Set __P((char *, char *, GNode *));
+void Var_Append __P((char *, char *, GNode *));
+Boolean Var_Exists __P((char *, GNode *));
+char *Var_Value __P((char *, GNode *, char **));
+char *Var_Parse __P((char *, GNode *, Boolean, int *, Boolean *));
+char *Var_Subst __P((char *, char *, GNode *, Boolean));
+char *Var_GetTail __P((char *));
+char *Var_GetHead __P((char *));
+void Var_Init __P((void));
+void Var_End __P((void));
+void Var_Dump __P((GNode *));

branches/FREEBSD/src/kmk/parse.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)parse.c  8.3 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.48 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)parse.c     8.3 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/parse.c,v 1.22 1999/08/28 01:03:35 peter Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -84 +88 @@
  */
 
+#ifdef __STDC__
 #include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
 #include <ctype.h>
 #include <err.h>
@@ -178 +186 @@
 
 /*
- * Predecessor node for handling .ORDER. Initialized to NULL when .ORDER
+ * Predecessor node for handling .ORDER. Initialized to NILGNODE when .ORDER
  * seen, then set to each successive source on the line.
  */
@@ -231 +239 @@
 };
 
-static int ParseFindKeyword(char *);
-static int ParseLinkSrc(void *, void *);
-static int ParseDoOp(void *, void *);
-static int ParseAddDep(void *, void *);
-static void ParseDoSrc(int, char *, Lst);
-static int ParseFindMain(void *, void *);
-static int ParseAddDir(void *, void *);
-static int ParseClearPath(void *, void *);
-static void ParseDoDependency(char *);
-static int ParseAddCmd(void *, void *);
-static int ParseReadc(void);
-static void ParseUnreadc(int);
-static void ParseHasCommands(void *);
-static void ParseDoInclude(char *);
-static void ParseDoError(char *);
+static int ParseFindKeyword __P((char *));
+static int ParseLinkSrc __P((ClientData, ClientData));
+static int ParseDoOp __P((ClientData, ClientData));
+static int ParseAddDep __P((ClientData, ClientData));
+static void ParseDoSrc __P((int, char *, Lst));
+static int ParseFindMain __P((ClientData, ClientData));
+static int ParseAddDir __P((ClientData, ClientData));
+static int ParseClearPath __P((ClientData, ClientData));
+static void ParseDoDependency __P((char *));
+static int ParseAddCmd __P((ClientData, ClientData));
+static int ParseReadc __P((void));
+static void ParseUnreadc __P((int));
+static void ParseHasCommands __P((ClientData));
+static void ParseDoInclude __P((char *));
+static void ParseDoError __P((char *));
 #ifdef SYSVINCLUDE
-static void ParseTraditionalInclude(char *);
+static void ParseTraditionalInclude __P((char *));
 #endif
-static int ParseEOF(int);
-static char *ParseReadLine(void);
-static char *ParseSkipLine(int);
-static void ParseFinishLine(void);
+static int ParseEOF __P((int));
+static char *ParseReadLine __P((void));
+static char *ParseSkipLine __P((int));
+static void ParseFinishLine __P((void));
 
 /*-
@@ -267 +275 @@
  */
 static int
-ParseFindKeyword (char *str)
-{
-    int             start,
+ParseFindKeyword (str)
+    char            *str;               /* String to find */
+{
+    register int    start,
                     end,
                     cur;
-    int             diff;
+    register int    diff;
 
     start = 0;
@@ -306 +315 @@
 /* VARARGS */
 void
-Parse_Error(int type, const char *fmt, ...)
+#ifdef __STDC__
+Parse_Error(int type, char *fmt, ...)
+#else
+Parse_Error(va_alist)
+        va_dcl
+#endif
 {
         va_list ap;
-
+#ifdef __STDC__
         va_start(ap, fmt);
+#else
+        int type;               /* Error type (PARSE_WARNING, PARSE_FATAL) */
+        char *fmt;
+
+        va_start(ap);
+        type = va_arg(ap, int);
+        fmt = va_arg(ap, char *);
+#endif
+
         (void)fprintf(stderr, "\"%s\", line %d: ", fname, lineno);
         if (type == PARSE_WARNING)
@@ -339 +362 @@
  */
 static int
-ParseLinkSrc (void *pgnp, void *cgnp)
+ParseLinkSrc (pgnp, cgnp)
+    ClientData     pgnp;        /* The parent node */
+    ClientData     cgnp;        /* The child node */
 {
     GNode          *pgn = (GNode *) pgnp;
     GNode          *cgn = (GNode *) cgnp;
-    if (Lst_Member (pgn->children, (void *)cgn) == NULL) {
-        (void)Lst_AtEnd (pgn->children, (void *)cgn);
+    if (Lst_Member (pgn->children, (ClientData)cgn) == NILLNODE) {
+        (void)Lst_AtEnd (pgn->children, (ClientData)cgn);
         if (specType == Not) {
-            (void)Lst_AtEnd (cgn->parents, (void *)pgn);
+            (void)Lst_AtEnd (cgn->parents, (ClientData)pgn);
         }
         pgn->unmade += 1;
@@ -370 +395 @@
  */
 static int
-ParseDoOp (void *gnp, void *opp)
+ParseDoOp (gnp, opp)
+    ClientData     gnp;         /* The node to which the operator is to be
+                                 * applied */
+    ClientData     opp;         /* The operator to apply */
 {
     GNode          *gn = (GNode *) gnp;
@@ -395 +423 @@
          * instance.
          */
-        GNode           *cohort;
+        register GNode  *cohort;
         LstNode         ln;
 
@@ -408 +436 @@
          * sorry.
          */
-        Lst_ForEach(gn->parents, ParseLinkSrc, (void *)cohort);
+        Lst_ForEach(gn->parents, ParseLinkSrc, (ClientData)cohort);
         cohort->type = OP_DOUBLEDEP|OP_INVISIBLE;
-        (void)Lst_AtEnd(gn->cohorts, (void *)cohort);
+        (void)Lst_AtEnd(gn->cohorts, (ClientData)cohort);
 
         /*
          * Replace the node in the targets list with the new copy
          */
-        ln = Lst_Member(targets, (void *)gn);
-        Lst_Replace(ln, (void *)cohort);
+        ln = Lst_Member(targets, (ClientData)gn);
+        Lst_Replace(ln, (ClientData)cohort);
         gn = cohort;
     }
@@ -445 +473 @@
  */
 static int
-ParseAddDep(void *pp, void *sp)
+ParseAddDep(pp, sp)
+    ClientData pp;
+    ClientData sp;
 {
     GNode *p = (GNode *) pp;
@@ -456 +486 @@
          * problem
          */
-        (void)Lst_AtEnd(p->successors, (void *)s);
-        (void)Lst_AtEnd(s->preds, (void *)p);
+        (void)Lst_AtEnd(p->successors, (ClientData)s);
+        (void)Lst_AtEnd(s->preds, (ClientData)p);
         return 0;
     }
@@ -483 +513 @@
  */
 static void
-ParseDoSrc (int tOp, char *src, Lst allsrc)
+ParseDoSrc (tOp, src, allsrc)
+    int         tOp;    /* operator (if any) from special targets */
+    char        *src;   /* name of the source to handle */
+    Lst         allsrc; /* List of all sources to wait for */
 {
     GNode       *gn = NULL;
 
-    if (*src == '.' && isupper ((unsigned char) src[1])) {
+    if (*src == '.' && isupper (src[1])) {
         int keywd = ParseFindKeyword(src);
         if (keywd != -1) {
             int op = parseKeywords[keywd].op;
             if (op != 0) {
-                Lst_ForEach (targets, ParseDoOp, (void *)&op);
+                Lst_ForEach (targets, ParseDoOp, (ClientData)&op);
                 return;
             }
@@ -512 +545 @@
          * line. This is to allow #ifmake's to succeed, or something...
          */
-        (void) Lst_AtEnd (create, (void *)estrdup(src));
+        (void) Lst_AtEnd (create, (ClientData)estrdup(src));
         /*
          * Add the name to the .TARGETS variable as well, so the user cna
@@ -526 +559 @@
          */
         gn = Targ_FindNode(src, TARG_CREATE);
-        if (predecessor != NULL) {
-            (void)Lst_AtEnd(predecessor->successors, (void *)gn);
-            (void)Lst_AtEnd(gn->preds, (void *)predecessor);
+        if (predecessor != NILGNODE) {
+            (void)Lst_AtEnd(predecessor->successors, (ClientData)gn);
+            (void)Lst_AtEnd(gn->preds, (ClientData)predecessor);
         }
         /*
@@ -552 +585 @@
             gn->type |= tOp;
         } else {
-            Lst_ForEach (targets, ParseLinkSrc, (void *)gn);
+            Lst_ForEach (targets, ParseLinkSrc, (ClientData)gn);
         }
         if ((gn->type & OP_OPMASK) == OP_DOUBLEDEP) {
-            GNode       *cohort;
-            LstNode     ln;
-
-            for (ln=Lst_First(gn->cohorts); ln != NULL; ln = Lst_Succ(ln)){
+            register GNode      *cohort;
+            register LstNode    ln;
+
+            for (ln=Lst_First(gn->cohorts); ln != NILLNODE; ln = Lst_Succ(ln)){
                 cohort = (GNode *)Lst_Datum(ln);
                 if (tOp) {
                     cohort->type |= tOp;
                 } else {
-                    Lst_ForEach(targets, ParseLinkSrc, (void *)cohort);
+                    Lst_ForEach(targets, ParseLinkSrc, (ClientData)cohort);
                 }
             }
@@ -571 +604 @@
 
     gn->order = waiting;
-    (void)Lst_AtEnd(allsrc, (void *)gn);
+    (void)Lst_AtEnd(allsrc, (ClientData)gn);
     if (waiting) {
-        Lst_ForEach(allsrc, ParseAddDep, (void *)gn);
+        Lst_ForEach(allsrc, ParseAddDep, (ClientData)gn);
     }
 }
@@ -593 +626 @@
  */
 static int
-ParseFindMain(void *gnp, void *dummy __unused)
+ParseFindMain(gnp, dummy)
+    ClientData    gnp;      /* Node to examine */
+    ClientData    dummy;
 {
     GNode         *gn = (GNode *) gnp;
@@ -599 +634 @@
         mainNode = gn;
         Targ_SetMain(gn);
-        return (1);
+        return (dummy ? 1 : 1);
     } else {
-        return (0);
+        return (dummy ? 0 : 0);
     }
 }
@@ -619 +654 @@
  */
 static int
-ParseAddDir(void *path, void *name)
+ParseAddDir(path, name)
+    ClientData    path;
+    ClientData    name;
 {
     Dir_AddDir((Lst) path, (char *) name);
@@ -639 +676 @@
  */
 static int
-ParseClearPath(void *path, void *dummy __unused)
+ParseClearPath(path, dummy)
+    ClientData path;
+    ClientData dummy;
 {
     Dir_ClearPath((Lst) path);
-    return (0);
+    return(dummy ? 0 : 0);
 }
 
@@ -680 +719 @@
  */
 static void
-ParseDoDependency (char *line)
+ParseDoDependency (line)
+    char           *line;       /* the line to parse */
 {
     char           *cp;         /* our current position */
@@ -706 +746 @@
     do {
         for (cp = line;
-             *cp && !isspace ((unsigned char) *cp) && *cp != '(';
+             *cp && !isspace (*cp) &&
+             (*cp != '!') && (*cp != ':') && (*cp != '(');
              cp++)
         {
@@ -727 +768 @@
                 }
                 cp += length-1;
-            } else if (*cp == '!' || *cp == ':') {
-                /*
-                 * We don't want to end a word on ':' or '!' if there is a
-                 * better match later on in the string.  By "better" I mean
-                 * one that is followed by whitespace.  This allows the user
-                 * to have targets like:
-                 *    fie::fi:fo: fum
-                 * where "fie::fi:fo" is the target.  In real life this is used
-                 * for perl5 library man pages where "::" separates an object
-                 * from its class.  Ie: "File::Spec::Unix".  This behaviour
-                 * is also consistent with other versions of make.
-                 */
-                char *p = cp + 1;
-
-                if (*cp == ':' && *p == ':')
-                    p++;
-
-                /* Found the best match already. */
-                if (*p == '\0' || isspace(*p))
-                    break;
-
-                do {
-                    p += strcspn(p, "!:");
-                    if (*p == '\0')
-                        break;
-                } while (!isspace(*++p));
-
-                /* No better match later on... */
-                if (*p == '\0')
-                    break;
             }
             continue;
@@ -784 +795 @@
             /*
              * Ending a dependency line without an operator is a Bozo
-             * no-no.  As a heuristic, this is also often triggered by
-             * undetected conflicts from cvs/rcs merges.
+             * no-no
              */
-            if ((strncmp(line, "<<<<<<", 6) == 0) ||
-                (strncmp(line, "======", 6) == 0) ||
-                (strncmp(line, ">>>>>>", 6) == 0))
-                Parse_Error (PARSE_FATAL,
-                    "Makefile appears to contain unresolved cvs/rcs/??? merge conflicts");
-            else
-                Parse_Error (PARSE_FATAL, "Need an operator");
+            Parse_Error (PARSE_FATAL, "Need an operator");
             return;
         }
@@ -801 +805 @@
          * specType to match it.
          */
-        if (*line == '.' && isupper ((unsigned char) line[1])) {
+        if (*line == '.' && isupper (line[1])) {
             /*
              * See if the target is a special target that must have it
@@ -842 +846 @@
                  *      .NOTPARALLEL    Make only one target at a time.
                  *      .SINGLESHELL    Create a shell for each command.
-                 *      .ORDER          Must set initial predecessor to NULL
+                 *      .ORDER          Must set initial predecessor to NIL
                  */
                 switch (specType) {
@@ -849 +853 @@
                             paths = Lst_Init(FALSE);
                         }
-                        (void)Lst_AtEnd(paths, (void *)dirSearchPath);
+                        (void)Lst_AtEnd(paths, (ClientData)dirSearchPath);
                         break;
                     case Main:
@@ -861 +865 @@
                         gn = Targ_FindNode(line, TARG_CREATE);
                         gn->type |= OP_NOTMAIN;
-                        (void)Lst_AtEnd(targets, (void *)gn);
+                        (void)Lst_AtEnd(targets, (ClientData)gn);
                         break;
                     case Default:
                         gn = Targ_NewGN(".DEFAULT");
                         gn->type |= (OP_NOTMAIN|OP_TRANSFORM);
-                        (void)Lst_AtEnd(targets, (void *)gn);
+                        (void)Lst_AtEnd(targets, (ClientData)gn);
                         DEFAULT = gn;
                         break;
                     case NotParallel:
                     {
+                        extern int  maxJobs;
+
                         maxJobs = 1;
                         break;
@@ -878 +884 @@
                         break;
                     case Order:
-                        predecessor = NULL;
+                        predecessor = NILGNODE;
                         break;
                     default:
@@ -893 +899 @@
                 specType = ExPath;
                 path = Suff_GetPath (&line[5]);
-                if (path == NULL) {
+                if (path == NILLST) {
                     Parse_Error (PARSE_FATAL,
                                  "Suffix '%s' not defined (yet)",
@@ -902 +908 @@
                         paths = Lst_Init(FALSE);
                     }
-                    (void)Lst_AtEnd(paths, (void *)path);
+                    (void)Lst_AtEnd(paths, (ClientData)path);
                 }
             }
@@ -929 +935 @@
                  * so create a list with the word on it.
                  */
-                (void)Lst_AtEnd(curTargs, (void *)line);
+                (void)Lst_AtEnd(curTargs, (ClientData)line);
             }
 
@@ -941 +947 @@
                 }
 
-                (void)Lst_AtEnd (targets, (void *)gn);
+                (void)Lst_AtEnd (targets, (ClientData)gn);
             }
         } else if (specType == ExPath && *line != '.' && *line != '\0') {
@@ -965 +971 @@
             }
         } else {
-            while (*cp && isspace ((unsigned char) *cp)) {
+            while (*cp && isspace (*cp)) {
                 cp++;
             }
@@ -1018 +1024 @@
     cp++;                       /* Advance beyond operator */
 
-    Lst_ForEach (targets, ParseDoOp, (void *)&op);
+    Lst_ForEach (targets, ParseDoOp, (ClientData)&op);
 
     /*
      * Get to the first source
      */
-    while (*cp && isspace ((unsigned char) *cp)) {
+    while (*cp && isspace (*cp)) {
         cp++;
     }
@@ -1052 +1058 @@
                 break;
             case ExPath:
-                Lst_ForEach(paths, ParseClearPath, (void *)NULL);
+                Lst_ForEach(paths, ParseClearPath, (ClientData)NULL);
                 break;
 #ifdef POSIX
@@ -1112 +1118 @@
              * has no valid suffix.
              */
-            char  savech;
-            while (*cp && !isspace ((unsigned char) *cp)) {
+            char  savec;
+            while (*cp && !isspace (*cp)) {
                 cp++;
             }
-            savech = *cp;
+            savec = *cp;
             *cp = '\0';
             switch (specType) {
@@ -1123 +1129 @@
                     break;
                 case ExPath:
-                    Lst_ForEach(paths, ParseAddDir, (void *)line);
+                    Lst_ForEach(paths, ParseAddDir, (ClientData)line);
                     break;
                 case Includes:
@@ -1137 +1143 @@
                     break;
             }
-            *cp = savech;
-            if (savech != '\0') {
+            *cp = savec;
+            if (savec != '\0') {
                 cp++;
             }
-            while (*cp && isspace ((unsigned char) *cp)) {
+            while (*cp && isspace (*cp)) {
                 cp++;
             }
@@ -1156 +1162 @@
              * and handle them accordingly.
              */
-            while (*cp && !isspace ((unsigned char) *cp)) {
+            while (*cp && !isspace (*cp)) {
                 if ((*cp == '(') && (cp > line) && (cp[-1] != '$')) {
                     /*
@@ -1171 +1177 @@
 
             if (*cp == '(') {
-                GNode     *gnp;
+                GNode     *gn;
 
                 sources = Lst_Init (FALSE);
@@ -1181 +1187 @@
 
                 while (!Lst_IsEmpty (sources)) {
-                    gnp = (GNode *) Lst_DeQueue (sources);
-                    ParseDoSrc (tOp, gnp->name, curSrcs);
+                    gn = (GNode *) Lst_DeQueue (sources);
+                    ParseDoSrc (tOp, gn->name, curSrcs);
                 }
                 Lst_Destroy (sources, NOFREE);
@@ -1194 +1200 @@
                 ParseDoSrc (tOp, line, curSrcs);
             }
-            while (*cp && isspace ((unsigned char) *cp)) {
+            while (*cp && isspace (*cp)) {
                 cp++;
             }
@@ -1201 +1207 @@
     }
 
-    if (mainNode == NULL) {
+    if (mainNode == NILGNODE) {
         /*
          * If we have yet to decide on a main target to make, in the
@@ -1208 +1214 @@
          * (i.e. isn't a .USE or .EXEC rule) to be made.
          */
-        Lst_ForEach (targets, ParseFindMain, (void *)0);
+        Lst_ForEach (targets, ParseFindMain, (ClientData)0);
     }
 
@@ -1234 +1240 @@
  */
 Boolean
-Parse_IsVar (char *line)
-{
-    Boolean wasSpace = FALSE;   /* set TRUE if found a space */
-    Boolean haveName = FALSE;   /* Set TRUE if have a variable name */
+Parse_IsVar (line)
+    register char  *line;       /* the line to check */
+{
+    register Boolean wasSpace = FALSE;  /* set TRUE if found a space */
+    register Boolean haveName = FALSE;  /* Set TRUE if have a variable name */
     int level = 0;
-#define ISEQOPERATOR(c) \
+#define ISEQOPERATOR(c) \
         (((c) == '+') || ((c) == ':') || ((c) == '?') || ((c) == '!'))
 
@@ -1335 +1342 @@
  */
 void
-Parse_DoVar (char *line, GNode *ctxt)
+Parse_DoVar (line, ctxt)
+    char            *line;      /* a line guaranteed to be a variable
+                                 * assignment. This reduces error checks */
+    GNode           *ctxt;      /* Context in which to do the assignment */
 {
     char           *cp; /* pointer into line */
@@ -1363 +1373 @@
      */
     for (cp = line + 1; *cp != '='; cp++) {
-        if (isspace ((unsigned char) *cp)) {
+        if (isspace (*cp)) {
             *cp = '\0';
         }
@@ -1419 +1429 @@
     }
 
-    while (isspace ((unsigned char) *cp)) {
+    while (isspace (*cp)) {
         cp++;
     }
@@ -1440 +1450 @@
 
         oldVars = FALSE;
-
-        /*
-         * make sure that we set the variable the first time to nothing
-         * so that it gets substituted!
-         */
-        if (!Var_Exists(line, ctxt))
-            Var_Set(line, "", ctxt);
-
         cp = Var_Subst(NULL, cp, ctxt, FALSE);
         oldVars = oldOldVars;
@@ -1456 +1458 @@
         Boolean freeCmd = FALSE; /* TRUE if the command needs to be freed, i.e.
                                   * if any variable expansion was performed */
-        char *res, *error;
+        char *res, *err;
 
         if (strchr(cp, '$') != NULL) {
@@ -1468 +1470 @@
         }
 
-        res = Cmd_Exec(cp, &error);
+        res = Cmd_Exec(cp, &err);
         Var_Set(line, res, ctxt);
         free(res);
 
-        if (error)
-            Parse_Error(PARSE_WARNING, error, cp);
+        if (err)
+            Parse_Error(PARSE_WARNING, err, cp);
 
         if (freeCmd)
@@ -1497 +1499 @@
  */
 static int
-ParseAddCmd(void *gnp, void *cmd)
+ParseAddCmd(gnp, cmd)
+    ClientData gnp;     /* the node to which the command is to be added */
+    ClientData cmd;     /* the command to add */
 {
     GNode *gn = (GNode *) gnp;
@@ -1503 +1507 @@
     if (!(gn->type & OP_HAS_COMMANDS))
         (void)Lst_AtEnd(gn->commands, cmd);
-    else
-        Parse_Error(PARSE_WARNING,
-                    "duplicate script for target \"%s\" ignored",
-                    gn->name);
     return(0);
 }
@@ -1527 +1527 @@
  */
 static void
-ParseHasCommands(void *gnp)
+ParseHasCommands(gnp)
+    ClientData    gnp;      /* Node to examine */
 {
     GNode *gn = (GNode *) gnp;
@@ -1550 +1551 @@
  */
 void
-Parse_AddIncludeDir (char *dir)
+Parse_AddIncludeDir (dir)
+    char          *dir;     /* The name of the directory to add */
 {
     Dir_AddDir (parseIncPath, dir);
@@ -1566 +1568 @@
  */
 static void
-ParseDoError(char *errmsg)
-{
-        if (!isspace((unsigned char) *errmsg)) {
+ParseDoError(errmsg)
+    char          *errmsg;      /* error message */
+{
+        if (!isspace(*errmsg)) {
                 Parse_Error(PARSE_WARNING, "invalid syntax: .error%s", errmsg);
                 return;
         }
         
-        while (isspace((unsigned char) *errmsg))
+        while (isspace(*errmsg))
                 errmsg++;
         
@@ -1602 +1605 @@
  */
 static void
-ParseDoInclude (char *file)
+ParseDoInclude (file)
+    char          *file;        /* file specification */
 {
     char          *fullname;    /* full pathname of file */
@@ -1741 +1745 @@
     oldFile->lineno = lineno;
 
-    (void) Lst_AtFront (includes, (void *)oldFile);
+    (void) Lst_AtFront (includes, (ClientData)oldFile);
 
     /*
@@ -1779 +1783 @@
  */
 void
-Parse_FromString(char *str)
+Parse_FromString(str)
+    char *str;
 {
     IFile         *oldFile;     /* state associated with this file */
 
-    DEBUGF(FOR, ("%s\n----\n", str));
+    if (DEBUG(FOR))
+        (void) fprintf(stderr, "%s\n----\n", str);
 
     oldFile = (IFile *) emalloc (sizeof (IFile));
@@ -1791 +1797 @@
     oldFile->p = curPTR;
 
-    (void) Lst_AtFront (includes, (void *)oldFile);
+    (void) Lst_AtFront (includes, (ClientData)oldFile);
 
     curFILE = NULL;
@@ -1819 +1825 @@
  */
 static void
-ParseTraditionalInclude (char *file)
+ParseTraditionalInclude (file)
+    char          *file;        /* file specification */
 {
     char          *fullname;    /* full pathname of file */
@@ -1921 +1928 @@
     oldFile->lineno = lineno;
 
-    (void) Lst_AtFront (includes, (void *)oldFile);
+    (void) Lst_AtFront (includes, (ClientData)oldFile);
 
     /*
@@ -1960 +1967 @@
  */
 static int
-ParseEOF (int opened)
+ParseEOF (opened)
+    int opened;
 {
     IFile     *ifile;   /* the state on the top of the includes stack */
@@ -1969 +1977 @@
 
     ifile = (IFile *) Lst_DeQueue (includes);
-    free (fname);
+    free ((Address) fname);
     fname = ifile->fname;
     lineno = ifile->lineno;
@@ -1975 +1983 @@
         (void) fclose (curFILE);
     if (curPTR) {
-        free(curPTR->str);
-        free(curPTR);
+        free((Address) curPTR->str);
+        free((Address) curPTR);
     }
     curFILE = ifile->F;
     curPTR = ifile->p;
-    free (ifile);
+    free ((Address)ifile);
     return (CONTINUE);
 }
@@ -1996 +2004 @@
  */
 static int
-ParseReadc(void)
+ParseReadc()
 {
     if (curFILE)
@@ -2019 +2027 @@
  */
 static void
-ParseUnreadc(int c)
+ParseUnreadc(c)
+    int c;
 {
     if (curFILE) {
@@ -2033 +2042 @@
 
 /* ParseSkipLine():
- *      Grab the next line unless it begins with a dot (`.') and we're told to
- *      ignore such lines.
+ *      Grab the next line
  */
 static char *
-ParseSkipLine(int skip)
+ParseSkipLine(skip)
+    int skip;           /* Skip lines that don't start with . */
 {
     char *line;
@@ -2055 +2064 @@
                 lineno++;
 
-                while ((c = ParseReadc()) == ' ' || c == '\t')
-                    continue;
+                while ((c = ParseReadc()) == ' ' || c == '\t');
 
                 if (c == EOF)
@@ -2100 +2108 @@
  */
 static char *
-ParseReadLine (void)
+ParseReadLine ()
 {
     Buffer        buf;          /* Buffer for current line */
-    int           c;            /* the current character */
-    int           lastc;        /* The most-recent character */
+    register int  c;            /* the current character */
+    register int  lastc;        /* The most-recent character */
     Boolean       semiNL;       /* treat semi-colons as newlines */
     Boolean       ignDepOp;     /* TRUE if should ignore dependency operators
@@ -2221 +2229 @@
             case '#':
                 if (!ignComment) {
-                    if (lastc != '\\') {
+                    if (
+#if 0
+                    compatMake &&
+#endif
+                    (lastc != '\\')) {
                         /*
                          * If the character is a hash mark and it isn't escaped
@@ -2252 +2264 @@
                 }
                 break;
-            default:
-                break;
             }
             /*
@@ -2274 +2284 @@
         /*
          * Strip trailing blanks and tabs from the line.
-         * Do not strip a blank or tab that is preceded by
+         * Do not strip a blank or tab that is preceeded by
          * a '\'
          */
@@ -2305 +2315 @@
                 /*FALLTHRU*/
             case COND_PARSE:
-                free (line);
+                free ((Address) line);
                 line = ParseReadLine();
                 break;
@@ -2331 +2341 @@
                 }
                 break;
-            default:
-                break;
             }
         }
@@ -2359 +2367 @@
  */
 static void
-ParseFinishLine(void)
+ParseFinishLine()
 {
     if (inLine) {
-        Lst_ForEach(targets, Suff_EndTransform, (void *)NULL);
+        Lst_ForEach(targets, Suff_EndTransform, (ClientData)NULL);
         Lst_Destroy (targets, ParseHasCommands);
         targets = NULL;
@@ -2386 +2394 @@
  */
 void
-Parse_File(char *name, FILE *stream)
-{
-    char          *cp,          /* pointer into the line */
+Parse_File(name, stream)
+    char          *name;        /* the name of the file being read */
+    FILE *        stream;       /* Stream open to makefile to parse */
+{
+    register char *cp,          /* pointer into the line */
                   *line;        /* the line we're working on */
 
@@ -2404 +2414 @@
                  * include or undef directives.
                  */
-                for (cp = line + 1; isspace ((unsigned char) *cp); cp++) {
+                for (cp = line + 1; isspace (*cp); cp++) {
                     continue;
                 }
@@ -2443 +2453 @@
             shellCommand:
 #endif
-                for (cp = line + 1; isspace ((unsigned char) *cp); cp++) {
+                for (cp = line + 1; isspace (*cp); cp++) {
                     continue;
                 }
@@ -2454 +2464 @@
                          */
                         Lst_ForEach (targets, ParseAddCmd, cp);
-                        Lst_AtEnd(targCmds, (void *) line);
+                        Lst_AtEnd(targCmds, (ClientData) line);
                         continue;
                     } else {
@@ -2569 +2579 @@
  */
 void
-Parse_Init (void)
-{
-    mainNode = NULL;
+Parse_Init ()
+{
+    mainNode = NILGNODE;
     parseIncPath = Lst_Init (FALSE);
     sysIncPath = Lst_Init (FALSE);
@@ -2579 +2589 @@
 
 void
-Parse_End (void)
-{
-    Lst_Destroy(targCmds, (void (*)(void *)) free);
+Parse_End()
+{
+    Lst_Destroy(targCmds, (void (*) __P((ClientData))) free);
     if (targets)
         Lst_Destroy(targets, NOFREE);
@@ -2605 +2615 @@
  */
 Lst
-Parse_MainName(void)
+Parse_MainName()
 {
     Lst           listmain;     /* result list */
@@ -2611 +2621 @@
     listmain = Lst_Init (FALSE);
 
-    if (mainNode == NULL) {
+    if (mainNode == NILGNODE) {
         Punt ("no target to make.");
         /*NOTREACHED*/
     } else if (mainNode->type & OP_DOUBLEDEP) {
-        (void) Lst_AtEnd (listmain, (void *)mainNode);
+        (void) Lst_AtEnd (listmain, (ClientData)mainNode);
         Lst_Concat(listmain, mainNode->cohorts, LST_CONCNEW);
     }
     else
-        (void) Lst_AtEnd (listmain, (void *)mainNode);
+        (void) Lst_AtEnd (listmain, (ClientData)mainNode);
     return (listmain);
 }

branches/FREEBSD/src/kmk/pathnames.h

@@ -31 +31 @@
  * SUCH DAMAGE.
  *
- *      @(#)pathnames.h 8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.12 2002/05/24 15:51:27 ru Exp $
+ *      from: @(#)pathnames.h   5.2 (Berkeley) 6/1/90
+ * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.9 1999/08/28 01:03:36 peter Exp $
  */
 

branches/FREEBSD/src/kmk/sprite.h

@@ -36 +36 @@
  * SUCH DAMAGE.
  *
- *      @(#)sprite.h    8.2 (Berkeley) 4/28/95
- * $FreeBSD: src/usr.bin/make/sprite.h,v 1.13 2002/09/17 21:29:06 jmallett Exp $
+ *      from: @(#)sprite.h      8.1 (Berkeley) 6/6/93
+ * $FreeBSD: src/usr.bin/make/sprite.h,v 1.9 1999/08/28 01:03:36 peter Exp $
  */
 
@@ -47 +47 @@
 
 #ifndef _SPRITE
-#define _SPRITE
+#define _SPRITE
+
 
 /*
@@ -56 +57 @@
 typedef int Boolean;
 #ifndef TRUE
-#define TRUE    1
+#define TRUE    1
 #endif /* TRUE */
 #ifndef FALSE
-#define FALSE   0
+#define FALSE   0
 #endif /* FALSE */
+
+/*
+ * Functions that must return a status can return a ReturnStatus to
+ * indicate success or type of failure.
+ */
 
 typedef int  ReturnStatus;
 
-#define SUCCESS         0
-#define FAILURE         1
+/*
+ * The following statuses overlap with the first 2 generic statuses
+ * defined in status.h:
+ *
+ * SUCCESS                      There was no error.
+ * FAILURE                      There was a general error.
+ */
+
+#define SUCCESS                 0x00000000
+#define FAILURE                 0x00000001
+
+
+/*
+ * A nil pointer must be something that will cause an exception if
+ * referenced.  There are two nils: the kernels nil and the nil used
+ * by user processes.
+ */
+
+#define NIL             ~0
+#define USER_NIL        0
+#ifndef NULL
+#define NULL            0
+#endif /* NULL */
+
+/*
+ * An address is just a pointer in C.  It is defined as a character pointer
+ * so that address arithmetic will work properly, a byte at a time.
+ */
+
+typedef char *Address;
+
+/*
+ * ClientData is an uninterpreted word.  It is defined as an int so that
+ * kdbx will not interpret client data as a string.  Unlike an "Address",
+ * client data will generally not be used in arithmetic.
+ * But we don't have kdbx anymore so we define it as void (christos)
+ */
+
+typedef void *ClientData;
 
 #endif /* _SPRITE */

branches/FREEBSD/src/kmk/str.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)str.c    5.8 (Berkeley) 6/1/90
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/str.c,v 1.25 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)str.c       5.8 (Berkeley) 6/1/90";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/str.c,v 1.12.2.1 2002/06/17 04:30:48 jmallett Exp $";
+#endif
+#endif /* not lint */
 
 #include "make.h"
@@ -53 +57 @@
  */
 void
-str_init(void)
+str_init()
 {
     char *p1;
@@ -67 +71 @@
  */
 void
-str_end(void)
+str_end()
 {
     if (argv) {
         if (argv[0])
             free(argv[0]);
-        free(argv);
+        free((Address) argv);
     }
     if (buffer)
@@ -87 +91 @@
  */
 char *
-str_concat(char *s1, char *s2, int flags)
-{
-        int len1, len2;
-        char *result;
+str_concat(s1, s2, flags)
+        char *s1, *s2;
+        int flags;
+{
+        register int len1, len2;
+        register char *result;
 
         /* get the length of both strings */
@@ -116 +122 @@
         /* free original strings */
         if (flags & STR_DOFREE) {
-                (void)efree(s1);
-                (void)efree(s2);
+                (void)free(s1);
+                (void)free(s2);
         }
         return(result);
@@ -133 +139 @@
  */
 char **
-brk_string(char *str, int *store_argc, Boolean expand)
-{
-        int argc, ch;
-        char inquote, *p, *start, *t;
+brk_string(str, store_argc, expand)
+        register char *str;
+        int *store_argc;
+        Boolean expand;
+{
+        register int argc, ch;
+        register char inquote, *p, *start, *t;
         int len;
 
@@ -237 +246 @@
                                 ch = '\t';
                                 break;
-                        default:
-                                break;
-                        }
-                        break;
-                default:
+                        }
                         break;
                 }
@@ -262 +267 @@
  *
  * Side effects: None.
- *
- * XXX should be strstr(3).
  */
 char *
-Str_FindSubstring(char *string, char *substring)
-{
-        char *a, *b;
+Str_FindSubstring(string, substring)
+        register char *string;          /* String to search. */
+        char *substring;                /* Substring to find in string */
+{
+        register char *a, *b;
 
         /*
@@ -303 +308 @@
  */
 int
-Str_Match(char *string, char *pattern)
+Str_Match(string, pattern)
+        register char *string;          /* String */
+        register char *pattern;         /* Pattern */
 {
         char c2;
@@ -406 +413 @@
  */
 char *
-Str_SYSVMatch(char *word, char *pattern, int *len)
+Str_SYSVMatch(word, pattern, len)
+    char        *word;          /* Word to examine */
+    char        *pattern;       /* Pattern to examine against */
+    int         *len;           /* Number of characters to substitute */
 {
     char *p = pattern;
@@ -469 +479 @@
  */
 void
-Str_SYSVSubst(Buffer buf, char *pat, char *src, int len)
+Str_SYSVSubst(buf, pat, src, len)
+    Buffer buf;
+    char *pat;
+    char *src;
+    int   len;
 {
     char *m;

branches/FREEBSD/src/kmk/suff.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)suff.c   8.4 (Berkeley) 3/21/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/suff.c,v 1.26 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)suff.c      8.4 (Berkeley) 3/21/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/suff.c,v 1.12.2.1 2001/03/09 01:13:24 tmm Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -89 +93 @@
  *      Suff_FindDeps           Find implicit sources for and the location of
  *                              a target based on its suffix. Returns the
- *                              bottom-most node added to the graph or NULL
+ *                              bottom-most node added to the graph or NILGNODE
  *                              if the target had no implicit sources.
  */
@@ -112 +116 @@
     int          nameLen;       /* Length of the suffix */
     short        flags;         /* Type of suffix */
-#define SUFF_INCLUDE      0x01      /* One which is #include'd */
-#define SUFF_LIBRARY      0x02      /* One which contains a library */
-#define SUFF_NULL         0x04      /* The empty suffix */
+#define SUFF_INCLUDE      0x01      /* One which is #include'd */
+#define SUFF_LIBRARY      0x02      /* One which contains a library */
+#define SUFF_NULL         0x04      /* The empty suffix */
     Lst          searchPath;    /* The path along which files of this suffix
                                  * may be found */
@@ -154 +158 @@
 
 
-static char *SuffStrIsPrefix(char *, char *);
-static char *SuffSuffIsSuffix(Suff *, char *);
-static int SuffSuffIsSuffixP(void *, void *);
-static int SuffSuffHasNameP(void *, void *);
-static int SuffSuffIsPrefix(void *, void *);
-static int SuffGNHasNameP(void *, void *);
-static void SuffFree(void *);
-static void SuffInsert(Lst, Suff *);
-static void SuffRemove(Lst, Suff *);
-static Boolean SuffParseTransform(char *, Suff **, Suff **);
-static int SuffRebuildGraph(void *, void *);
-static int SuffAddSrc(void *, void *);
-static int SuffRemoveSrc(Lst);
-static void SuffAddLevel(Lst, Src *);
-static Src *SuffFindThem(Lst, Lst);
-static Src *SuffFindCmds(Src *, Lst);
-static int SuffExpandChildren(void *, void *);
-static Boolean SuffApplyTransform(GNode *, GNode *, Suff *, Suff *);
-static void SuffFindDeps(GNode *, Lst);
-static void SuffFindArchiveDeps(GNode *, Lst);
-static void SuffFindNormalDeps(GNode *, Lst);
-static int SuffPrintName(void *, void *);
-static int SuffPrintSuff(void *, void *);
-static int SuffPrintTrans(void *, void *);
+static char *SuffStrIsPrefix __P((char *, char *));
+static char *SuffSuffIsSuffix __P((Suff *, char *));
+static int SuffSuffIsSuffixP __P((ClientData, ClientData));
+static int SuffSuffHasNameP __P((ClientData, ClientData));
+static int SuffSuffIsPrefix __P((ClientData, ClientData));
+static int SuffGNHasNameP __P((ClientData, ClientData));
+static void SuffFree __P((ClientData));
+static void SuffInsert __P((Lst, Suff *));
+static void SuffRemove __P((Lst, Suff *));
+static Boolean SuffParseTransform __P((char *, Suff **, Suff **));
+static int SuffRebuildGraph __P((ClientData, ClientData));
+static int SuffAddSrc __P((ClientData, ClientData));
+static int SuffRemoveSrc __P((Lst));
+static void SuffAddLevel __P((Lst, Src *));
+static Src *SuffFindThem __P((Lst, Lst));
+static Src *SuffFindCmds __P((Src *, Lst));
+static int SuffExpandChildren __P((ClientData, ClientData));
+static Boolean SuffApplyTransform __P((GNode *, GNode *, Suff *, Suff *));
+static void SuffFindDeps __P((GNode *, Lst));
+static void SuffFindArchiveDeps __P((GNode *, Lst));
+static void SuffFindNormalDeps __P((GNode *, Lst));
+static int SuffPrintName __P((ClientData, ClientData));
+static int SuffPrintSuff __P((ClientData, ClientData));
+static int SuffPrintTrans __P((ClientData, ClientData));
 
         /*************** Lst Predicates ****************/
@@ -193 +197 @@
  */
 static char    *
-SuffStrIsPrefix (char *pref, char *str)
+SuffStrIsPrefix (pref, str)
+    register char  *pref;       /* possible prefix */
+    register char  *str;        /* string to check */
 {
     while (*str && *pref == *str) {
@@ -218 +224 @@
  */
 static char *
-SuffSuffIsSuffix (Suff *s, char *str)
-{
-    char           *p1;         /* Pointer into suffix name */
-    char           *p2;         /* Pointer into string being examined */
+SuffSuffIsSuffix (s, str)
+    register Suff  *s;          /* possible suffix */
+    char           *str;        /* string to examine */
+{
+    register char  *p1;         /* Pointer into suffix name */
+    register char  *p2;         /* Pointer into string being examined */
 
     p1 = s->name + s->nameLen;
@@ -249 +257 @@
  */
 static int
-SuffSuffIsSuffixP(void *s, void *str)
+SuffSuffIsSuffixP(s, str)
+    ClientData   s;
+    ClientData   str;
 {
     return(!SuffSuffIsSuffix((Suff *) s, (char *) str));
@@ -268 +278 @@
  */
 static int
-SuffSuffHasNameP (void *s, void *sname)
+SuffSuffHasNameP (s, sname)
+    ClientData    s;                /* Suffix to check */
+    ClientData    sname;            /* Desired name */
 {
     return (strcmp ((char *) sname, ((Suff *) s)->name));
@@ -289 +301 @@
  */
 static int
-SuffSuffIsPrefix (void *s, void *str)
+SuffSuffIsPrefix (s, str)
+    ClientData   s;             /* suffix to compare */
+    ClientData   str;   /* string to examine */
 {
     return (SuffStrIsPrefix (((Suff *) s)->name, (char *) str) == NULL ? 1 : 0);
@@ -307 +321 @@
  */
 static int
-SuffGNHasNameP (void *gn, void *name)
+SuffGNHasNameP (gn, name)
+    ClientData      gn;         /* current node we're looking at */
+    ClientData      name;       /* name we're looking for */
 {
     return (strcmp ((char *) name, ((GNode *) gn)->name));
@@ -327 +343 @@
  */
 static void
-SuffFree (void *sp)
+SuffFree (sp)
+    ClientData sp;
 {
     Suff           *s = (Suff *) sp;
@@ -342 +359 @@
     Lst_Destroy (s->searchPath, Dir_Destroy);
 
-    free (s->name);
-    free (s);
+    free ((Address)s->name);
+    free ((Address)s);
 }
 
@@ -359 +376 @@
  */
 static void
-SuffRemove(Lst l, Suff *s)
-{
-    LstNode ln = Lst_Member(l, (void *)s);
-    if (ln != NULL) {
+SuffRemove(l, s)
+    Lst l;
+    Suff *s;
+{
+    LstNode ln = Lst_Member(l, (ClientData)s);
+    if (ln != NILLNODE) {
         Lst_Remove(l, ln);
         s->refCount--;
@@ -383 +402 @@
  */
 static void
-SuffInsert (Lst l, Suff *s)
+SuffInsert (l, s)
+    Lst           l;            /* the list where in s should be inserted */
+    Suff          *s;           /* the suffix to insert */
 {
     LstNode       ln;           /* current element in l we're examining */
@@ -391 +412 @@
         return;
     }
-    while ((ln = Lst_Next (l)) != NULL) {
+    while ((ln = Lst_Next (l)) != NILLNODE) {
         s2 = (Suff *) Lst_Datum (ln);
         if (s2->sNum >= s->sNum) {
@@ -397 +418 @@
         }
     }
-    if (s2 == NULL) {
-            DEBUGF(SUFF, ("inserting an empty list?..."));
-    }
 
     Lst_Close (l);
-    DEBUGF(SUFF, ("inserting %s(%d)...", s->name, s->sNum));
-    if (ln == NULL) {
-        DEBUGF(SUFF, ("at end of list\n"));
-        (void)Lst_AtEnd (l, (void *)s);
+    if (DEBUG(SUFF)) {
+        printf("inserting %s(%d)...", s->name, s->sNum);
+    }
+    if (ln == NILLNODE) {
+        if (DEBUG(SUFF)) {
+            printf("at end of list\n");
+        }
+        (void)Lst_AtEnd (l, (ClientData)s);
         s->refCount++;
-        (void)Lst_AtEnd(s->ref, (void *) l);
+        (void)Lst_AtEnd(s->ref, (ClientData) l);
     } else if (s2->sNum != s->sNum) {
-        DEBUGF(SUFF, ("before %s(%d)\n", s2->name, s2->sNum));
-        (void)Lst_Insert (l, ln, (void *)s);
+        if (DEBUG(SUFF)) {
+            printf("before %s(%d)\n", s2->name, s2->sNum);
+        }
+        (void)Lst_Insert (l, ln, (ClientData)s);
         s->refCount++;
-        (void)Lst_AtEnd(s->ref, (void *) l);
-    } else {
-        DEBUGF(SUFF, ("already there\n"));
+        (void)Lst_AtEnd(s->ref, (ClientData) l);
+    } else if (DEBUG(SUFF)) {
+        printf("already there\n");
     }
 }
@@ -436 +460 @@
  */
 void
-Suff_ClearSuffixes (void)
+Suff_ClearSuffixes ()
 {
     Lst_Concat (suffClean, sufflist, LST_CONCLINK);
@@ -448 +472 @@
      * suffNull should not have parents.
      */
-    Lst_Destroy(suffNull->children, NOFREE); 
+    Lst_Destroy(suffNull->children, NOFREE);
     suffNull->children = Lst_Init(FALSE);
 }
@@ -466 +490 @@
  */
 static Boolean
-SuffParseTransform(char *str, Suff **srcPtr, Suff **targPtr)
-{
-    LstNode             srcLn;      /* element in suffix list of trans source*/
-    Suff                *src;       /* Source of transformation */
-    LstNode             targLn;     /* element in suffix list of trans target*/
-    char                *str2;      /* Extra pointer (maybe target suffix) */
+SuffParseTransform(str, srcPtr, targPtr)
+    char                *str;           /* String being parsed */
+    Suff                **srcPtr;       /* Place to store source of trans. */
+    Suff                **targPtr;      /* Place to store target of trans. */
+{
+    register LstNode    srcLn;      /* element in suffix list of trans source*/
+    register Suff       *src;       /* Source of transformation */
+    register LstNode    targLn;     /* element in suffix list of trans target*/
+    register char       *str2;      /* Extra pointer (maybe target suffix) */
     LstNode             singleLn;   /* element in suffix list of any suffix
                                      * that exactly matches str */
@@ -477 +504 @@
                                      * null suffix */
 
-    srcLn = NULL;
-    singleLn = NULL;
+    srcLn = NILLNODE;
+    singleLn = NILLNODE;
 
     /*
@@ -487 +514 @@
      */
     for (;;) {
-        if (srcLn == NULL) {
-            srcLn = Lst_Find(sufflist, (void *)str, SuffSuffIsPrefix);
+        if (srcLn == NILLNODE) {
+            srcLn = Lst_Find(sufflist, (ClientData)str, SuffSuffIsPrefix);
         } else {
-            srcLn = Lst_FindFrom (sufflist, Lst_Succ(srcLn), (void *)str,
+            srcLn = Lst_FindFrom (sufflist, Lst_Succ(srcLn), (ClientData)str,
                                   SuffSuffIsPrefix);
         }
-        if (srcLn == NULL) {
+        if (srcLn == NILLNODE) {
             /*
              * Ran out of source suffixes -- no such rule
              */
-            if (singleLn != NULL) {
+            if (singleLn != NILLNODE) {
                 /*
                  * Not so fast Mr. Smith! There was a suffix that encompassed
@@ -519 +546 @@
             singleLn = srcLn;
         } else {
-            targLn = Lst_Find(sufflist, (void *)str2, SuffSuffHasNameP);
-            if (targLn != NULL) {
+            targLn = Lst_Find(sufflist, (ClientData)str2, SuffSuffHasNameP);
+            if (targLn != NILLNODE) {
                 *srcPtr = src;
                 *targPtr = (Suff *)Lst_Datum(targLn);
@@ -544 +571 @@
  */
 Boolean
-Suff_IsTransform (char *str)
+Suff_IsTransform (str)
+    char          *str;         /* string to check */
 {
     Suff          *src, *targ;
@@ -566 +594 @@
  */
 GNode *
-Suff_AddTransform (char *line)
+Suff_AddTransform (line)
+    char          *line;        /* name of transformation to add */
 {
     GNode         *gn;          /* GNode of transformation rule */
@@ -573 +602 @@
     LstNode       ln;           /* Node for existing transformation */
 
-    ln = Lst_Find (transforms, (void *)line, SuffGNHasNameP);
-    if (ln == NULL) {
+    ln = Lst_Find (transforms, (ClientData)line, SuffGNHasNameP);
+    if (ln == NILLNODE) {
         /*
          * Make a new graph node for the transformation. It will be filled in
@@ -580 +609 @@
          */
         gn = Targ_NewGN (line);
-        (void)Lst_AtEnd (transforms, (void *)gn);
+        (void)Lst_AtEnd (transforms, (ClientData)gn);
     } else {
         /*
@@ -602 +631 @@
      * link the two together in the proper relationship and order
      */
-    DEBUGF(SUFF, ("defining transformation from `%s' to `%s'\n",
-           s->name, t->name));
+    if (DEBUG(SUFF)) {
+        printf("defining transformation from `%s' to `%s'\n",
+                s->name, t->name);
+    }
     SuffInsert (t->children, s);
     SuffInsert (s->parents, t);
@@ -628 +659 @@
  */
 int
-Suff_EndTransform(void *gnp, void *dummy __unused)
+Suff_EndTransform(gnp, dummy)
+    ClientData   gnp;           /* Node for transformation */
+    ClientData   dummy;         /* Node for transformation */
 {
     GNode *gn = (GNode *) gnp;
@@ -639 +672 @@
         (void)SuffParseTransform(gn->name, &s, &t);
 
-        DEBUGF(SUFF, ("deleting transformation from `%s' to `%s'\n",
-               s->name, t->name));
+        if (DEBUG(SUFF)) {
+            printf("deleting transformation from `%s' to `%s'\n",
+                    s->name, t->name);
+        }
 
         /*
          * Remove the source from the target's children list. We check for a
-         * NULL return to handle a beanhead saying something like
+         * nil return to handle a beanhead saying something like
          *  .c.o .c.o:
          *
@@ -656 +691 @@
          */
         SuffRemove(s->parents, t);
-    } else if (gn->type & OP_TRANSFORM) {
-        DEBUGF(SUFF, ("transformation %s complete\n", gn->name));
-    }
-
-    return (0);
+    } else if ((gn->type & OP_TRANSFORM) && DEBUG(SUFF)) {
+        printf("transformation %s complete\n", gn->name);
+    }
+
+    return(dummy ? 0 : 0);
 }
 
@@ -683 +718 @@
  */
 static int
-SuffRebuildGraph(void *transformp, void *sp)
+SuffRebuildGraph(transformp, sp)
+    ClientData  transformp; /* Transformation to test */
+    ClientData  sp;         /* Suffix to rebuild */
 {
     GNode       *transform = (GNode *) transformp;
@@ -696 +733 @@
     cp = SuffStrIsPrefix(s->name, transform->name);
     if (cp != (char *)NULL) {
-        if (cp[0] == '\0')  /* null rule */
+        if (cp[0] == '\0')  /* null rule */
             s2 = suffNull;
         else {
-            ln = Lst_Find(sufflist, (void *)cp, SuffSuffHasNameP);
-            if (ln != NULL) 
-                s2 = (Suff *)Lst_Datum(ln);
+            ln = Lst_Find(sufflist, (ClientData)cp, SuffSuffHasNameP);
+            if (ln != NILLNODE)
+                s2 = (Suff *)Lst_Datum(ln);
         }
         if (s2 != NULL) {
@@ -723 +760 @@
          */
         cp[1] = '\0';
-        ln = Lst_Find(sufflist, (void *)transform->name, SuffSuffHasNameP);
+        ln = Lst_Find(sufflist, (ClientData)transform->name, SuffSuffHasNameP);
         /*
          * Replace the start of the target suffix
          */
         cp[1] = s->name[0];
-        if (ln != NULL) {
+        if (ln != NILLNODE) {
             /*
              * Found it -- establish the proper relationship
@@ -755 +792 @@
  */
 void
-Suff_AddSuffix (char *str)
+Suff_AddSuffix (str)
+    char          *str;     /* the name of the suffix to add */
 {
     Suff          *s;       /* new suffix descriptor */
     LstNode       ln;
 
-    ln = Lst_Find (sufflist, (void *)str, SuffSuffHasNameP);
-    if (ln == NULL) {
+    ln = Lst_Find (sufflist, (ClientData)str, SuffSuffHasNameP);
+    if (ln == NILLNODE) {
         s = (Suff *) emalloc (sizeof (Suff));
 
@@ -774 +812 @@
         s->refCount =   0;
 
-        (void)Lst_AtEnd (sufflist, (void *)s);
+        (void)Lst_AtEnd (sufflist, (ClientData)s);
         /*
          * Look for any existing transformations from or to this suffix.
          * XXX: Only do this after a Suff_ClearSuffixes?
          */
-        Lst_ForEach (transforms, SuffRebuildGraph, (void *)s);
+        Lst_ForEach (transforms, SuffRebuildGraph, (ClientData)s);
     }
 }
@@ -789 +827 @@
  *
  * Results:
- *      The searchPath for the desired suffix or NULL if the suffix isn't
+ *      The searchPath for the desired suffix or NILLST if the suffix isn't
  *      defined.
  *
@@ -797 +835 @@
  */
 Lst
-Suff_GetPath (char *sname)
+Suff_GetPath (sname)
+    char          *sname;
 {
     LstNode       ln;
     Suff          *s;
 
-    ln = Lst_Find (sufflist, (void *)sname, SuffSuffHasNameP);
-    if (ln == NULL) {
-        return (NULL);
+    ln = Lst_Find (sufflist, (ClientData)sname, SuffSuffHasNameP);
+    if (ln == NILLNODE) {
+        return (NILLST);
     } else {
         s = (Suff *) Lst_Datum (ln);
@@ -824 +863 @@
  *      directories in dirSearchPath. If paths were specified for the
  *      ".h" suffix, the directories are stuffed into a global variable
- *      called ".INCLUDES" with each directory preceded by a -I. The same
+ *      called ".INCLUDES" with each directory preceeded by a -I. The same
  *      is done for the ".a" suffix, except the variable is called
  *      ".LIBS" and the flag is -L.
@@ -830 +869 @@
  */
 void
-Suff_DoPaths(void)
-{
-    Suff                *s;
-    LstNode             ln;
+Suff_DoPaths()
+{
+    register Suff       *s;
+    register LstNode    ln;
     char                *ptr;
     Lst                 inIncludes; /* Cumulative .INCLUDES path */
@@ -845 +884 @@
     inLibs = Lst_Init(FALSE);
 
-    while ((ln = Lst_Next (sufflist)) != NULL) {
+    while ((ln = Lst_Next (sufflist)) != NILLNODE) {
         s = (Suff *) Lst_Datum (ln);
         if (!Lst_IsEmpty (s->searchPath)) {
@@ -892 +931 @@
  */
 void
-Suff_AddInclude (char *sname)
+Suff_AddInclude (sname)
+    char          *sname;     /* Name of suffix to mark */
 {
     LstNode       ln;
     Suff          *s;
 
-    ln = Lst_Find (sufflist, (void *)sname, SuffSuffHasNameP);
-    if (ln != NULL) {
+    ln = Lst_Find (sufflist, (ClientData)sname, SuffSuffHasNameP);
+    if (ln != NILLNODE) {
         s = (Suff *) Lst_Datum (ln);
         s->flags |= SUFF_INCLUDE;
@@ -921 +961 @@
  */
 void
-Suff_AddLib (char *sname)
+Suff_AddLib (sname)
+    char          *sname;     /* Name of suffix to mark */
 {
     LstNode       ln;
     Suff          *s;
 
-    ln = Lst_Find (sufflist, (void *)sname, SuffSuffHasNameP);
-    if (ln != NULL) {
+    ln = Lst_Find (sufflist, (ClientData)sname, SuffSuffHasNameP);
+    if (ln != NILLNODE) {
         s = (Suff *) Lst_Datum (ln);
         s->flags |= SUFF_LIBRARY;
@@ -950 +991 @@
  */
 static int
-SuffAddSrc (void *sp, void *lsp)
+SuffAddSrc (sp, lsp)
+    ClientData  sp;         /* suffix for which to create a Src structure */
+    ClientData  lsp;        /* list and parent for the new Src */
 {
     Suff        *s = (Suff *) sp;
@@ -969 +1012 @@
         s2->pref =      targ->pref;
         s2->parent =    targ;
-        s2->node =      NULL;
+        s2->node =      NILGNODE;
         s2->suff =      s;
         s->refCount++;
         s2->children =  0;
         targ->children += 1;
-        (void)Lst_AtEnd (ls->l, (void *)s2);
+        (void)Lst_AtEnd (ls->l, (ClientData)s2);
 #ifdef DEBUG_SRC
         s2->cp = Lst_Init(FALSE);
-        Lst_AtEnd(targ->cp, (void *) s2);
+        Lst_AtEnd(targ->cp, (ClientData) s2);
         printf("1 add %x %x to %x:", targ, s2, ls->l);
-        Lst_ForEach(ls->l, PrintAddr, (void *) 0);
+        Lst_ForEach(ls->l, PrintAddr, (ClientData) 0);
         printf("\n");
 #endif
@@ -987 +1030 @@
     s2->pref =      targ->pref;
     s2->parent =    targ;
-    s2->node =      NULL;
+    s2->node =      NILGNODE;
     s2->suff =      s;
     s->refCount++;
     s2->children =  0;
     targ->children += 1;
-    (void)Lst_AtEnd (ls->l, (void *)s2);
+    (void)Lst_AtEnd (ls->l, (ClientData)s2);
 #ifdef DEBUG_SRC
     s2->cp = Lst_Init(FALSE);
-    Lst_AtEnd(targ->cp, (void *) s2);
+    Lst_AtEnd(targ->cp, (ClientData) s2);
     printf("2 add %x %x to %x:", targ, s2, ls->l);
-    Lst_ForEach(ls->l, PrintAddr, (void *) 0);
+    Lst_ForEach(ls->l, PrintAddr, (ClientData) 0);
     printf("\n");
 #endif
@@ -1017 +1060 @@
  */
 static void
-SuffAddLevel (Lst l, Src *targ)
+SuffAddLevel (l, targ)
+    Lst            l;           /* list to which to add the new level */
+    Src            *targ;       /* Src structure to use as the parent */
 {
     LstSrc         ls;
@@ -1024 +1069 @@
     ls.l = l;
 
-    Lst_ForEach (targ->suff->children, SuffAddSrc, (void *)&ls);
+    Lst_ForEach (targ->suff->children, SuffAddSrc, (ClientData)&ls);
 }
 
@@ -1040 +1085 @@
  */
 static int
-SuffRemoveSrc (Lst l)
+SuffRemoveSrc (l)
+    Lst l;
 {
     LstNode ln;
@@ -1051 +1097 @@
 #ifdef DEBUG_SRC
     printf("cleaning %lx: ", (unsigned long) l);
-    Lst_ForEach(l, PrintAddr, (void *) 0);
+    Lst_ForEach(l, PrintAddr, (ClientData) 0);
     printf("\n");
 #endif
 
 
-    while ((ln = Lst_Next (l)) != NULL) {
+    while ((ln = Lst_Next (l)) != NILLNODE) {
         s = (Src *) Lst_Datum (ln);
         if (s->children == 0) {
-            free (s->file);
+            free ((Address)s->file);
             if (!s->parent)
-                free(s->pref);
+                free((Address)s->pref);
             else {
 #ifdef DEBUG_SRC
-                LstNode ln = Lst_Member(s->parent->cp, (void *)s);
-                if (ln != NULL)
+                LstNode ln = Lst_Member(s->parent->cp, (ClientData)s);
+                if (ln != NILLNODE)
                     Lst_Remove(s->parent->cp, ln);
 #endif
@@ -1075 +1121 @@
 #endif
             Lst_Remove(l, ln);
-            free (s);
+            free ((Address)s);
             t |= 1;
             Lst_Close(l);
@@ -1083 +1129 @@
         else {
             printf("keep: [l=%x] p=%x %d: ", l, s, s->children);
-            Lst_ForEach(s->cp, PrintAddr, (void *) 0);
+            Lst_ForEach(s->cp, PrintAddr, (ClientData) 0);
             printf("\n");
         }
@@ -1107 +1153 @@
  */
 static Src *
-SuffFindThem (Lst srcs, Lst slst)
+SuffFindThem (srcs, slst)
+    Lst            srcs;        /* list of Src structures to search through */
+    Lst            slst;
 {
     Src            *s;          /* current Src */
@@ -1118 +1166 @@
         s = (Src *) Lst_DeQueue (srcs);
 
-        DEBUGF(SUFF, ("\ttrying %s...", s->file));
+        if (DEBUG(SUFF)) {
+            printf ("\ttrying %s...", s->file);
+        }
 
         /*
@@ -1124 +1174 @@
          * graph for it or the file actually exists.
          */
-        if (Targ_FindNode(s->file, TARG_NOCREATE) != NULL) {
+        if (Targ_FindNode(s->file, TARG_NOCREATE) != NILGNODE) {
 #ifdef DEBUG_SRC
             printf("remove %x from %x\n", s, srcs);
@@ -1141 +1191 @@
         }
 
-        DEBUGF(SUFF, ("not there\n"));
+        if (DEBUG(SUFF)) {
+            printf ("not there\n");
+        }
 
         SuffAddLevel (srcs, s);
-        Lst_AtEnd(slst, (void *) s);
-    }
-
-    if (rs) {
-        DEBUGF(SUFF, ("got it\n"));
+        Lst_AtEnd(slst, (ClientData) s);
+    }
+
+    if (DEBUG(SUFF) && rs) {
+        printf ("got it\n");
     }
     return (rs);
@@ -1161 +1213 @@
  *
  * Results:
- *      The Src structure of the "winning" child, or NULL if no such beast.
+ *      The Src structure of the "winning" child, or NIL if no such beast.
  *
  * Side Effects:
@@ -1169 +1221 @@
  */
 static Src *
-SuffFindCmds (Src *targ, Lst slst)
+SuffFindCmds (targ, slst)
+    Src         *targ;  /* Src structure to play with */
+    Lst         slst;
 {
     LstNode             ln;     /* General-purpose list node */
-    GNode               *t,     /* Target GNode */
+    register GNode      *t,     /* Target GNode */
                         *s;     /* Source GNode */
     int                 prefLen;/* The length of the defined prefix */
@@ -1183 +1237 @@
     prefLen = strlen (targ->pref);
 
-    while ((ln = Lst_Next (t->children)) != NULL) {
+    while ((ln = Lst_Next (t->children)) != NILLNODE) {
         s = (GNode *)Lst_Datum (ln);
 
@@ -1197 +1251 @@
              * suffix.
              */
-            ln = Lst_Find (sufflist, (void *)&cp[prefLen],
+            ln = Lst_Find (sufflist, (ClientData)&cp[prefLen],
                            SuffSuffHasNameP);
-            if (ln != NULL) {
+            if (ln != NILLNODE) {
                 /*
                  * It even has a known suffix, see if there's a transformation
@@ -1209 +1263 @@
 
                 if (Lst_Member (suff->parents,
-                                (void *)targ->suff) != NULL)
+                                (ClientData)targ->suff) != NILLNODE)
                 {
                     /*
@@ -1229 +1283 @@
                     ret->cp = Lst_Init(FALSE);
                     printf("3 add %x %x\n", targ, ret);
-                    Lst_AtEnd(targ->cp, (void *) ret);
+                    Lst_AtEnd(targ->cp, (ClientData) ret);
 #endif
-                    Lst_AtEnd(slst, (void *) ret);
-                    DEBUGF(SUFF, ("\tusing existing source %s\n", s->name));
+                    Lst_AtEnd(slst, (ClientData) ret);
+                    if (DEBUG(SUFF)) {
+                        printf ("\tusing existing source %s\n", s->name);
+                    }
                     return (ret);
                 }
@@ -1259 +1315 @@
  */
 static int
-SuffExpandChildren(void *cgnp, void *pgnp)
+SuffExpandChildren(cgnp, pgnp)
+    ClientData  cgnp;       /* Child to examine */
+    ClientData  pgnp;       /* Parent node being processed */
 {
     GNode       *cgn = (GNode *) cgnp;
@@ -1272 +1330 @@
      * after the child
      */
-    prevLN = Lst_Member(pgn->children, (void *)cgn);
+    prevLN = Lst_Member(pgn->children, (ClientData)cgn);
 
     /*
@@ -1281 +1339 @@
      */
     if (strchr(cgn->name, '$') != (char *)NULL) {
-        DEBUGF(SUFF, ("Expanding \"%s\"...", cgn->name));
+        if (DEBUG(SUFF)) {
+            printf("Expanding \"%s\"...", cgn->name);
+        }
         cp = Var_Subst(NULL, cgn->name, pgn, TRUE);
 
@@ -1317 +1377 @@
                         *cp++ = '\0';
                         gn = Targ_FindNode(start, TARG_CREATE);
-                        (void)Lst_AtEnd(members, (void *)gn);
+                        (void)Lst_AtEnd(members, (ClientData)gn);
                         while (*cp == ' ' || *cp == '\t') {
                             cp++;
@@ -1356 +1416 @@
                      */
                     gn = Targ_FindNode(start, TARG_CREATE);
-                    (void)Lst_AtEnd(members, (void *)gn);
+                    (void)Lst_AtEnd(members, (ClientData)gn);
                 }
                 /*
@@ -1370 +1430 @@
                 gn = (GNode *)Lst_DeQueue(members);
 
-                DEBUGF(SUFF, ("%s...", gn->name));
-                if (Lst_Member(pgn->children, (void *)gn) == NULL) {
-                    (void)Lst_Append(pgn->children, prevLN, (void *)gn);
+                if (DEBUG(SUFF)) {
+                    printf("%s...", gn->name);
+                }
+                if (Lst_Member(pgn->children, (ClientData)gn) == NILLNODE) {
+                    (void)Lst_Append(pgn->children, prevLN, (ClientData)gn);
                     prevLN = Lst_Succ(prevLN);
-                    (void)Lst_AtEnd(gn->parents, (void *)pgn);
+                    (void)Lst_AtEnd(gn->parents, (ClientData)pgn);
                     pgn->unmade++;
                 }
@@ -1388 +1450 @@
          * keep it from being processed.
          */
-        ln = Lst_Member(pgn->children, (void *)cgn);
+        ln = Lst_Member(pgn->children, (ClientData)cgn);
         pgn->unmade--;
         Lst_Remove(pgn->children, ln);
-        DEBUGF(SUFF, ("\n"));
+        if (DEBUG(SUFF)) {
+            printf("\n");
+        }
     } else if (Dir_HasWildcards(cgn->name)) {
         Lst     exp;        /* List of expansions */
@@ -1405 +1469 @@
          */
         cp = cgn->name + strlen(cgn->name);
-        ln = Lst_Find(sufflist, (void *)cp, SuffSuffIsSuffixP);
-
-        DEBUGF(SUFF, ("Wildcard expanding \"%s\"...", cgn->name));
-
-        if (ln != NULL) {
+        ln = Lst_Find(sufflist, (ClientData)cp, SuffSuffIsSuffixP);
+
+        if (DEBUG(SUFF)) {
+            printf("Wildcard expanding \"%s\"...", cgn->name);
+        }
+
+        if (ln != NILLNODE) {
             Suff    *s = (Suff *)Lst_Datum(ln);
 
-            DEBUGF(SUFF, ("suffix is \"%s\"...", s->name));
+            if (DEBUG(SUFF)) {
+                printf("suffix is \"%s\"...", s->name);
+            }
             path = s->searchPath;
         } else {
@@ -1433 +1501 @@
             cp = (char *)Lst_DeQueue(exp);
 
-            DEBUGF(SUFF, ("%s...", cp));
+            if (DEBUG(SUFF)) {
+                printf("%s...", cp);
+            }
             gn = Targ_FindNode(cp, TARG_CREATE);
 
@@ -1440 +1510 @@
              * up the parent's count of unmade children.
              */
-            if (Lst_Member(pgn->children, (void *)gn) == NULL) {
-                (void)Lst_Append(pgn->children, prevLN, (void *)gn);
+            if (Lst_Member(pgn->children, (ClientData)gn) == NILLNODE) {
+                (void)Lst_Append(pgn->children, prevLN, (ClientData)gn);
                 prevLN = Lst_Succ(prevLN);
-                (void)Lst_AtEnd(gn->parents, (void *)pgn);
+                (void)Lst_AtEnd(gn->parents, (ClientData)pgn);
                 pgn->unmade++;
             }
@@ -1457 +1527 @@
          * keep it from being processed.
          */
-        ln = Lst_Member(pgn->children, (void *)cgn);
+        ln = Lst_Member(pgn->children, (ClientData)cgn);
         pgn->unmade--;
         Lst_Remove(pgn->children, ln);
-        DEBUGF(SUFF, ("\n"));
+        if (DEBUG(SUFF)) {
+            printf("\n");
+        }
     }
 
@@ -1485 +1557 @@
  */
 static Boolean
-SuffApplyTransform(GNode *tGn, GNode *sGn, Suff *t, Suff *s)
+SuffApplyTransform(tGn, sGn, t, s)
+    GNode       *tGn;       /* Target node */
+    GNode       *sGn;       /* Source node */
+    Suff        *t;         /* Target suffix */
+    Suff        *s;         /* Source suffix */
 {
     LstNode     ln;         /* General node */
@@ -1491 +1567 @@
     GNode       *gn;        /* Node for same */
 
-    if (Lst_Member(tGn->children, (void *)sGn) == NULL) {
+    if (Lst_Member(tGn->children, (ClientData)sGn) == NILLNODE) {
         /*
          * Not already linked, so form the proper links between the
          * target and source.
          */
-        (void)Lst_AtEnd(tGn->children, (void *)sGn);
-        (void)Lst_AtEnd(sGn->parents, (void *)tGn);
+        (void)Lst_AtEnd(tGn->children, (ClientData)sGn);
+        (void)Lst_AtEnd(sGn->parents, (ClientData)tGn);
         tGn->unmade += 1;
     }
@@ -1508 +1584 @@
          * will be sufficient to get the .IMPSRC variable set for tGn
          */
-        for (ln=Lst_First(sGn->cohorts); ln != NULL; ln=Lst_Succ(ln)) {
+        for (ln=Lst_First(sGn->cohorts); ln != NILLNODE; ln=Lst_Succ(ln)) {
             gn = (GNode *)Lst_Datum(ln);
 
-            if (Lst_Member(tGn->children, (void *)gn) == NULL) {
+            if (Lst_Member(tGn->children, (ClientData)gn) == NILLNODE) {
                 /*
                  * Not already linked, so form the proper links between the
                  * target and source.
                  */
-                (void)Lst_AtEnd(tGn->children, (void *)gn);
-                (void)Lst_AtEnd(gn->parents, (void *)tGn);
+                (void)Lst_AtEnd(tGn->children, (ClientData)gn);
+                (void)Lst_AtEnd(gn->parents, (ClientData)tGn);
                 tGn->unmade += 1;
             }
@@ -1526 +1602 @@
      */
     tname = str_concat(s->name, t->name, 0);
-    ln = Lst_Find(transforms, (void *)tname, SuffGNHasNameP);
+    ln = Lst_Find(transforms, (ClientData)tname, SuffGNHasNameP);
     free(tname);
 
-    if (ln == NULL) {
+    if (ln == NILLNODE) {
         /*
          * Not really such a transformation rule (can happen when we're
@@ -1540 +1616 @@
     gn = (GNode *)Lst_Datum(ln);
 
-    DEBUGF(SUFF, ("\tapplying %s -> %s to \"%s\"\n", s->name, t->name, tGn->name));
+    if (DEBUG(SUFF)) {
+        printf("\tapplying %s -> %s to \"%s\"\n", s->name, t->name, tGn->name);
+    }
 
     /*
@@ -1556 +1634 @@
      */
     ln = Lst_Succ(ln);
-    if (ln != NULL) {
+    if (ln != NILLNODE) {
         Lst_ForEachFrom(tGn->children, ln,
-                        SuffExpandChildren, (void *)tGn);
+                        SuffExpandChildren, (ClientData)tGn);
     }
 
@@ -1565 +1643 @@
      * the .IMPSRC variable can be set correctly for the parent.
      */
-    (void)Lst_AtEnd(sGn->iParents, (void *)tGn);
+    (void)Lst_AtEnd(sGn->iParents, (ClientData)tGn);
 
     return(TRUE);
@@ -1585 +1663 @@
  */
 static void
-SuffFindArchiveDeps(GNode *gn, Lst slst)
+SuffFindArchiveDeps(gn, slst)
+    GNode       *gn;        /* Node for which to locate dependencies */
+    Lst         slst;
 {
     char        *eoarch;    /* End of archive portion */
@@ -1623 +1703 @@
      * Create the link between the two nodes right off
      */
-    if (Lst_Member(gn->children, (void *)mem) == NULL) {
-        (void)Lst_AtEnd(gn->children, (void *)mem);
-        (void)Lst_AtEnd(mem->parents, (void *)gn);
+    if (Lst_Member(gn->children, (ClientData)mem) == NILLNODE) {
+        (void)Lst_AtEnd(gn->children, (ClientData)mem);
+        (void)Lst_AtEnd(mem->parents, (ClientData)gn);
         gn->unmade += 1;
     }
@@ -1644 +1724 @@
          * Didn't know what it was -- use .NULL suffix if not in make mode
          */
-        DEBUGF(SUFF, ("using null suffix\n"));
+        if (DEBUG(SUFF)) {
+            printf("using null suffix\n");
+        }
         ms = suffNull;
     }
@@ -1669 +1751 @@
         ln = Lst_Find(ms->parents, eoarch, SuffSuffIsSuffixP);
 
-        if (ln != NULL) {
+        if (ln != NILLNODE) {
             /*
              * Got one -- apply it
              */
-            if (!SuffApplyTransform(gn, mem, (Suff *)Lst_Datum(ln), ms)) {
-                DEBUGF(SUFF, ("\tNo transformation from %s -> %s\n",
-                       ms->name, ((Suff *)Lst_Datum(ln))->name));
+            if (!SuffApplyTransform(gn, mem, (Suff *)Lst_Datum(ln), ms) &&
+                DEBUG(SUFF))
+            {
+                printf("\tNo transformation from %s -> %s\n",
+                       ms->name, ((Suff *)Lst_Datum(ln))->name);
             }
         }
@@ -1716 +1800 @@
  */
 static void
-SuffFindNormalDeps(GNode *gn, Lst slst)
+SuffFindNormalDeps(gn, slst)
+    GNode       *gn;        /* Node for which to find sources */
+    Lst         slst;
 {
     char        *eoname;    /* End of name */
@@ -1761 +1847 @@
      */
 
-    while (ln != NULL) {
+    while (ln != NILLNODE) {
         /*
          * Look for next possible suffix...
@@ -1767 +1853 @@
         ln = Lst_FindFrom(sufflist, ln, eoname, SuffSuffIsSuffixP);
 
-        if (ln != NULL) {
+        if (ln != NILLNODE) {
             int     prefLen;        /* Length of the prefix */
-            Src     *target;
+            Src     *targ;
 
             /*
              * Allocate a Src structure to which things can be transformed
              */
-            target = (Src *)emalloc(sizeof (Src));
-            target->file = estrdup(gn->name);
-            target->suff = (Suff *)Lst_Datum(ln);
-            target->suff->refCount++;
-            target->node = gn;
-            target->parent = (Src *)NULL;
-            target->children = 0;
+            targ = (Src *)emalloc(sizeof (Src));
+            targ->file = estrdup(gn->name);
+            targ->suff = (Suff *)Lst_Datum(ln);
+            targ->suff->refCount++;
+            targ->node = gn;
+            targ->parent = (Src *)NULL;
+            targ->children = 0;
 #ifdef DEBUG_SRC
-            target->cp = Lst_Init(FALSE);
+            targ->cp = Lst_Init(FALSE);
 #endif
 
@@ -1789 +1875 @@
              * the length of the suffix from the end of the name.
              */
-            prefLen = (eoname - target->suff->nameLen) - sopref;
-            target->pref = emalloc(prefLen + 1);
-            memcpy(target->pref, sopref, prefLen);
-            target->pref[prefLen] = '\0';
+            prefLen = (eoname - targ->suff->nameLen) - sopref;
+            targ->pref = emalloc(prefLen + 1);
+            memcpy(targ->pref, sopref, prefLen);
+            targ->pref[prefLen] = '\0';
 
             /*
              * Add nodes from which the target can be made
              */
-            SuffAddLevel(srcs, target);
+            SuffAddLevel(srcs, targ);
 
             /*
              * Record the target so we can nuke it
              */
-            (void)Lst_AtEnd(targs, (void *)target);
+            (void)Lst_AtEnd(targs, (ClientData)targ);
 
             /*
@@ -1815 +1901 @@
      */
     if (Lst_IsEmpty(targs) && suffNull != NULL) {
-        DEBUGF(SUFF, ("\tNo known suffix on %s. Using .NULL suffix\n", gn->name));
+        if (DEBUG(SUFF)) {
+            printf("\tNo known suffix on %s. Using .NULL suffix\n", gn->name);
+        }
 
         targ = (Src *)emalloc(sizeof (Src));
@@ -1836 +1924 @@
             SuffAddLevel(srcs, targ);
         else {
-            DEBUGF(SUFF, ("not "));
-        }
-
-        DEBUGF(SUFF, ("adding suffix rules\n"));
-
-        (void)Lst_AtEnd(targs, (void *)targ);
+            if (DEBUG(SUFF))
+                printf("not ");
+        }
+
+        if (DEBUG(SUFF))
+            printf("adding suffix rules\n");
+
+        (void)Lst_AtEnd(targs, (ClientData)targ);
     }
 
@@ -1884 +1974 @@
      * that still contain variables or wildcards in their names.
      */
-    Lst_ForEach(gn->children, SuffExpandChildren, (void *)gn);
+    Lst_ForEach(gn->children, SuffExpandChildren, (ClientData)gn);
 
     if (targ == NULL) {
-        DEBUGF(SUFF, ("\tNo valid suffix on %s\n", gn->name));
+        if (DEBUG(SUFF)) {
+            printf("\tNo valid suffix on %s\n", gn->name);
+        }
 
 sfnd_abort:
@@ -1984 +2076 @@
              */
             while (bottom && bottom->parent != NULL) {
-                if (Lst_Member(slst, (void *) bottom) == NULL) {
-                    Lst_AtEnd(slst, (void *) bottom);
+                if (Lst_Member(slst, (ClientData) bottom) == NILLNODE) {
+                    Lst_AtEnd(slst, (ClientData) bottom);
                 }
                 bottom = bottom->parent;
@@ -2012 +2104 @@
      * Etc.
      */
-    if (bottom->node == NULL) {
+    if (bottom->node == NILGNODE) {
         bottom->node = Targ_FindNode(bottom->file, TARG_CREATE);
     }
@@ -2024 +2116 @@
         src->node->suffix->refCount++;
 
-        if (targ->node == NULL) {
+        if (targ->node == NILGNODE) {
             targ->node = Targ_FindNode(targ->file, TARG_CREATE);
         }
@@ -2066 +2158 @@
 sfnd_return:
     if (bottom)
-        if (Lst_Member(slst, (void *) bottom) == NULL)
-            Lst_AtEnd(slst, (void *) bottom);
+        if (Lst_Member(slst, (ClientData) bottom) == NILLNODE)
+            Lst_AtEnd(slst, (ClientData) bottom);
 
     while (SuffRemoveSrc(srcs) || SuffRemoveSrc(targs))
@@ -2106 +2198 @@
 
 void
-Suff_FindDeps(GNode *gn)
+Suff_FindDeps(gn)
+    GNode *gn;
 {
 
@@ -2116 +2209 @@
 
 static void
-SuffFindDeps (GNode *gn, Lst slst)
+SuffFindDeps (gn, slst)
+    GNode         *gn;          /* node we're dealing with */
+    Lst           slst;
 {
     if (gn->type & OP_DEPS_FOUND) {
@@ -2127 +2222 @@
     }
 
-    DEBUGF(SUFF, ("SuffFindDeps (%s)\n", gn->name));
+    if (DEBUG(SUFF)) {
+        printf ("SuffFindDeps (%s)\n", gn->name);
+    }
 
     if (gn->type & OP_ARCHV) {
@@ -2143 +2240 @@
         Suff    *s;
 
-        ln = Lst_Find (sufflist, (void *)LIBSUFF, SuffSuffHasNameP);
+        ln = Lst_Find (sufflist, (ClientData)LIBSUFF, SuffSuffHasNameP);
         if (gn->suffix)
             gn->suffix->refCount--;
-        if (ln != NULL) {
+        if (ln != NILLNODE) {
             gn->suffix = s = (Suff *) Lst_Datum (ln);
             gn->suffix->refCount++;
@@ -2183 +2280 @@
  */
 void
-Suff_SetNull(char *name)
+Suff_SetNull(name)
+    char    *name;          /* Name of null suffix */
 {
     Suff    *s;
     LstNode ln;
 
-    ln = Lst_Find(sufflist, (void *)name, SuffSuffHasNameP);
-    if (ln != NULL) {
+    ln = Lst_Find(sufflist, (ClientData)name, SuffSuffHasNameP);
+    if (ln != NILLNODE) {
         s = (Suff *)Lst_Datum(ln);
         if (suffNull != (Suff *)NULL) {
@@ -2218 +2316 @@
  */
 void
-Suff_Init (void)
+Suff_Init ()
 {
     sufflist = Lst_Init (FALSE);
@@ -2261 +2359 @@
 
 void
-Suff_End(void)
+Suff_End()
 {
     Lst_Destroy(sufflist, SuffFree);
@@ -2274 +2372 @@
 /********************* DEBUGGING FUNCTIONS **********************/
 
+static int SuffPrintName(s, dummy)
+    ClientData s;
+    ClientData dummy;
+{
+    printf ("`%s' ", ((Suff *) s)->name);
+    return (dummy ? 0 : 0);
+}
+
 static int
-SuffPrintName(void *s, void *dummy __unused)
-{
-    printf ("`%s' ", ((Suff *) s)->name);
-    return (0);
-}
-
-static int
-SuffPrintSuff (void *sp, void *dummy __unused)
+SuffPrintSuff (sp, dummy)
+    ClientData sp;
+    ClientData dummy;
 {
     Suff    *s = (Suff *) sp;
@@ -2306 +2407 @@
                     printf ("LIBRARY");
                     break;
-                default:
-                    break;
             }
             fputc(flags ? '|' : ')', stdout);
@@ -2314 +2413 @@
     fputc ('\n', stdout);
     printf ("#\tTo: ");
-    Lst_ForEach (s->parents, SuffPrintName, (void *)0);
+    Lst_ForEach (s->parents, SuffPrintName, (ClientData)0);
     fputc ('\n', stdout);
     printf ("#\tFrom: ");
-    Lst_ForEach (s->children, SuffPrintName, (void *)0);
+    Lst_ForEach (s->children, SuffPrintName, (ClientData)0);
     fputc ('\n', stdout);
     printf ("#\tSearch Path: ");
     Dir_PrintPath (s->searchPath);
     fputc ('\n', stdout);
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
 static int
-SuffPrintTrans (void *tp, void *dummy __unused)
+SuffPrintTrans (tp, dummy)
+    ClientData tp;
+    ClientData dummy;
 {
     GNode   *t = (GNode *) tp;
@@ -2333 +2434 @@
     Targ_PrintType (t->type);
     fputc ('\n', stdout);
-    Lst_ForEach (t->commands, Targ_PrintCmd, (void *)0);
+    Lst_ForEach (t->commands, Targ_PrintCmd, (ClientData)0);
     fputc ('\n', stdout);
-    return (0);
+    return(dummy ? 0 : 0);
 }
 
 void
-Suff_PrintAll(void)
+Suff_PrintAll()
 {
     printf ("#*** Suffixes:\n");
-    Lst_ForEach (sufflist, SuffPrintSuff, (void *)0);
+    Lst_ForEach (sufflist, SuffPrintSuff, (ClientData)0);
 
     printf ("#*** Transformations:\n");
-    Lst_ForEach (transforms, SuffPrintTrans, (void *)0);
-}
+    Lst_ForEach (transforms, SuffPrintTrans, (ClientData)0);
+}

branches/FREEBSD/src/kmk/targ.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)targ.c   8.2 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/targ.c,v 1.25 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)targ.c      8.2 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/targ.c,v 1.10 1999/09/11 13:08:02 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -93 +97 @@
 static Hash_Table targets;      /* a hash table of same */
 
-#define HTSIZE  191             /* initial size of hash table */
-
-static int TargPrintOnlySrc(void *, void *);
-static int TargPrintName(void *, void *);
-static int TargPrintNode(void *, void *);
-static void TargFreeGN(void *);
+#define HTSIZE  191             /* initial size of hash table */
+
+static int TargPrintOnlySrc __P((ClientData, ClientData));
+static int TargPrintName __P((ClientData, ClientData));
+static int TargPrintNode __P((ClientData, ClientData));
+static void TargFreeGN __P((ClientData));
 
 /*-
@@ -113 +117 @@
  */
 void
-Targ_Init (void)
+Targ_Init ()
 {
     allTargets = Lst_Init (FALSE);
@@ -132 +136 @@
  */
 void
-Targ_End (void)
+Targ_End ()
 {
     Lst_Destroy(allTargets, NOFREE);
@@ -154 +158 @@
  */
 GNode *
-Targ_NewGN (char *name)
-{
-    GNode *gn;
+Targ_NewGN (name)
+    char           *name;       /* the name to stick in the new node */
+{
+    register GNode *gn;
 
     gn = (GNode *) emalloc (sizeof (GNode));
@@ -184 +189 @@
     if (allGNs == NULL)
         allGNs = Lst_Init(FALSE);
-    Lst_AtEnd(allGNs, (void *) gn);
+    Lst_AtEnd(allGNs, (ClientData) gn);
 
     return (gn);
@@ -202 +207 @@
  */
 static void
-TargFreeGN (void *gnp)
+TargFreeGN (gnp)
+    ClientData gnp;
 {
     GNode *gn = (GNode *) gnp;
@@ -218 +224 @@
     Lst_Destroy(gn->context, NOFREE);
     Lst_Destroy(gn->commands, NOFREE);
-    free(gn);
+    free((Address)gn);
 }
 
@@ -228 +234 @@
  *
  * Results:
- *      The node in the list if it was. If it wasn't, return NULL of
+ *      The node in the list if it was. If it wasn't, return NILGNODE of
  *      flags was TARG_NOCREATE or the newly created and initialized node
  *      if it was TARG_CREATE
@@ -237 +243 @@
  */
 GNode *
-Targ_FindNode (char *name, int flags)
+Targ_FindNode (name, flags)
+    char           *name;       /* the name to find */
+    int             flags;      /* flags governing events when target not
+                                 * found */
 {
     GNode         *gn;        /* node in that element */
@@ -250 +259 @@
             gn = Targ_NewGN (name);
             Hash_SetValue (he, gn);
-            (void) Lst_AtEnd (allTargets, (void *)gn);
+            (void) Lst_AtEnd (allTargets, (ClientData)gn);
         }
     } else {
@@ -257 +266 @@
 
     if (he == (Hash_Entry *) NULL) {
-        return (NULL);
+        return (NILGNODE);
     } else {
         return ((GNode *) Hash_GetValue (he));
@@ -279 +288 @@
  */
 Lst
-Targ_FindList (Lst names, int flags)
+Targ_FindList (names, flags)
+    Lst            names;       /* list of names to find */
+    int            flags;       /* flags used if no node is found for a given
+                                 * name */
 {
     Lst            nodes;       /* result list */
-    LstNode        ln;          /* name list element */
-    GNode          *gn;         /* node in tLn */
-    char           *name;
+    register LstNode  ln;               /* name list element */
+    register GNode *gn;         /* node in tLn */
+    char          *name;
 
     nodes = Lst_Init (FALSE);
@@ -291 +303 @@
         return (nodes);
     }
-    while ((ln = Lst_Next (names)) != NULL) {
+    while ((ln = Lst_Next (names)) != NILLNODE) {
         name = (char *)Lst_Datum(ln);
         gn = Targ_FindNode (name, flags);
-        if (gn != NULL) {
+        if (gn != NILGNODE) {
             /*
              * Note: Lst_AtEnd must come before the Lst_Concat so the nodes
@@ -300 +312 @@
              * encountered in the makefile.
              */
-            (void) Lst_AtEnd (nodes, (void *)gn);
+            (void) Lst_AtEnd (nodes, (ClientData)gn);
             if (gn->type & OP_DOUBLEDEP) {
                 (void)Lst_Concat (nodes, gn->cohorts, LST_CONCNEW);
@@ -325 +337 @@
  */
 Boolean
-Targ_Ignore (GNode *gn)
+Targ_Ignore (gn)
+    GNode          *gn;         /* node to check for */
 {
     if (ignoreErrors || gn->type & OP_IGNORE) {
@@ -347 +360 @@
  */
 Boolean
-Targ_Silent (GNode *gn)
+Targ_Silent (gn)
+    GNode          *gn;         /* node to check for */
 {
     if (beSilent || gn->type & OP_SILENT) {
@@ -369 +383 @@
  */
 Boolean
-Targ_Precious (GNode *gn)
+Targ_Precious (gn)
+    GNode          *gn;         /* the node to check */
 {
     if (allPrecious || (gn->type & (OP_PRECIOUS|OP_DOUBLEDEP))) {
@@ -395 +410 @@
  */
 void
-Targ_SetMain (GNode *gn)
+Targ_SetMain (gn)
+    GNode   *gn;        /* The main target we'll create */
 {
     mainTarg = gn;
@@ -401 +417 @@
 
 static int
-TargPrintName (void *gnp, void *ppath)
+TargPrintName (gnp, ppath)
+    ClientData     gnp;
+    ClientData      ppath;
 {
     GNode *gn = (GNode *) gnp;
@@ -420 +438 @@
 
 int
-Targ_PrintCmd (void *cmd, void *dummy __unused)
+Targ_PrintCmd (cmd, dummy)
+    ClientData cmd;
+    ClientData dummy;
 {
     printf ("\t%s\n", (char *) cmd);
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
@@ -441 +461 @@
  */
 char *
-Targ_FmtTime (time_t modtime)
+Targ_FmtTime (time)
+    time_t    time;
 {
     struct tm           *parts;
     static char         buf[128];
 
-    parts = localtime(&modtime);
-
-    strftime(buf, sizeof buf, "%H:%M:%S %b %d, %Y", parts);
+    parts = localtime(&time);
+
+    strftime(buf, sizeof buf, "%k:%M:%S %b %d, %Y", parts);
     buf[sizeof(buf) - 1] = '\0';
     return(buf);
@@ -466 +487 @@
  */
 void
-Targ_PrintType (int type)
-{
-    int    tbit;
-
-#define PRINTBIT(attr)  case CONCAT(OP_,attr): printf("." #attr " "); break
-#define PRINTDBIT(attr) case CONCAT(OP_,attr): DEBUGF(TARG, ("." #attr " ")); break
+Targ_PrintType (type)
+    register int    type;
+{
+    register int    tbit;
+
+#ifdef __STDC__
+#define PRINTBIT(attr)  case CONCAT(OP_,attr): printf("." #attr " "); break
+#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG)) printf("." #attr " "); break
+#else
+#define PRINTBIT(attr)  case CONCAT(OP_,attr): printf(".attr "); break
+#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG)) printf(".attr "); break
+#endif /* __STDC__ */
 
     type &= ~OP_OPMASK;
@@ -492 +519 @@
             PRINTDBIT(LIB);
             /*XXX: MEMBER is defined, so CONCAT(OP_,MEMBER) gives OP_"%" */
-            case OP_MEMBER: DEBUGF(TARG, (".MEMBER ")); break;
+            case OP_MEMBER: if (DEBUG(TARG)) printf(".MEMBER "); break;
             PRINTDBIT(ARCHV);
         }
@@ -505 +532 @@
  */
 static int
-TargPrintNode (void *gnp, void *passp)
+TargPrintNode (gnp, passp)
+    ClientData   gnp;
+    ClientData   passp;
 {
     GNode         *gn = (GNode *) gnp;
@@ -540 +569 @@
             if (!Lst_IsEmpty (gn->iParents)) {
                 printf("# implicit parents: ");
-                Lst_ForEach (gn->iParents, TargPrintName, (void *)0);
+                Lst_ForEach (gn->iParents, TargPrintName, (ClientData)0);
                 fputc ('\n', stdout);
             }
@@ -546 +575 @@
         if (!Lst_IsEmpty (gn->parents)) {
             printf("# parents: ");
-            Lst_ForEach (gn->parents, TargPrintName, (void *)0);
+            Lst_ForEach (gn->parents, TargPrintName, (ClientData)0);
             fputc ('\n', stdout);
         }
@@ -558 +587 @@
             case OP_DOUBLEDEP:
                 printf(":: "); break;
-            default:
-                break;
         }
         Targ_PrintType (gn->type);
-        Lst_ForEach (gn->children, TargPrintName, (void *)0);
+        Lst_ForEach (gn->children, TargPrintName, (ClientData)0);
         fputc ('\n', stdout);
-        Lst_ForEach (gn->commands, Targ_PrintCmd, (void *)0);
+        Lst_ForEach (gn->commands, Targ_PrintCmd, (ClientData)0);
         printf("\n\n");
         if (gn->type & OP_DOUBLEDEP) {
-            Lst_ForEach (gn->cohorts, TargPrintNode, (void *)&pass);
+            Lst_ForEach (gn->cohorts, TargPrintNode, (ClientData)&pass);
         }
     }
@@ -582 +609 @@
  *
  * Side Effects:
- *      The name of each file is printed preceded by #\t
+ *      The name of each file is printed preceeded by #\t
  *
  *-----------------------------------------------------------------------
  */
 static int
-TargPrintOnlySrc(void *gnp, void *dummy __unused)
+TargPrintOnlySrc(gnp, dummy)
+    ClientData    gnp;
+    ClientData    dummy;
 {
     GNode         *gn = (GNode *) gnp;
@@ -593 +622 @@
         printf("#\t%s [%s]\n", gn->name, gn->path ? gn->path : gn->name);
 
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
@@ -599 +628 @@
  *-----------------------------------------------------------------------
  * Targ_PrintGraph --
- *      Print the entire graph.
+ *      print the entire graph. heh heh
  *
  * Results:
@@ -609 +638 @@
  */
 void
-Targ_PrintGraph (int pass)
+Targ_PrintGraph (pass)
+    int     pass;       /* Which pass this is. 1 => no processing
+                         * 2 => processing done */
 {
     printf("#*** Input graph:\n");
-    Lst_ForEach (allTargets, TargPrintNode, (void *)&pass);
+    Lst_ForEach (allTargets, TargPrintNode, (ClientData)&pass);
     printf("\n\n");
     printf("#\n#   Files that are only sources:\n");
-    Lst_ForEach (allTargets, TargPrintOnlySrc, (void *) 0);
+    Lst_ForEach (allTargets, TargPrintOnlySrc, (ClientData) 0);
     printf("#*** Global Variables:\n");
     Var_Dump (VAR_GLOBAL);

branches/FREEBSD/src/kmk/util.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2002 Juli Mallett.  All rights reserved.
- * 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.
+ * Missing stuff from OS's
+ */
+
+#ifndef lint
+static char rcsid[] = "$FreeBSD: src/usr.bin/make/util.c,v 1.5.2.2 2001/02/13 03:13:58 will Exp $";
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include "make.h"
+
+#if !__STDC__
+# ifndef const
+#  define const
+# endif
+#endif
+
+#ifdef sun
+extern int errno, sys_nerr;
+extern char *sys_errlist[];
+
+char *
+strerror(e)
+    int e;
+{
+    static char buf[100];
+    if (e < 0 || e >= sys_nerr) {
+        sprintf(buf, "Unknown error %d", e);
+        return buf;
+    }
+    else
+        return sys_errlist[e];
+}
+#endif
+
+#ifdef ultrix
+#include <string.h>
+
+/* strdup
  *
- * This code is derived from software contributed to Berkeley by
- * Adam de Boor.
- *
- * 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.
- *
- * @(#)main.c      8.3 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/util.c,v 1.12 2002/10/10 19:27:48 jmallett Exp $");
-
-/*-
- * util.c --
- *      General utilitarian routines for make(1).
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <err.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sysexits.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-#include "make.h"
-#include "hash.h"
-#include "dir.h"
-#include "job.h"
-#include "pathnames.h"
-
-/*-
- * Debug --
- *      Print a debugging message given its format.
- *
- * Results:
- *      None.
- *
- * Side Effects:
- *      The message is printed.
- */
-/* VARARGS */
-void
-Debug(const char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        (void)vfprintf(stderr, fmt, ap);
-        va_end(ap);
-        (void)fflush(stderr);
-}
-
-/*-
- * Error --
- *      Print an error message given its format.
- *
- * Results:
- *      None.
- *
- * Side Effects:
- *      The message is printed.
- */
-/* VARARGS */
-void
-Error(const char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        (void)vfprintf(stderr, fmt, ap);
-        va_end(ap);
-        (void)fprintf(stderr, "\n");
-        (void)fflush(stderr);
-}
-
-/*-
- * Fatal --
- *      Produce a Fatal error message. If jobs are running, waits for them
- *      to finish.
- *
- * Results:
- *      None
- *
- * Side Effects:
- *      The program exits
- */
-/* VARARGS */
-void
-Fatal(const char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        if (jobsRunning)
-                Job_Wait();
-
-        (void)vfprintf(stderr, fmt, ap);
-        va_end(ap);
-        (void)fprintf(stderr, "\n");
-        (void)fflush(stderr);
-
-        if (DEBUG(GRAPH2))
-                Targ_PrintGraph(2);
-        exit(2);                /* Not 1 so -q can distinguish error */
-}
-
-/*
- * Punt --
- *      Major exception once jobs are being created. Kills all jobs, prints
- *      a message and exits.
- *
- * Results:
- *      None
- *
- * Side Effects:
- *      All children are killed indiscriminately and the program Lib_Exits
- */
-/* VARARGS */
-void
-Punt(const char *fmt, ...)
-{
-        va_list ap;
-
-        va_start(ap, fmt);
-        (void)fprintf(stderr, "make: ");
-        (void)vfprintf(stderr, fmt, ap);
-        va_end(ap);
-        (void)fprintf(stderr, "\n");
-        (void)fflush(stderr);
-
-        DieHorribly();
-}
-
-/*-
- * DieHorribly --
- *      Exit without giving a message.
- *
- * Results:
- *      None
- *
- * Side Effects:
- *      A big one...
- */
-void
-DieHorribly(void)
-{
-        if (jobsRunning)
-                Job_AbortAll();
-        if (DEBUG(GRAPH2))
-                Targ_PrintGraph(2);
-        exit(2);                /* Not 1, so -q can distinguish error */
-}
-
-/*
- * Finish --
- *      Called when aborting due to errors in child shell to signal
- *      abnormal exit, with the number of errors encountered in Make_Make.
- *
- * Results:
- *      None
- *
- * Side Effects:
- *      The program exits
- */
-void
-Finish(int errors)
-{
-        Fatal("%d error%s", errors, errors == 1 ? "" : "s");
-}
-
-/*
- * emalloc --
- *      malloc, but die on error.
- */
-void *
-emalloc(size_t len)
-{
-        void *p;
-
-        if ((p = malloc(len)) == NULL)
-                enomem();
-        return(p);
-}
-
-/*
- * estrdup --
- *      strdup, but die on error.
+ * Make a duplicate of a string.
+ * For systems which lack this function.
  */
 char *
-estrdup(const char *str)
-{
-        char *p;
-
-        if ((p = strdup(str)) == NULL)
-                enomem();
-        return(p);
-}
-
-/*
- * erealloc --
- *      realloc, but die on error.
+strdup(str)
+    const char *str;
+{
+    size_t len;
+
+    if (str == NULL)
+        return NULL;
+    len = strlen(str) + 1;
+    if ((p = malloc(len)) == NULL)
+        return NULL;
+
+    return memcpy(p, str, len);
+}
+
+#endif
+
+#if defined(sun) || defined(__hpux) || defined(__sgi)
+
+int
+setenv(name, value, dum)
+    const char *name;
+    const char *value;
+    int dum;
+{
+    register char *p;
+    int len = strlen(name) + strlen(value) + 2; /* = \0 */
+    char *ptr = (char*) malloc(len);
+
+    (void) dum;
+
+    if (ptr == NULL)
+        return -1;
+
+    p = ptr;
+
+    while (*name)
+        *p++ = *name++;
+
+    *p++ = '=';
+
+    while (*value)
+        *p++ = *value++;
+
+    *p = '\0';
+
+    len = putenv(ptr);
+/*    free(ptr); */
+    return len;
+}
+#endif
+
+#ifdef __hpux
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/syscall.h>
+#include <sys/signal.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+
+int
+killpg(pid, sig)
+    int pid, sig;
+{
+    return kill(-pid, sig);
+}
+
+void
+srandom(seed)
+    long seed;
+{
+    srand48(seed);
+}
+
+long
+random()
+{
+    return lrand48();
+}
+
+/* turn into bsd signals */
+void (*
+signal(s, a)) ()
+    int     s;
+    void (*a)();
+{
+    struct sigvec osv, sv;
+
+    (void) sigvector(s, (struct sigvec *) 0, &osv);
+    sv = osv;
+    sv.sv_handler = a;
+#ifdef SV_BSDSIG
+    sv.sv_flags = SV_BSDSIG;
+#endif
+
+    if (sigvector(s, &sv, (struct sigvec *) 0) == -1)
+        return (BADSIG);
+    return (osv.sv_handler);
+}
+
+#if !defined(BSD) && !defined(d_fileno)
+# define d_fileno d_ino
+#endif
+
+#ifndef DEV_DEV_COMPARE
+# define DEV_DEV_COMPARE(a, b) ((a) == (b))
+#endif
+
+/* strrcpy():
+ *      Like strcpy, going backwards and returning the new pointer
  */
-void *
-erealloc(void *ptr, size_t size)
-{
-        if ((ptr = realloc(ptr, size)) == NULL)
-                enomem();
-        return(ptr);
-}
-
-/*
- * enomem --
- *      die when out of memory.
- */
-void
-enomem(void)
-{
-        err(2, NULL);
-}
-
-/*
- * enunlink --
- *      Remove a file carefully, avoiding directories.
- */
+static char *
+strrcpy(ptr, str)
+    register char *ptr, *str;
+{
+    register int len = strlen(str);
+
+    while (len)
+        *--ptr = str[--len];
+
+    return (ptr);
+} /* end strrcpy */
+
+
+char   *
+getwd(pathname)
+    char   *pathname;
+{
+    DIR    *dp;
+    struct dirent *d;
+
+    struct stat st_root, st_cur, st_next, st_dotdot;
+    char    pathbuf[MAXPATHLEN], nextpathbuf[MAXPATHLEN * 2];
+    char   *pathptr, *nextpathptr, *cur_name_add;
+
+    /* find the inode of root */
+    if (stat("/", &st_root) == -1) {
+        (void) sprintf(pathname,
+                        "getwd: Cannot stat \"/\" (%s)", strerror(errno));
+        return (NULL);
+    }
+    pathbuf[MAXPATHLEN - 1] = '\0';
+    pathptr = &pathbuf[MAXPATHLEN - 1];
+    nextpathbuf[MAXPATHLEN - 1] = '\0';
+    cur_name_add = nextpathptr = &nextpathbuf[MAXPATHLEN - 1];
+
+    /* find the inode of the current directory */
+    if (lstat(".", &st_cur) == -1) {
+        (void) sprintf(pathname,
+                        "getwd: Cannot stat \".\" (%s)", strerror(errno));
+        return (NULL);
+    }
+    nextpathptr = strrcpy(nextpathptr, "../");
+
+    /* Descend to root */
+    for (;;) {
+
+        /* look if we found root yet */
+        if (st_cur.st_ino == st_root.st_ino &&
+            DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
+            (void) strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
+            return (pathname);
+        }
+
+        /* open the parent directory */
+        if (stat(nextpathptr, &st_dotdot) == -1) {
+            snprintf(pathname, sizeof(pathname),
+                            "getwd: Cannot stat directory \"%s\" (%s)",
+                            nextpathptr, strerror(errno));
+            return (NULL);
+        }
+        if ((dp = opendir(nextpathptr)) == NULL) {
+             snprintf(pathname, sizeof(pathname),
+                            "getwd: Cannot open directory \"%s\" (%s)",
+                            nextpathptr, strerror(errno));
+            return (NULL);
+        }
+
+        /* look in the parent for the entry with the same inode */
+        if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) {
+            /* Parent has same device. No need to stat every member */
+            for (d = readdir(dp); d != NULL; d = readdir(dp))
+                if (d->d_fileno == st_cur.st_ino)
+                    break;
+        }
+        else {
+            /*
+             * Parent has a different device. This is a mount point so we
+             * need to stat every member
+             */
+            for (d = readdir(dp); d != NULL; d = readdir(dp)) {
+                if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
+                    continue;
+                (void) strcpy(cur_name_add, d->d_name);
+                if (lstat(nextpathptr, &st_next) == -1) {
+                    snprintf(pathname, sizeof(pathname), "getwd: Cannot stat \"%s\" (%s)",
+                                    d->d_name, strerror(errno));
+                    (void) closedir(dp);
+                    return (NULL);
+                }
+                /* check if we found it yet */
+                if (st_next.st_ino == st_cur.st_ino &&
+                    DEV_DEV_COMPARE(st_next.st_dev, st_cur.st_dev))
+                    break;
+            }
+        }
+        if (d == NULL) {
+            (void) sprintf(pathname, "getwd: Cannot find \".\" in \"..\"");
+            (void) closedir(dp);
+            return (NULL);
+        }
+        st_cur = st_dotdot;
+        pathptr = strrcpy(pathptr, d->d_name);
+        pathptr = strrcpy(pathptr, "/");
+        nextpathptr = strrcpy(nextpathptr, "../");
+        (void) closedir(dp);
+        *cur_name_add = '\0';
+    }
+} /* end getwd */
+
+
+char    *sys_siglist[] = {
+        "Signal 0",
+        "Hangup",                       /* SIGHUP    */
+        "Interrupt",                    /* SIGINT    */
+        "Quit",                         /* SIGQUIT   */
+        "Illegal instruction",          /* SIGILL    */
+        "Trace/BPT trap",               /* SIGTRAP   */
+        "IOT trap",                     /* SIGIOT    */
+        "EMT trap",                     /* SIGEMT    */
+        "Floating point exception",     /* SIGFPE    */
+        "Killed",                       /* SIGKILL   */
+        "Bus error",                    /* SIGBUS    */
+        "Segmentation fault",           /* SIGSEGV   */
+        "Bad system call",              /* SIGSYS    */
+        "Broken pipe",                  /* SIGPIPE   */
+        "Alarm clock",                  /* SIGALRM   */
+        "Terminated",                   /* SIGTERM   */
+        "User defined signal 1",        /* SIGUSR1   */
+        "User defined signal 2",        /* SIGUSR2   */
+        "Child exited",                 /* SIGCLD    */
+        "Power-fail restart",           /* SIGPWR    */
+        "Virtual timer expired",        /* SIGVTALRM */
+        "Profiling timer expired",      /* SIGPROF   */
+        "I/O possible",                 /* SIGIO     */
+        "Window size changes",          /* SIGWINDOW */
+        "Stopped (signal)",             /* SIGSTOP   */
+        "Stopped",                      /* SIGTSTP   */
+        "Continued",                    /* SIGCONT   */
+        "Stopped (tty input)",          /* SIGTTIN   */
+        "Stopped (tty output)",         /* SIGTTOU   */
+        "Urgent I/O condition",         /* SIGURG    */
+        "Remote lock lost (NFS)",       /* SIGLOST   */
+        "Signal 31",                    /* reserved  */
+        "DIL signal"                    /* SIGDIL    */
+};
+
 int
-eunlink(const char *file)
-{
-        struct stat st;
-
-        if (lstat(file, &st) == -1)
-                return -1;
-
-        if (S_ISDIR(st.st_mode)) {
-                errno = EISDIR;
-                return -1;
-        }
-        return unlink(file);
-}
-
-/*
- * Printaddr --
- *      Print the address of a node, used as an interative function.
- */
-int
-PrintAddr(void *a, void *b __unused)
-{
-    printf("%p ", a);
-    return 0;
-}
+utimes(file, tvp)
+    char *file;
+    struct timeval tvp[2];
+{
+    struct utimbuf t;
+
+    t.actime  = tvp[0].tv_sec;
+    t.modtime = tvp[1].tv_sec;
+    return(utime(file, &t));
+}
+
+
+#endif /* __hpux */
+
+#if defined(sun) && defined(__svr4__)
+#include <signal.h>
+
+/* turn into bsd signals */
+void (*
+signal(s, a)) ()
+    int     s;
+    void (*a)();
+{
+    struct sigaction sa, osa;
+
+    sa.sa_handler = a;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = SA_RESTART;
+
+    if (sigaction(s, &sa, &osa) == -1)
+        return SIG_ERR;
+    else
+        return osa.sa_handler;
+}
+
+#endif

branches/FREEBSD/src/kmk/var.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)var.c    8.3 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/var.c,v 1.35 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)var.c       8.3 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/var.c,v 1.16.2.3 2002/02/27 14:18:57 cjc Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -126 +130 @@
 static Lst      allVars;      /* List of all variables */
 
-#define FIND_CMD        0x1   /* look in VAR_CMD when searching */
-#define FIND_GLOBAL     0x2   /* look in VAR_GLOBAL as well */
-#define FIND_ENV        0x4   /* look in the environment also */
+#define FIND_CMD        0x1   /* look in VAR_CMD when searching */
+#define FIND_GLOBAL     0x2   /* look in VAR_GLOBAL as well */
+#define FIND_ENV        0x4   /* look in the environment also */
 
 typedef struct Var {
@@ -134 +138 @@
     Buffer        val;          /* its value */
     int           flags;        /* miscellaneous status flags */
-#define VAR_IN_USE      1           /* Variable's value currently being used.
+#define VAR_IN_USE      1           /* Variable's value currently being used.
                                      * Used to avoid recursion */
-#define VAR_FROM_ENV    2           /* Variable comes from the environment */
-#define VAR_JUNK        4           /* Variable is a junk variable that
+#define VAR_FROM_ENV    2           /* Variable comes from the environment */
+#define VAR_JUNK        4           /* Variable is a junk variable that
                                      * should be destroyed when done with
                                      * it. Used by Var_Parse for undefined,
@@ -144 +148 @@
 
 /* Var*Pattern flags */
-#define VAR_SUB_GLOBAL  0x01    /* Apply substitution globally */
-#define VAR_SUB_ONE     0x02    /* Apply substitution to one word */
-#define VAR_SUB_MATCHED 0x04    /* There was a match */
-#define VAR_MATCH_START 0x08    /* Match at start of word */
-#define VAR_MATCH_END   0x10    /* Match at end of word */
-#define VAR_NOSUBST     0x20    /* don't expand vars in VarGetPattern */
+#define VAR_SUB_GLOBAL  0x01    /* Apply substitution globally */
+#define VAR_SUB_ONE     0x02    /* Apply substitution to one word */
+#define VAR_SUB_MATCHED 0x04    /* There was a match */
+#define VAR_MATCH_START 0x08    /* Match at start of word */
+#define VAR_MATCH_END   0x10    /* Match at end of word */
+#define VAR_NOSUBST     0x20    /* don't expand vars in VarGetPattern */
 
 typedef struct {
@@ -167 +171 @@
 } VarREPattern;
 
-static int VarCmp(void *, void *);
-static void VarPossiblyExpand(char **, GNode *);
-static Var *VarFind(char *, GNode *, int);
-static void VarAdd(char *, char *, GNode *);
-static void VarDelete(void *);
-static Boolean VarHead(char *, Boolean, Buffer, void *);
-static Boolean VarTail(char *, Boolean, Buffer, void *);
-static Boolean VarSuffix(char *, Boolean, Buffer, void *);
-static Boolean VarRoot(char *, Boolean, Buffer, void *);
-static Boolean VarMatch(char *, Boolean, Buffer, void *);
+static int VarCmp __P((ClientData, ClientData));
+static Var *VarFind __P((char *, GNode *, int));
+static void VarAdd __P((char *, char *, GNode *));
+static void VarDelete __P((ClientData));
+static Boolean VarHead __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarTail __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarSuffix __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarRoot __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarMatch __P((char *, Boolean, Buffer, ClientData));
 #ifdef SYSVVARSUB
-static Boolean VarSYSVMatch(char *, Boolean, Buffer, void *);
+static Boolean VarSYSVMatch __P((char *, Boolean, Buffer, ClientData));
 #endif
-static Boolean VarNoMatch(char *, Boolean, Buffer, void *);
-static void VarREError(int, regex_t *, const char *);
-static Boolean VarRESubstitute(char *, Boolean, Buffer, void *);
-static Boolean VarSubstitute(char *, Boolean, Buffer, void *);
-static char *VarGetPattern(GNode *, int, char **, int, int *, int *, 
-                           VarPattern *);
-static char *VarQuote(char *);
-static char *VarModify(char *, Boolean (*)(char *, Boolean, Buffer, void *),
-                       void *);
-static int VarPrintVar(void *, void *);
+static Boolean VarNoMatch __P((char *, Boolean, Buffer, ClientData));
+static void VarREError __P((int, regex_t *, const char *));
+static Boolean VarRESubstitute __P((char *, Boolean, Buffer, ClientData));
+static Boolean VarSubstitute __P((char *, Boolean, Buffer, ClientData));
+static char *VarGetPattern __P((GNode *, int, char **, int, int *, int *,
+                                VarPattern *));
+static char *VarQuote __P((char *));
+static char *VarModify __P((char *, Boolean (*)(char *, Boolean, Buffer,
+                                                ClientData),
+                            ClientData));
+static int VarPrintVar __P((ClientData, ClientData));
 
 /*-
@@ -205 +209 @@
  */
 static int
-VarCmp (void *v, void *name)
+VarCmp (v, name)
+    ClientData     v;           /* VAR structure to compare */
+    ClientData     name;        /* name to look for */
 {
     return (strcmp ((char *) name, ((Var *) v)->name));
-}
-
-/*-
- *-----------------------------------------------------------------------
- * VarPossiblyExpand --
- *      Expand a variable name's embedded variables in the given context.
- *
- * Results:
- *      The contents of name, possibly expanded.
- *
- * Side Effects:
- *      The caller must free the new contents or old contents of name.
- *-----------------------------------------------------------------------
- */
-static void
-VarPossiblyExpand(char **name, GNode *ctxt)
-{
-    if (strchr(*name, '$') != NULL)
-        *name = Var_Subst(NULL, *name, ctxt, 0);
-    else
-        *name = estrdup(*name);
 }
 
@@ -237 +222 @@
  *      indicated.
  *
- *      Flags:
- *              FIND_GLOBAL     set means look in the VAR_GLOBAL context too
- *              FIND_CMD        set means to look in the VAR_CMD context too
- *              FIND_ENV        set means to look in the environment
- *
  * Results:
  *      A pointer to the structure describing the desired variable or
- *      NULL if the variable does not exist.
+ *      NIL if the variable does not exist.
  *
  * Side Effects:
@@ -251 +231 @@
  */
 static Var *
-VarFind (char *name, GNode *ctxt, int flags)
+VarFind (name, ctxt, flags)
+    char                *name;  /* name to find */
+    GNode               *ctxt;  /* context in which to find it */
+    int                 flags;  /* FIND_GLOBAL set means to look in the
+                                 * VAR_GLOBAL context as well.
+                                 * FIND_CMD set means to look in the VAR_CMD
+                                 * context also.
+                                 * FIND_ENV set means to look in the
+                                 * environment */
 {
     Boolean             localCheckEnvFirst;
@@ -297 +285 @@
      * the -E flag to use environment-variable-override for.
      */
-    if (Lst_Find (envFirstVars, (void *)name,
-                  (int (*)(void *, void *)) strcmp) != NULL)
+    if (Lst_Find (envFirstVars, (ClientData)name,
+                  (int (*)(ClientData, ClientData)) strcmp) != NILLNODE)
     {
         localCheckEnvFirst = TRUE;
@@ -310 +298 @@
      * depending on the FIND_* flags in 'flags'
      */
-    var = Lst_Find (ctxt->context, (void *)name, VarCmp);
-
-    if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD)) {
-        var = Lst_Find (VAR_CMD->context, (void *)name, VarCmp);
-    }
-    if ((var == NULL) && (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL) &&
+    var = Lst_Find (ctxt->context, (ClientData)name, VarCmp);
+
+    if ((var == NILLNODE) && (flags & FIND_CMD) && (ctxt != VAR_CMD)) {
+        var = Lst_Find (VAR_CMD->context, (ClientData)name, VarCmp);
+    }
+    if ((var == NILLNODE) && (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL) &&
         !checkEnvFirst && !localCheckEnvFirst)
     {
-        var = Lst_Find (VAR_GLOBAL->context, (void *)name, VarCmp);
-    }
-    if ((var == NULL) && (flags & FIND_ENV)) {
+        var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);
+    }
+    if ((var == NILLNODE) && (flags & FIND_ENV)) {
         char *env;
 
@@ -339 +327 @@
                    (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL))
         {
-            var = Lst_Find (VAR_GLOBAL->context, (void *)name, VarCmp);
-            if (var == NULL) {
-                return ((Var *) NULL);
+            var = Lst_Find (VAR_GLOBAL->context, (ClientData)name, VarCmp);
+            if (var == NILLNODE) {
+                return ((Var *) NIL);
             } else {
                 return ((Var *)Lst_Datum(var));
             }
         } else {
-            return((Var *)NULL);
+            return((Var *)NIL);
         }
-    } else if (var == NULL) {
-        return ((Var *) NULL);
+    } else if (var == NILLNODE) {
+        return ((Var *) NIL);
     } else {
         return ((Var *) Lst_Datum (var));
@@ -358 +346 @@
  *-----------------------------------------------------------------------
  * VarAdd  --
- *      Add a new variable of name name and value val to the given context.
+ *      Add a new variable of name name and value val to the given context
  *
  * Results:
@@ -370 +358 @@
  */
 static void
-VarAdd (char *name, char *val, GNode *ctxt)
-{
-    Var           *v;
+VarAdd (name, val, ctxt)
+    char           *name;       /* name of variable to add */
+    char           *val;        /* value to set it to */
+    GNode          *ctxt;       /* context in which to set it */
+{
+    register Var   *v;
     int           len;
 
@@ -385 +376 @@
     v->flags = 0;
 
-    (void) Lst_AtFront (ctxt->context, (void *)v);
-    (void) Lst_AtEnd (allVars, (void *) v);
-    DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, val));
+    (void) Lst_AtFront (ctxt->context, (ClientData)v);
+    (void) Lst_AtEnd (allVars, (ClientData) v);
+    if (DEBUG(VAR)) {
+        printf("%s:%s = %s\n", ctxt->name, name, val);
+    }
 }
 
@@ -404 +397 @@
  */
 static void
-VarDelete(void *vp)
+VarDelete(vp)
+    ClientData vp;
 {
     Var *v = (Var *) vp;
     free(v->name);
     Buf_Destroy(v->val, TRUE);
-    free(v);
+    free((Address) v);
 }
 
@@ -428 +422 @@
  */
 void
-Var_Delete(char *name, GNode *ctxt)
+Var_Delete(name, ctxt)
+    char          *name;
+    GNode         *ctxt;
 {
     LstNode       ln;
 
-    DEBUGF(VAR, ("%s:delete %s\n", ctxt->name, name));
-    ln = Lst_Find(ctxt->context, (void *)name, VarCmp);
-    if (ln != NULL) {
-        Var       *v;
+    if (DEBUG(VAR)) {
+        printf("%s:delete %s\n", ctxt->name, name);
+    }
+    ln = Lst_Find(ctxt->context, (ClientData)name, VarCmp);
+    if (ln != NILLNODE) {
+        register Var      *v;
 
         v = (Var *)Lst_Datum(ln);
@@ -441 +439 @@
         ln = Lst_Member(allVars, v);
         Lst_Remove(allVars, ln);
-        VarDelete((void *) v);
+        VarDelete((ClientData) v);
     }
 }
@@ -467 +465 @@
  */
 void
-Var_Set (char *name, char *val, GNode *ctxt)
-{
-    Var            *v;
+Var_Set (name, val, ctxt)
+    char           *name;       /* name of variable to set */
+    char           *val;        /* value to give to the variable */
+    GNode          *ctxt;       /* context in which to set it */
+{
+    register Var   *v;
 
     /*
@@ -476 +477 @@
      * point in searching them all just to save a bit of memory...
      */
-    VarPossiblyExpand(&name, ctxt);
     v = VarFind (name, ctxt, 0);
-    if (v == (Var *) NULL) {
+    if (v == (Var *) NIL) {
         VarAdd (name, val, ctxt);
     } else {
@@ -484 +484 @@
         Buf_AddBytes(v->val, strlen(val), (Byte *)val);
 
-        DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, val));
+        if (DEBUG(VAR)) {
+            printf("%s:%s = %s\n", ctxt->name, name, val);
+        }
     }
     /*
@@ -493 +495 @@
         setenv(name, val, 1);
     }
-    free(name);
 }
 
@@ -519 +520 @@
  */
 void
-Var_Append (char *name, char *val, GNode *ctxt)
-{
-    Var            *v;
-
-    VarPossiblyExpand(&name, ctxt);
+Var_Append (name, val, ctxt)
+    char           *name;       /* Name of variable to modify */
+    char           *val;        /* String to append to it */
+    GNode          *ctxt;       /* Context in which this should occur */
+{
+    register Var   *v;
+
     v = VarFind (name, ctxt, (ctxt == VAR_GLOBAL) ? FIND_ENV : 0);
 
-    if (v == (Var *) NULL) {
+    if (v == (Var *) NIL) {
         VarAdd (name, val, ctxt);
     } else {
@@ -532 +535 @@
         Buf_AddBytes(v->val, strlen(val), (Byte *)val);
 
-        DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, 
-               (char *) Buf_GetAll(v->val, (int *)NULL)));
+        if (DEBUG(VAR)) {
+            printf("%s:%s = %s\n", ctxt->name, name,
+                   (char *) Buf_GetAll(v->val, (int *)NULL));
+        }
 
         if (v->flags & VAR_FROM_ENV) {
@@ -543 +548 @@
              */
             v->flags &= ~VAR_FROM_ENV;
-            Lst_AtFront(ctxt->context, (void *)v);
+            Lst_AtFront(ctxt->context, (ClientData)v);
         }
     }
-    free(name);
 }
 
@@ -563 +567 @@
  */
 Boolean
-Var_Exists(char *name, GNode *ctxt)
+Var_Exists(name, ctxt)
+    char          *name;        /* Variable to find */
+    GNode         *ctxt;        /* Context in which to start search */
 {
     Var           *v;
 
-    VarPossiblyExpand(&name, ctxt);
     v = VarFind(name, ctxt, FIND_CMD|FIND_GLOBAL|FIND_ENV);
-    free(name);
-
-    if (v == (Var *)NULL) {
+
+    if (v == (Var *)NIL) {
         return(FALSE);
     } else if (v->flags & VAR_FROM_ENV) {
@@ -594 +598 @@
  */
 char *
-Var_Value (char *name, GNode *ctxt, char **frp)
+Var_Value (name, ctxt, frp)
+    char           *name;       /* name to find */
+    GNode          *ctxt;       /* context in which to search for it */
+    char           **frp;
 {
     Var            *v;
 
-    VarPossiblyExpand(&name, ctxt);
     v = VarFind (name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-    free(name);
     *frp = NULL;
-    if (v != (Var *) NULL) {
+    if (v != (Var *) NIL) {
         char *p = ((char *)Buf_GetAll(v->val, (int *)NULL));
         if (v->flags & VAR_FROM_ENV) {
             Buf_Destroy(v->val, FALSE);
-            free(v);
+            free((Address) v);
             *frp = p;
         }
@@ -631 +636 @@
  */
 static Boolean
-VarHead (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *slash;
+VarHead (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* True if need to add a space to the buffer
+                                 * before sticking in the head */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *slash;
 
     slash = strrchr (word, '/');
@@ -654 +664 @@
         }
     }
-    return (TRUE);
+    return(dummy ? TRUE : TRUE);
 }
 
@@ -673 +683 @@
  */
 static Boolean
-VarTail (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *slash;
+VarTail (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to stick a space in the
+                                 * buffer before adding the tail */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *slash;
 
     if (addSpace) {
@@ -689 +704 @@
         Buf_AddBytes (buf, strlen(word), (Byte *)word);
     }
-    return (TRUE);
+    return (dummy ? TRUE : TRUE);
 }
 
@@ -707 +722 @@
  */
 static Boolean
-VarSuffix (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *dot;
+VarSuffix (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to add a space before placing
+                                 * the suffix in the buffer */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *dot;
 
     dot = strrchr (word, '.');
@@ -721 +741 @@
         addSpace = TRUE;
     }
-    return (addSpace);
+    return (dummy ? addSpace : addSpace);
 }
 
@@ -740 +760 @@
  */
 static Boolean
-VarRoot (char *word, Boolean addSpace, Buffer buf, void *dummy __unused)
-{
-    char *dot;
+VarRoot (word, addSpace, buf, dummy)
+    char          *word;        /* Word to trim */
+    Boolean       addSpace;     /* TRUE if need to add a space to the buffer
+                                 * before placing the root in it */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    dummy;
+{
+    register char *dot;
 
     if (addSpace) {
@@ -756 +781 @@
         Buf_AddBytes (buf, strlen(word), (Byte *)word);
     }
-    return (TRUE);
+    return (dummy ? TRUE : TRUE);
 }
 
@@ -764 +789 @@
  *      Place the word in the buffer if it matches the given pattern.
  *      Callback function for VarModify to implement the :M modifier.
- *      A space will be added if requested.  A pattern is supplied
- *      which the word must match.
  *
  * Results:
@@ -777 +800 @@
  */
 static Boolean
-VarMatch (char *word, Boolean addSpace, Buffer buf, void *pattern)
+VarMatch (word, addSpace, buf, pattern)
+    char          *word;        /* Word to examine */
+    Boolean       addSpace;     /* TRUE if need to add a space to the
+                                 * buffer before adding the word, if it
+                                 * matches */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    pattern;      /* Pattern the word must match */
 {
     if (Str_Match(word, (char *) pattern)) {
@@ -795 +824 @@
  *      Place the word in the buffer if it matches the given pattern.
  *      Callback function for VarModify to implement the System V %
- *      modifiers.  A space is added if requested.
+ *      modifiers.
  *
  * Results:
@@ -807 +836 @@
  */
 static Boolean
-VarSYSVMatch (char *word, Boolean addSpace, Buffer buf, void *patp)
+VarSYSVMatch (word, addSpace, buf, patp)
+    char          *word;        /* Word to examine */
+    Boolean       addSpace;     /* TRUE if need to add a space to the
+                                 * buffer before adding the word, if it
+                                 * matches */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    patp;         /* Pattern the word must match */
 {
     int len;
@@ -832 +867 @@
  * VarNoMatch --
  *      Place the word in the buffer if it doesn't match the given pattern.
- *      Callback function for VarModify to implement the :N modifier.  A
- *      space is added if requested.
+ *      Callback function for VarModify to implement the :N modifier.
  *
  * Results:
@@ -845 +879 @@
  */
 static Boolean
-VarNoMatch (char *word, Boolean addSpace, Buffer buf, void *pattern)
+VarNoMatch (word, addSpace, buf, pattern)
+    char          *word;        /* Word to examine */
+    Boolean       addSpace;     /* TRUE if need to add a space to the
+                                 * buffer before adding the word, if it
+                                 * matches */
+    Buffer        buf;          /* Buffer in which to store it */
+    ClientData    pattern;      /* Pattern the word must match */
 {
     if (!Str_Match(word, (char *) pattern)) {
@@ -862 +902 @@
  * VarSubstitute --
  *      Perform a string-substitution on the given word, placing the
- *      result in the passed buffer.  A space is added if requested.
+ *      result in the passed buffer.
  *
  * Results:
@@ -873 +913 @@
  */
 static Boolean
-VarSubstitute (char *word, Boolean addSpace, Buffer buf, void *patternp)
-{
-    int                 wordLen;    /* Length of word */
-    char                *cp;        /* General pointer */
+VarSubstitute (word, addSpace, buf, patternp)
+    char                *word;      /* Word to modify */
+    Boolean             addSpace;   /* True if space should be added before
+                                     * other characters */
+    Buffer              buf;        /* Buffer for result */
+    ClientData          patternp;   /* Pattern for substitution */
+{
+    register int        wordLen;    /* Length of word */
+    register char       *cp;        /* General pointer */
     VarPattern  *pattern = (VarPattern *) patternp;
 
@@ -971 +1016 @@
              * buffer.
              */
-            Boolean done;
+            register Boolean done;
             int origSize;
 
@@ -1035 +1080 @@
  */
 static void
-VarREError(int err, regex_t *pat, const char *str)
+VarREError(err, pat, str)
+    int err;
+    regex_t *pat;
+    const char *str;
 {
     char *errbuf;
@@ -1052 +1100 @@
  * VarRESubstitute --
  *      Perform a regex substitution on the given word, placing the
- *      result in the passed buffer.  A space is added if requested.
+ *      result in the passed buffer.
  *
  * Results:
@@ -1063 +1111 @@
  */
 static Boolean
-VarRESubstitute(char *word, Boolean addSpace, Buffer buf, void *patternp)
+VarRESubstitute(word, addSpace, buf, patternp)
+    char *word;
+    Boolean addSpace;
+    Buffer buf;
+    ClientData patternp;
 {
     VarREPattern *pat;
@@ -1072 +1124 @@
     int flags = 0;
 
-#define MAYBE_ADD_SPACE()               \
+#define MAYBE_ADD_SPACE()               \
         if (addSpace && !added)         \
             Buf_AddByte(buf, ' ');      \
@@ -1191 +1243 @@
  */
 static char *
-VarModify (char *str, Boolean (*modProc)(char *, Boolean, Buffer, void *),
-    void *datum)
+VarModify (str, modProc, datum)
+    char          *str;             /* String whose words should be trimmed */
+                                    /* Function to use to modify them */
+    Boolean       (*modProc) __P((char *, Boolean, Buffer, ClientData));
+    ClientData    datum;            /* Datum to pass it */
 {
     Buffer        buf;              /* Buffer for the new string */
@@ -1238 +1293 @@
  */
 static char *
-VarGetPattern(GNode *ctxt, int err, char **tstr, int delim, int *flags,
-    int *length, VarPattern *pattern)
+VarGetPattern(ctxt, err, tstr, delim, flags, length, pattern)
+    GNode *ctxt;
+    int err;
+    char **tstr;
+    int delim;
+    int *flags;
+    int *length;
+    VarPattern *pattern;
 {
     char *cp;
@@ -1247 +1308 @@
         length = &junk;
 
-#define IS_A_MATCH(cp, delim) \
+#define IS_A_MATCH(cp, delim) \
     ((cp[0] == '\\') && ((cp[1] == delim) ||  \
      (cp[1] == '\\') || (cp[1] == '$') || (pattern && (cp[1] == '&'))))
@@ -1352 +1413 @@
  */
 static char *
-VarQuote(char *str)
+VarQuote(str)
+        char *str;
 {
 
@@ -1392 +1454 @@
  */
 char *
-Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
-{
-    char            *tstr;      /* Pointer into str */
+Var_Parse (str, ctxt, err, lengthPtr, freePtr)
+    char          *str;         /* The string to parse */
+    GNode         *ctxt;        /* The context for the variable */
+    Boolean         err;        /* TRUE if undefined variables are an error */
+    int             *lengthPtr; /* OUT: The length of the specification */
+    Boolean         *freePtr;   /* OUT: TRUE if caller should free result */
+{
+    register char   *tstr;      /* Pointer into str */
     Var             *v;         /* Variable in invocation */
     char            *cp;        /* Secondary pointer into str (place marker
                                  * for tstr) */
     Boolean         haveModifier;/* TRUE if have modifiers for the variable */
-    char            endc;       /* Ending character when variable in parens
+    register char   endc;       /* Ending character when variable in parens
                                  * or braces */
-    char            startc=0;   /* Starting character when variable in parens
+    register char   startc=0;   /* Starting character when variable in parens
                                  * or braces */
     int             cnt;        /* Used to count brace pairs when variable in
@@ -1430 +1497 @@
 
         v = VarFind (name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-        if (v == (Var *)NULL) {
+        if (v == (Var *)NIL) {
             *lengthPtr = 2;
 
@@ -1453 +1520 @@
                     case '!':
                         return("$(.MEMBER)");
-                    default:
-                        break;
                 }
             }
@@ -1512 +1577 @@
 
         v = VarFind (str, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
-        if ((v == (Var *)NULL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
+        if ((v == (Var *)NIL) && (ctxt != VAR_CMD) && (ctxt != VAR_GLOBAL) &&
             (vlen == 2) && (str[1] == 'F' || str[1] == 'D'))
         {
@@ -1537 +1602 @@
                     v = VarFind(vname, ctxt, 0);
 
-                    if (v != (Var *)NULL && !haveModifier) {
+                    if (v != (Var *)NIL && !haveModifier) {
                         /*
                          * No need for nested expansion or anything, as we're
@@ -1546 +1611 @@
 
                         if (str[1] == 'D') {
-                            val = VarModify(val, VarHead, (void *)0);
+                            val = VarModify(val, VarHead, (ClientData)0);
                         } else {
-                            val = VarModify(val, VarTail, (void *)0);
+                            val = VarModify(val, VarTail, (ClientData)0);
                         }
                         /*
@@ -1561 +1626 @@
                     }
                     break;
-                default:
-                    break;
                 }
             }
         }
 
-        if (v == (Var *)NULL) {
+        if (v == (Var *)NIL) {
             if (((vlen == 1) ||
                  (((vlen == 2) && (str[1] == 'F' ||
@@ -1588 +1651 @@
                     case '!':
                         dynamic = TRUE;
-                        break;
-                    default:
                         break;
                 }
@@ -1693 +1754 @@
             char        termc;      /* Character which terminated scan */
 
-            DEBUGF(VAR, ("Applying :%c to \"%s\"\n", *tstr, str));
+            if (DEBUG(VAR)) {
+                printf("Applying :%c to \"%s\"\n", *tstr, str);
+            }
             switch (*tstr) {
                 case 'U':
@@ -1770 +1833 @@
                     }
                     if (*tstr == 'M' || *tstr == 'm') {
-                        newStr = VarModify(str, VarMatch, (void *)pattern);
+                        newStr = VarModify(str, VarMatch, (ClientData)pattern);
                     } else {
                         newStr = VarModify(str, VarNoMatch,
-                                           (void *)pattern);
+                                           (ClientData)pattern);
                     }
                     if (copy) {
@@ -1783 +1846 @@
                 {
                     VarPattern      pattern;
-                    char            del;
+                    register char   delim;
                     Buffer          buf;        /* Buffer for patterns */
 
                     pattern.flags = 0;
-                    del = tstr[1];
+                    delim = tstr[1];
                     tstr += 2;
 
@@ -1808 +1871 @@
                      * The result is left in the Buffer buf.
                      */
-                    for (cp = tstr; *cp != '\0' && *cp != del; cp++) {
+                    for (cp = tstr; *cp != '\0' && *cp != delim; cp++) {
                         if ((*cp == '\\') &&
-                            ((cp[1] == del) ||
+                            ((cp[1] == delim) ||
                              (cp[1] == '$') ||
                              (cp[1] == '\\')))
@@ -1817 +1880 @@
                             cp++;
                         } else if (*cp == '$') {
-                            if (cp[1] != del) {
+                            if (cp[1] != delim) {
                                 /*
                                  * If unescaped dollar sign not before the
@@ -1851 +1914 @@
                      * return NULL
                      */
-                    if (*cp != del) {
+                    if (*cp != delim) {
                         *lengthPtr = cp - start + 1;
                         if (*freePtr) {
@@ -1858 +1921 @@
                         Buf_Destroy(buf, TRUE);
                         Error("Unclosed substitution for %s (%c missing)",
-                              v->name, del);
+                              v->name, delim);
                         return (var_Error);
                     }
@@ -1883 +1946 @@
 
                     tstr = cp + 1;
-                    for (cp = tstr; *cp != '\0' && *cp != del; cp++) {
+                    for (cp = tstr; *cp != '\0' && *cp != delim; cp++) {
                         if ((*cp == '\\') &&
-                            ((cp[1] == del) ||
+                            ((cp[1] == delim) ||
                              (cp[1] == '&') ||
                              (cp[1] == '\\') ||
@@ -1892 +1955 @@
                             Buf_AddByte(buf, (Byte)cp[1]);
                             cp++;
-                        } else if ((*cp == '$') && (cp[1] != del)) {
+                        } else if ((*cp == '$') && (cp[1] != delim)) {
                             char    *cp2;
                             int     len;
@@ -1916 +1979 @@
                      * If didn't end in delimiter character, complain
                      */
-                    if (*cp != del) {
+                    if (*cp != delim) {
                         *lengthPtr = cp - start + 1;
                         if (*freePtr) {
@@ -1923 +1986 @@
                         Buf_Destroy(buf, TRUE);
                         Error("Unclosed substitution for %s (%c missing)",
-                              v->name, del);
+                              v->name, delim);
                         return (var_Error);
                     }
@@ -1944 +2007 @@
                     termc = *cp;
                     newStr = VarModify(str, VarSubstitute,
-                                       (void *)&pattern);
+                                       (ClientData)&pattern);
                     /*
                      * Free the two strings.
@@ -1998 +2061 @@
                             pattern.flags |= VAR_SUB_ONE;
                             continue;
-                        default:
-                            break;
                         }
                         break;
@@ -2023 +2084 @@
                                               sizeof(regmatch_t));
                     newStr = VarModify(str, VarRESubstitute,
-                                       (void *) &pattern);
+                                       (ClientData) &pattern);
                     regfree(&pattern.re);
                     free(pattern.replace);
@@ -2039 +2100 @@
                 case 'T':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarTail, (void *)0);
+                        newStr = VarModify (str, VarTail, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2047 +2108 @@
                 case 'H':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarHead, (void *)0);
+                        newStr = VarModify (str, VarHead, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2055 +2116 @@
                 case 'E':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarSuffix, (void *)0);
+                        newStr = VarModify (str, VarSuffix, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2063 +2124 @@
                 case 'R':
                     if (tstr[1] == endc || tstr[1] == ':') {
-                        newStr = VarModify (str, VarRoot, (void *)0);
+                        newStr = VarModify (str, VarRoot, (ClientData)0);
                         cp = tstr + 1;
                         termc = *cp;
@@ -2072 +2133 @@
                 case 's':
                     if (tstr[1] == 'h' && (tstr[2] == endc || tstr[2] == ':')) {
-                        char *error;
-                        newStr = Cmd_Exec (str, &error);
-                        if (error)
-                            Error (error, str);
+                        char *err;
+                        newStr = Cmd_Exec (str, &err);
+                        if (err)
+                            Error (err, str);
                         cp = tstr + 2;
                         termc = *cp;
@@ -2143 +2204 @@
                          */
                         newStr = VarModify(str, VarSYSVMatch,
-                                           (void *)&pattern);
+                                           (ClientData)&pattern);
 
                         /*
@@ -2164 +2225 @@
                 }
             }
-            DEBUGF(VAR, ("Result is \"%s\"\n", newStr));
+            if (DEBUG(VAR)) {
+                printf("Result is \"%s\"\n", newStr);
+            }
 
             if (*freePtr) {
@@ -2203 +2266 @@
         }
         Buf_Destroy(v->val, destroy);
-        free(v);
+        free((Address)v);
     } else if (v->flags & VAR_JUNK) {
         /*
@@ -2214 +2277 @@
         *freePtr = FALSE;
         Buf_Destroy(v->val, TRUE);
-        free(v);
+        free((Address)v);
         if (dynamic) {
             str = emalloc(*lengthPtr + 1);
@@ -2242 +2305 @@
  */
 char *
-Var_Subst (char *var, char *str, GNode *ctxt, Boolean undefErr)
+Var_Subst (var, str, ctxt, undefErr)
+    char          *var;             /* Named variable || NULL for all */
+    char          *str;             /* the string in which to substitute */
+    GNode         *ctxt;            /* the context wherein to find variables */
+    Boolean       undefErr;         /* TRUE if undefineds are an error */
 {
     Buffer        buf;              /* Buffer for forming things */
@@ -2377 +2444 @@
                 Buf_AddBytes (buf, strlen (val), (Byte *)val);
                 if (doFree) {
-                    free (val);
+                    free ((Address)val);
                 }
             }
@@ -2404 +2471 @@
  */
 char *
-Var_GetTail(char *file)
-{
-    return(VarModify(file, VarTail, (void *)0));
+Var_GetTail(file)
+    char        *file;      /* Filename to modify */
+{
+    return(VarModify(file, VarTail, (ClientData)0));
 }
 
@@ -2425 +2493 @@
  */
 char *
-Var_GetHead(char *file)
-{
-    return(VarModify(file, VarHead, (void *)0));
+Var_GetHead(file)
+    char        *file;      /* Filename to manipulate */
+{
+    return(VarModify(file, VarHead, (ClientData)0));
 }
 
@@ -2443 +2512 @@
  */
 void
-Var_Init (void)
+Var_Init ()
 {
     VAR_GLOBAL = Targ_NewGN ("Global");
@@ -2453 +2522 @@
 
 void
-Var_End (void)
+Var_End ()
 {
     Lst_Destroy(allVars, VarDelete);
@@ -2461 +2530 @@
 /****************** PRINT DEBUGGING INFO *****************/
 static int
-VarPrintVar (void *vp, void *dummy __unused)
+VarPrintVar (vp, dummy)
+    ClientData vp;
+    ClientData dummy;
 {
     Var    *v = (Var *) vp;
     printf ("%-16s = %s\n", v->name, (char *) Buf_GetAll(v->val, (int *)NULL));
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
@@ -2475 +2546 @@
  */
 void
-Var_Dump (GNode *ctxt)
-{
-    Lst_ForEach (ctxt->context, VarPrintVar, (void *) 0);
-}
+Var_Dump (ctxt)
+    GNode          *ctxt;
+{
+    Lst_ForEach (ctxt->context, VarPrintVar, (ClientData) 0);
+}