X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/79ddb1215e41df6e86be1fe52fd1bfd2322e488d..a12ff48697cac43c0bd58aadc3f665316752562b:/usr/src/usr.bin/mail/tty.c

diff --git a/usr/src/usr.bin/mail/tty.c b/usr/src/usr.bin/mail/tty.c
index d56ce79ce9..6a77724757 100644
--- a/usr/src/usr.bin/mail/tty.c
+++ b/usr/src/usr.bin/mail/tty.c
@@ -1,4 +1,13 @@
-#
+/*
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) %G%";
+#endif /* not lint */
 
 /*
  * Mail -- a mail program
@@ -7,14 +16,12 @@
  */
 
 #include "rcv.h"
-#include <sgtty.h>
-
-static char *SccsId = "@(#)tty.c	2.1 %G%";
+#include "extern.h"
 
 static	int	c_erase;		/* Current erase char */
 static	int	c_kill;			/* Current kill char */
-static	int	hadcont;		/* Saw continue signal */
 static	jmp_buf	rewrite;		/* Place to go when continued */
+static	jmp_buf	intjmp;			/* Place to go when interrupted */
 #ifndef TIOCSTI
 static	int	ttyset;			/* We must now do erase/kill */
 #endif
@@ -23,24 +30,30 @@ static	int	ttyset;			/* We must now do erase/kill */
  * Read all relevant header fields.
  */
 
+int
 grabh(hp, gflags)
 	struct header *hp;
+	int gflags;
 {
 	struct sgttyb ttybuf;
-	int ttycont(), signull();
+	sig_t saveint;
 #ifndef TIOCSTI
-	int (*savesigs[2])();
+	sig_t savequit;
 #endif
-	int (*savecont)();
-	register int s;
+	sig_t savetstp;
+	sig_t savettou;
+	sig_t savettin;
 	int errs;
+	void ttyint();
 
-	savecont = sigset(SIGCONT, signull);
+	savetstp = signal(SIGTSTP, SIG_DFL);
+	savettou = signal(SIGTTOU, SIG_DFL);
+	savettin = signal(SIGTTIN, SIG_DFL);
 	errs = 0;
 #ifndef TIOCSTI
 	ttyset = 0;
 #endif
-	if (gtty(fileno(stdin), &ttybuf) < 0) {
+	if (ioctl(fileno(stdin), TIOCGETP, &ttybuf) < 0) {
 		perror("gtty");
 		return(-1);
 	}
@@ -49,18 +62,22 @@ grabh(hp, gflags)
 #ifndef TIOCSTI
 	ttybuf.sg_erase = 0;
 	ttybuf.sg_kill = 0;
-	for (s = SIGINT; s <= SIGQUIT; s++)
-		if ((savesigs[s-SIGINT] = sigset(s, SIG_IGN)) == SIG_DFL)
-			sigset(s, SIG_DFL);
+	if ((saveint = signal(SIGINT, SIG_IGN)) == SIG_DFL)
+		signal(SIGINT, SIG_DFL);
+	if ((savequit = signal(SIGQUIT, SIG_IGN)) == SIG_DFL)
+		signal(SIGQUIT, SIG_DFL);
+#else
+	if (setjmp(intjmp))
+		goto out;
+	saveint = signal(SIGINT, ttyint);
 #endif
 	if (gflags & GTO) {
 #ifndef TIOCSTI
-		if (!ttyset && hp->h_to != NOSTR)
+		if (!ttyset && hp->h_to != NIL)
 			ttyset++, stty(fileno(stdin), &ttybuf);
 #endif
-		hp->h_to = readtty("To: ", hp->h_to);
-		if (hp->h_to != NOSTR)
-			hp->h_seq++;
+		hp->h_to =
+			extract(readtty("To: ", detract(hp->h_to, 0)), GTO);
 	}
 	if (gflags & GSUBJECT) {
 #ifndef TIOCSTI
@@ -68,36 +85,35 @@ grabh(hp, gflags)
 			ttyset++, stty(fileno(stdin), &ttybuf);
 #endif
 		hp->h_subject = readtty("Subject: ", hp->h_subject);
-		if (hp->h_subject != NOSTR)
-			hp->h_seq++;
 	}
 	if (gflags & GCC) {
 #ifndef TIOCSTI
-		if (!ttyset && hp->h_cc != NOSTR)
+		if (!ttyset && hp->h_cc != NIL)
 			ttyset++, stty(fileno(stdin), &ttybuf);
 #endif
-		hp->h_cc = readtty("Cc: ", hp->h_cc);
-		if (hp->h_cc != NOSTR)
-			hp->h_seq++;
+		hp->h_cc =
+			extract(readtty("Cc: ", detract(hp->h_cc, 0)), GCC);
 	}
 	if (gflags & GBCC) {
 #ifndef TIOCSTI
-		if (!ttyset && hp->h_bcc != NOSTR)
+		if (!ttyset && hp->h_bcc != NIL)
 			ttyset++, stty(fileno(stdin), &ttybuf);
 #endif
-		hp->h_bcc = readtty("Bcc: ", hp->h_bcc);
-		if (hp->h_bcc != NOSTR)
-			hp->h_seq++;
+		hp->h_bcc =
+			extract(readtty("Bcc: ", detract(hp->h_bcc, 0)), GBCC);
 	}
-	sigset(SIGCONT, savecont);
+out:
+	signal(SIGTSTP, savetstp);
+	signal(SIGTTOU, savettou);
+	signal(SIGTTIN, savettin);
 #ifndef TIOCSTI
 	ttybuf.sg_erase = c_erase;
 	ttybuf.sg_kill = c_kill;
 	if (ttyset)
 		stty(fileno(stdin), &ttybuf);
-	for (s = SIGINT; s <= SIGQUIT; s++)
-		sigset(s, savesigs[s-SIGINT]);
+	signal(SIGQUIT, savequit);
 #endif
+	signal(SIGINT, saveint);
 	return(errs);
 }
 
@@ -112,9 +128,10 @@ char *
 readtty(pr, src)
 	char pr[], src[];
 {
-	char canonb[BUFSIZ];
-	int c, ch, signull();
+	char ch, canonb[BUFSIZ];
+	int c;
 	register char *cp, *cp2;
+	void ttystop();
 
 	fputs(pr, stdout);
 	fflush(stdout);
@@ -136,7 +153,8 @@ readtty(pr, src)
 			ch = '\\';
 			ioctl(0, TIOCSTI, &ch);
 		}
-		ioctl(0, TIOCSTI, &c);
+		ch = c;
+		ioctl(0, TIOCSTI, &ch);
 	}
 	cp = canonb;
 	*cp = 0;
@@ -147,7 +165,10 @@ readtty(pr, src)
 	cp2 = cp;
 	if (setjmp(rewrite))
 		goto redo;
-	sigset(SIGCONT, ttycont);
+	signal(SIGTSTP, ttystop);
+	signal(SIGTTOU, ttystop);
+	signal(SIGTTIN, ttystop);
+	clearerr(stdin);
 	while (cp2 < canonb + BUFSIZ) {
 		c = getc(stdin);
 		if (c == EOF || c == '\n')
@@ -155,18 +176,19 @@ readtty(pr, src)
 		*cp2++ = c;
 	}
 	*cp2 = 0;
-	sigset(SIGCONT, signull);
-	if (c == EOF && ferror(stdin) && hadcont) {
+	signal(SIGTSTP, SIG_DFL);
+	signal(SIGTTOU, SIG_DFL);
+	signal(SIGTTIN, SIG_DFL);
+	if (c == EOF && ferror(stdin)) {
 redo:
-		hadcont = 0;
 		cp = strlen(canonb) > 0 ? canonb : NOSTR;
 		clearerr(stdin);
 		return(readtty(pr, cp));
 	}
 #ifndef TIOCSTI
-	if (cp2 == NOSTR || *cp2 == '\0')
+	if (cp == NOSTR || *cp == '\0')
 		return(src);
-	cp = cp2;
+	cp2 = cp;
 	if (!ttyset)
 		return(strlen(canonb) > 0 ? savestr(canonb) : NOSTR);
 	while (*cp != '\0') {
@@ -203,17 +225,23 @@ redo:
 /*
  * Receipt continuation.
  */
-ttycont(s)
+void
+ttystop(s)
+	int s;
 {
+	sig_t old_action = signal(s, SIG_DFL);
 
-	hadcont++;
-	sigrelse(SIGCONT);
+	sigsetmask(sigblock(0) & ~sigmask(s));
+	kill(0, s);
+	sigblock(sigmask(s));
+	signal(s, old_action);
 	longjmp(rewrite, 1);
 }
 
-/*
- * Null routine to satisfy
- * silly system bug that denies us holding SIGCONT
- */
-signull(s)
-{}
+/*ARGSUSED*/
+void
+ttyint(s)
+	int s;
+{
+	longjmp(intjmp, 1);
+}