Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a

merge of parallel duplicate work by Steve Price and myself. :-]

There are some changes to the build that are my fault...  mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do.  The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.

This closes a pile of /bin/sh PR's, but not all of them..

Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter

1 files changed, 86 insertions, 55 deletions

diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index ec8a649..65dea1d 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -33,41 +33,49 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: jobs.c,v 1.3 1995/05/30 00:07:18 rgrimes Exp $
+ *	$Id: jobs.c,v 1.4 1995/09/21 13:24:20 bde Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)jobs.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif /* not lint */
 
+#include <fcntl.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#ifdef BSD
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
 #include "shell.h"
 #if JOBS
+#ifdef OLD_TTY_DRIVER
 #include "sgtty.h"
+#else
+#include <termios.h>
+#endif
 #undef CEOF			/* syntax.h redefines this */
 #endif
+#include "redir.h"
+#include "show.h"
 #include "main.h"
 #include "parser.h"
 #include "nodes.h"
 #include "jobs.h"
 #include "options.h"
 #include "trap.h"
-#include "signames.h"
 #include "syntax.h"
 #include "input.h"
 #include "output.h"
 #include "memalloc.h"
 #include "error.h"
 #include "mystring.h"
-#include <fcntl.h>
-#include <signal.h>
-#include <errno.h>
-#ifdef BSD
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-
 
 
 struct job *jobtab;		/* array of jobs */
@@ -78,22 +86,14 @@ int initialpgrp;		/* pgrp of shell on invocation */
 short curjob;			/* current job */
 #endif
 
-#ifdef __STDC__
-STATIC void restartjob(struct job *);
-STATIC struct job *getjob(char *);
-STATIC void freejob(struct job *);
-STATIC int procrunning(int);
-STATIC int dowait(int, struct job *);
-STATIC int waitproc(int, int *);
-#else
-STATIC void restartjob();
-STATIC struct job *getjob();
-STATIC void freejob();
-STATIC int procrunning();
-STATIC int dowait();
-STATIC int waitproc();
-#endif
-
+STATIC void restartjob __P((struct job *));
+STATIC void freejob __P((struct job *));
+STATIC struct job *getjob __P((char *));
+STATIC int dowait __P((int, struct job *));
+STATIC int onsigchild __P((void));
+STATIC int waitproc __P((int, int *));
+STATIC void cmdtxt __P((union node *));
+STATIC void cmdputs __P((char *));
 
 
 /*
@@ -107,7 +107,9 @@ STATIC int waitproc();
 MKINIT int jobctl;
 
 void
-setjobctl(on) {
+setjobctl(on) 
+	int on;
+{
 #ifdef OLD_TTY_DRIVER
 	int ldisc;
 #endif
@@ -122,8 +124,8 @@ setjobctl(on) {
 				return;
 			}
 			if (initialpgrp == -1)
-				initialpgrp = getpgrp(0);
-			else if (initialpgrp != getpgrp(0)) {
+				initialpgrp = getpgrp();
+			else if (initialpgrp != getpgrp()) {
 				killpg(initialpgrp, SIGTTIN);
 				continue;
 			}
@@ -138,10 +140,10 @@ setjobctl(on) {
 		setsignal(SIGTSTP);
 		setsignal(SIGTTOU);
 		setsignal(SIGTTIN);
-		setpgrp(0, rootpid);
+		setpgid(0, rootpid);
 		ioctl(2, TIOCSPGRP, (char *)&rootpid);
 	} else { /* turning job control off */
-		setpgrp(0, initialpgrp);
+		setpgid(0, initialpgrp);
 		ioctl(2, TIOCSPGRP, (char *)&initialpgrp);
 		setsignal(SIGTSTP);
 		setsignal(SIGTTOU);
@@ -152,6 +154,7 @@ setjobctl(on) {
 
 
 #ifdef mkinit
+INCLUDE <stdlib.h>
 
 SHELLPROC {
 	backgndpid = -1;
@@ -165,7 +168,11 @@ SHELLPROC {
 
 
 #if JOBS
-fgcmd(argc, argv)  char **argv; {
+int
+fgcmd(argc, argv)
+	int argc;
+	char **argv; 
+{
 	struct job *jp;
 	int pgrp;
 	int status;
@@ -183,7 +190,11 @@ fgcmd(argc, argv)  char **argv; {
 }
 
 
-bgcmd(argc, argv)  char **argv; {
+int
+bgcmd(argc, argv)
+	int argc;
+	char **argv; 
+{
 	struct job *jp;
 
 	do {
@@ -199,7 +210,7 @@ bgcmd(argc, argv)  char **argv; {
 STATIC void
 restartjob(jp)
 	struct job *jp;
-	{
+{
 	struct procstat *ps;
 	int i;
 
@@ -219,7 +230,10 @@ restartjob(jp)
 
 
 int
-jobscmd(argc, argv)  char **argv; {
+jobscmd(argc, argv)
+	int argc;
+	char **argv; 
+{
 	showjobs(0);
 	return 0;
 }
@@ -235,7 +249,9 @@ jobscmd(argc, argv)  char **argv; {
  */
 
 void
-showjobs(change) {
+showjobs(change) 
+	int change;
+{
 	int jobno;
 	int procno;
 	int i;
@@ -274,8 +290,8 @@ showjobs(change) {
 				if ((i & 0xFF) == 0177)
 					i >>= 8;
 #endif
-				if ((i & 0x7F) <= MAXSIG && sigmesg[i & 0x7F])
-					scopy(sigmesg[i & 0x7F], s);
+				if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F])
+					scopy(sys_siglist[i & 0x7F], s);
 				else
 					fmtstr(s, 64, "Signal %d", i & 0x7F);
 				if (i & 0x80)
@@ -329,7 +345,10 @@ freejob(jp)
 
 
 int
-waitcmd(argc, argv)  char **argv; {
+waitcmd(argc, argv) 
+	int argc;
+	char **argv; 
+{
 	struct job *job;
 	int status;
 	struct job *jp;
@@ -370,7 +389,11 @@ waitcmd(argc, argv)  char **argv; {
 
 
 
-jobidcmd(argc, argv)  char **argv; {
+int
+jobidcmd(argc, argv)  
+	int argc;
+	char **argv; 
+{
 	struct job *jp;
 	int i;
 
@@ -438,6 +461,8 @@ currentjob:
 		}
 	}
 	error("No such job: %s", name);
+	/*NOTREACHED*/
+	return NULL;
 }
 
 
@@ -449,7 +474,8 @@ currentjob:
 struct job *
 makejob(node, nprocs)
 	union node *node;
-	{
+	int nprocs;
+{
 	int i;
 	struct job *jp;
 
@@ -467,7 +493,7 @@ makejob(node, nprocs)
 					if (ojp->ps == &ojp->ps0)
 						ojp->ps = &jp->ps0;
 				jp -= njobs;
-				bcopy(jobtab, jp, njobs * sizeof jp[0]);
+				memcpy(jp, jobtab, njobs * sizeof jp[0]);
 				ckfree(jobtab);
 				jobtab = jp;
 			}
@@ -493,7 +519,8 @@ makejob(node, nprocs)
 		jp->ps = &jp->ps0;
 	}
 	INTON;
-	TRACE(("makejob(0x%x, %d) returns %%%d\n", (int)node, nprocs, jp - jobtab + 1));
+	TRACE(("makejob(0x%lx, %d) returns %%%d\n", (long)node, nprocs,
+	    jp - jobtab + 1));
 	return jp;
 }
 
@@ -517,11 +544,13 @@ int
 forkshell(jp, n, mode)
 	union node *n;
 	struct job *jp;
-	{
+	int mode;
+{
 	int pid;
 	int pgrp;
 
-	TRACE(("forkshell(%%%d, 0x%x, %d) called\n", jp - jobtab, (int)n, mode));
+	TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n,
+	    mode));
 	INTOFF;
 	pid = fork();
 	if (pid == -1) {
@@ -550,7 +579,7 @@ forkshell(jp, n, mode)
 				pgrp = getpid();
 			else
 				pgrp = jp->ps[0].pid;
-			setpgrp(0, pgrp);
+			setpgid(0, pgrp);
 			if (mode == FORK_FG) {
 				/*** this causes superfluous TIOCSPGRPS ***/
 				if (ioctl(2, TIOCSPGRP, (char *)&pgrp) < 0)
@@ -592,7 +621,7 @@ forkshell(jp, n, mode)
 			pgrp = pid;
 		else
 			pgrp = jp->ps[0].pid;
-		setpgrp(pid, pgrp);
+		setpgid(pid, pgrp);
 	}
 	if (mode == FORK_BG)
 		backgndpid = pid;		/* set $! */
@@ -635,7 +664,7 @@ waitforjob(jp)
 	register struct job *jp;
 	{
 #if JOBS
-	int mypgrp = getpgrp(0);
+	int mypgrp = getpgrp();
 #endif
 	int status;
 	int st;
@@ -680,8 +709,9 @@ waitforjob(jp)
 
 STATIC int
 dowait(block, job)
+	int block;
 	struct job *job;
-	{
+{
 	int pid;
 	int status;
 	struct procstat *sp;
@@ -745,8 +775,8 @@ dowait(block, job)
 			if (status == SIGTSTP && rootshell && iflag)
 				outfmt(out2, "%%%d ", job - jobtab + 1);
 #endif
-			if (status <= MAXSIG && sigmesg[status])
-				out2str(sigmesg[status]);
+			if (status < NSIG && sys_siglist[status])
+				out2str(sys_siglist[status]);
 			else
 				outfmt(out2, "Signal %d", status);
 			if (core)
@@ -806,8 +836,9 @@ STATIC int onsigchild() {
 
 STATIC int
 waitproc(block, status)
+	int block;
 	int *status;
-	{
+{
 #ifdef BSD
 	int flags;