BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / telnet / ring.c

diff --git a/usr/src/usr.bin/telnet/ring.c b/usr/src/usr.bin/telnet/ring.c
index 15b9397..2d9f0b0 100644 (file)
--- a/usr/src/usr.bin/telnet/ring.c
+++ b/usr/src/usr.bin/telnet/ring.c
@@ -2,21 +2,23 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ring.c     1.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)ring.c     1.13 (Berkeley) 6/28/90";

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


@@ -38,7 +40,9 @@ static char sccsid[] = "@(#)ring.c    1.11 (Berkeley) %G%";
 #endif
 
 #include       <sys/types.h>
 #endif
 
 #include       <sys/types.h>

+#ifndef        FILIO_H

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

+#endif

 #include       <sys/socket.h>
 
 #include       "ring.h"
 #include       <sys/socket.h>
 
 #include       "ring.h"


@@ -271,6 +275,7 @@ int count;
     }
 }
 
     }
 }
 

+#ifdef notdef

 
 /*
  * Move data from the "consume" portion of the ring buffer
 
 /*
  * Move data from the "consume" portion of the ring buffer


@@ -291,3 +296,4 @@ int count;
        buffer += i;
     }
 }
        buffer += i;
     }
 }

+#endif