remove Sprite ifdef's

SCCS-vsn: usr.bin/make/job.c 5.3
SCCS-vsn: usr.bin/make/main.c 5.5
SCCS-vsn: usr.bin/make/str.c 5.4

diff --git a/usr/src/usr.bin/make/job.c b/usr/src/usr.bin/make/job.c
index 0de7bc8..d44cf09 100644 (file)
--- a/usr/src/usr.bin/make/job.c
+++ b/usr/src/usr.bin/make/job.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)job.c      5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)job.c      5.3 (Berkeley) %G%";

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


@@ -193,11 +193,7 @@ static Shell    shells[] = {
 {
     "sh",
     TRUE, "set -", "set -v", "set -", 5,
 {
     "sh",
     TRUE, "set -", "set -v", "set -", 5,

-#if (defined(sun) && !defined(Sprite)) || defined(SYSV)
-    TRUE, "set -e", "set +e",
-#else

     FALSE, "echo \"%s\"\n", "sh -c '%s || exit 0'\n",
     FALSE, "echo \"%s\"\n", "sh -c '%s || exit 0'\n",

-#endif

     "v", "e",
 },
     /*
     "v", "e",
 },
     /*


@@ -609,11 +605,8 @@ JobFinish (job, status)
        /*
         * If it exited non-zero and either we're doing things our
         * way or we're not ignoring errors, the job is finished.
        /*
         * If it exited non-zero and either we're doing things our
         * way or we're not ignoring errors, the job is finished.

-        * Similarly, if the shell died because of a signal (the
-        * conditional on SIGCONT is to handle the mapping of Sprite
-        * signal semantics whereby wait will return a signal
-        * termination with SIGCONT being the signal to indicate that the
-        * child has resumed), the job is also finished. In these
+        * Similarly, if the shell died because of a signal
+        * the job is also finished. In these

         * cases, finish out the job's output before printing the exit
         * status...
         */
         * cases, finish out the job's output before printing the exit
         * status...
         */


@@ -2020,13 +2013,8 @@ Job_CatchChildren (block)
     while ((pid = wait3(&status, (block?0:WNOHANG)|WUNTRACED,
                        (struct rusage *)0)) > 0)
     {
     while ((pid = wait3(&status, (block?0:WNOHANG)|WUNTRACED,
                        (struct rusage *)0)) > 0)
     {

-       if (DEBUG(JOB)) {
-#ifdef Sprite
-           printf("Process %x exited or stopped.\n", pid);
-#else
+       if (DEBUG(JOB))

            printf("Process %d exited or stopped.\n", pid);
            printf("Process %d exited or stopped.\n", pid);

-#endif /* Sprite */
-       }

            
 
        jnode = Lst_Find (jobs, (ClientData)pid, JobCmpPid);
            
 
        jnode = Lst_Find (jobs, (ClientData)pid, JobCmpPid);


@@ -2035,21 +2023,13 @@ Job_CatchChildren (block)
            if (WIFSIGNALED(status) && (status.w_termsig == SIGCONT)) {
                jnode = Lst_Find(stoppedJobs, (ClientData)pid, JobCmpPid);
                if (jnode == NILLNODE) {
            if (WIFSIGNALED(status) && (status.w_termsig == SIGCONT)) {
                jnode = Lst_Find(stoppedJobs, (ClientData)pid, JobCmpPid);
                if (jnode == NILLNODE) {

-#ifdef Sprite
-                   Error("Resumed child (%x) not in table", pid);
-#else

                    Error("Resumed child (%d) not in table", pid);
                    Error("Resumed child (%d) not in table", pid);

-#endif /* Sprite */

                    continue;
                }
                job = (Job *)Lst_Datum(jnode);
                (void)Lst_Remove(stoppedJobs, jnode);
            } else {
                    continue;
                }
                job = (Job *)Lst_Datum(jnode);
                (void)Lst_Remove(stoppedJobs, jnode);
            } else {

-#ifdef Sprite
-               Error ("Child (%x) not in table?", pid);
-#else

                Error ("Child (%d) not in table?", pid);
                Error ("Child (%d) not in table?", pid);

-#endif /* Sprite */

                continue;
            }
        } else {
                continue;
            }
        } else {


@@ -2189,11 +2169,7 @@ Job_Init (maxproc, maxlocal)
 {
     GNode         *begin;     /* node for commands to do at the very start */
 
 {
     GNode         *begin;     /* node for commands to do at the very start */
 

-#ifdef Sprite
-    sprintf (tfile, "/tmp/make%05x", getpid());
-#else

     sprintf (tfile, "/tmp/make%05d", getpid());
     sprintf (tfile, "/tmp/make%05d", getpid());

-#endif /* Sprite */

 
     jobs =       Lst_Init (FALSE);
     stoppedJobs = Lst_Init(FALSE);
 
     jobs =       Lst_Init (FALSE);
     stoppedJobs = Lst_Init(FALSE);

diff --git a/usr/src/usr.bin/make/main.c b/usr/src/usr.bin/make/main.c
index 3579e6e..4e7c0b2 100644 (file)
--- a/usr/src/usr.bin/make/main.c
+++ b/usr/src/usr.bin/make/main.c
@@ -27,7 +27,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.5 (Berkeley) %G%";

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


@@ -57,16 +57,13 @@ static char sccsid[] = "@(#)main.c  5.4 (Berkeley) %G%";
  *                             exiting.
  */
 
  *                             exiting.
  */
 

-#include    <stdio.h>
-#ifdef Sprite
-#include    <stdlib.h>
-#endif /* Sprite */

 #include    <sys/types.h>
 #include    <sys/signal.h>
 #include    <sys/stat.h>
 #include    <sys/types.h>
 #include    <sys/signal.h>
 #include    <sys/stat.h>

-#include    <fcntl.h>

 #include    <sys/errno.h>
 #include    <sys/errno.h>

+#include    <fcntl.h>

 #include    <ctype.h>
 #include    <ctype.h>

+#include    <stdio.h>

 #include    "make.h"
 
 extern int errno;
 #include    "make.h"
 
 extern int errno;

diff --git a/usr/src/usr.bin/make/str.c b/usr/src/usr.bin/make/str.c
index f98366b..50c9bf9 100644 (file)
--- a/usr/src/usr.bin/make/str.c
+++ b/usr/src/usr.bin/make/str.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)str.c      5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      5.4 (Berkeley) %G%";

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


@@ -34,8 +34,7 @@ static char sccsid[] = "@(#)str.c     5.3 (Berkeley) %G%";
  *                             the two strings, all this under the control
  *                             of the STR_ flags given as the third arg.
  *
  *                             the two strings, all this under the control
  *                             of the STR_ flags given as the third arg.
  *

- *     Str_FindSubstring       Find a substring within a string (from
- *                             original Sprite libc).
+ *     Str_FindSubstring       Find a substring within a string

  *
  *     Str_Match               Pattern match two strings.
  */
  *
  *     Str_Match               Pattern match two strings.
  */


@@ -276,7 +275,6 @@ Str_FreeVec (count, vecPtr)
     }
     free (vecPtr);
 }
     }
     free (vecPtr);
 }

-#ifndef Sprite

 
 /*
  *----------------------------------------------------------------------
 
 /*
  *----------------------------------------------------------------------


@@ -327,8 +325,6 @@ Str_FindSubstring(string, substring)
     return (char *) NULL;
 }
 
     return (char *) NULL;
 }
 

-#endif /* !Sprite */
-

 /*
  *----------------------------------------------------------------------
  *
 /*
  *----------------------------------------------------------------------
  *