4.4BSD snapshot (revision 8.1); add 1993 to copyright

[unix-history] / 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 9a94162..6a77724 100644 (file)
--- a/usr/src/usr.bin/mail/tty.c
+++ b/usr/src/usr.bin/mail/tty.c
@@ -1,12 +1,12 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tty.c      5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)tty.c      8.1 (Berkeley) %G%";

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


@@ -16,6 +16,7 @@ static char sccsid[] = "@(#)tty.c     5.11 (Berkeley) %G%";
  */
 
 #include "rcv.h"
  */
 
 #include "rcv.h"

+#include "extern.h"

 
 static int     c_erase;                /* Current erase char */
 static int     c_kill;                 /* Current kill char */
 
 static int     c_erase;                /* Current erase char */
 static int     c_kill;                 /* Current kill char */


@@ -29,8 +30,10 @@ static       int     ttyset;                 /* We must now do erase/kill */
  * Read all relevant header fields.
  */
 
  * Read all relevant header fields.
  */
 

+int

 grabh(hp, gflags)
        struct header *hp;
 grabh(hp, gflags)
        struct header *hp;

+       int gflags;

 {
        struct sgttyb ttybuf;
        sig_t saveint;
 {
        struct sgttyb ttybuf;
        sig_t saveint;


@@ -41,7 +44,7 @@ grabh(hp, gflags)
        sig_t savettou;
        sig_t savettin;
        int errs;
        sig_t savettou;
        sig_t savettin;
        int errs;

-       int ttyint();
+       void ttyint();

 
        savetstp = signal(SIGTSTP, SIG_DFL);
        savettou = signal(SIGTTOU, SIG_DFL);
 
        savetstp = signal(SIGTSTP, SIG_DFL);
        savettou = signal(SIGTTOU, SIG_DFL);


@@ -128,7 +131,7 @@ readtty(pr, src)
        char ch, canonb[BUFSIZ];
        int c;
        register char *cp, *cp2;
        char ch, canonb[BUFSIZ];
        int c;
        register char *cp, *cp2;

-       int ttystop();
+       void ttystop();

 
        fputs(pr, stdout);
        fflush(stdout);
 
        fputs(pr, stdout);
        fflush(stdout);


@@ -222,7 +225,9 @@ redo:
 /*
  * Receipt continuation.
  */
 /*
  * Receipt continuation.
  */

+void

 ttystop(s)
 ttystop(s)

+       int s;

 {
        sig_t old_action = signal(s, SIG_DFL);
 
 {
        sig_t old_action = signal(s, SIG_DFL);
 


@@ -234,8 +239,9 @@ ttystop(s)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

+void

 ttyint(s)
 ttyint(s)

+       int s;

 {
 {

-

        longjmp(intjmp, 1);
 }
        longjmp(intjmp, 1);
 }