From John Dyson - fix for bug in kern_physio where buffers would be

[unix-history] / sys / kern / tty_ring.c

diff --git a/sys/kern/tty_ring.c b/sys/kern/tty_ring.c
index d6fbfdf..91b440e 100644 (file)
--- a/sys/kern/tty_ring.c
+++ b/sys/kern/tty_ring.c
@@ -45,17 +45,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         2       00163
- * --------------------         -----   ----------------------
- *
- * 14 Mar 93    David Greenman         Upgrade bpf to match tcpdump 2.2.1
- * 27 May 93   Bruce Evans             Who really did the changes that David
- *                                     supplied in the 14 Mar 93 patch.
+ *     $Id: tty_ring.c,v 1.3 1993/11/25 01:33:30 wollman Exp $

  */
  */

-static char rcsid[] = "$Header: /usr/bill/working/sys/kern/RCS/tty_ring.c,v 1.2 92/01/21 21:29:55 william Exp $";

 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"


@@ -63,12 +54,10 @@ static char rcsid[] = "$Header: /usr/bill/working/sys/kern/RCS/tty_ring.c,v 1.2
 #include "ioctl.h"
 #include "tty.h"
 
 #include "ioctl.h"
 #include "tty.h"
 

-/*
- * XXX - put this in tty.h someday.
- */
-size_t rb_write __P((struct ringb *to, char *buf, size_t nfrom));
-
-putc(c, rbp) struct ringb *rbp;
+int
+putc(c, rbp)
+       int c;
+       struct ringb *rbp;

 {
        char *nxtp;
 
 {
        char *nxtp;
 


@@ -81,7 +70,9 @@ putc(c, rbp) struct ringb *rbp;
        return(0);
 }
 
        return(0);
 }
 

-getc(rbp) struct ringb *rbp;
+int
+getc(rbp)
+       struct ringb *rbp;

 {
        u_char c;
 
 {
        u_char c;
 


@@ -94,7 +85,11 @@ getc(rbp) struct ringb *rbp;
        return (c);
 }
 
        return (c);
 }
 

-nextc(cpp, rbp) struct ringb *rbp; char **cpp; {
+int
+nextc(cpp, rbp)
+       char **cpp;
+       struct ringb *rbp;
+{

 
        if (*cpp == rbp->rb_tl) return (0);
        else {  char *cp;
 
        if (*cpp == rbp->rb_tl) return (0);
        else {  char *cp;


@@ -104,7 +99,10 @@ nextc(cpp, rbp) struct ringb *rbp; char **cpp; {
        }
 }
 
        }
 }
 

-ungetc(c, rbp) struct ringb *rbp;
+int
+ungetc(c, rbp)
+       int c;
+       struct ringb *rbp;

 {
        char    *backp;
 
 {
        char    *backp;
 


@@ -117,7 +115,9 @@ ungetc(c, rbp) struct ringb *rbp;
        return(0);
 }
 
        return(0);
 }
 

-unputc(rbp) struct ringb *rbp;
+int
+unputc(rbp)
+       struct ringb *rbp;

 {
        char    *backp;
        int c;
 {
        char    *backp;
        int c;


@@ -135,7 +135,10 @@ unputc(rbp) struct ringb *rbp;
 
 #define        peekc(rbp)      (*(rbp)->rb_hd)
 
 
 #define        peekc(rbp)      (*(rbp)->rb_hd)
 

-initrb(rbp) struct ringb *rbp; {
+void
+initrb(rbp)
+       struct ringb *rbp;
+{

        rbp->rb_hd = rbp->rb_tl = rbp->rb_buf;
 }
 
        rbp->rb_hd = rbp->rb_tl = rbp->rb_buf;
 }
 


@@ -166,6 +169,7 @@ initrb(rbp) struct ringb *rbp; {
 /*
  * Concatenate ring buffers.
  */
 /*
  * Concatenate ring buffers.
  */

+void

 catb(from, to)
        struct ringb *from, *to;
 {
 catb(from, to)
        struct ringb *from, *to;
 {