Changeset 24 for branches/FREEBSD/src/kmk/compat.c

Timestamp:

Nov 26, 2002, 10:24:54 PM (23 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/compat.c (modified) (28 diffs)

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