BSD 4_4 release

[unix-history] / usr / src / usr.bin / tip / aculib / biz31.c

diff --git a/usr/src/usr.bin/tip/aculib/biz31.c b/usr/src/usr.bin/tip/aculib/biz31.c
index fda6f19..412974d 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/biz31.c
+++ b/usr/src/usr.bin/tip/aculib/biz31.c
@@ -1,14 +1,46 @@
+/*
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)biz31.c    4.6 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)biz31.c    8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "tip.h"
 
 
 #include "tip.h"
 

-#if BIZ1031

 #define MAXRETRY       3               /* sync up retry count */
 #define DISCONNECT_CMD "\21\25\11\24"  /* disconnection string */
 
 #define MAXRETRY       3               /* sync up retry count */
 #define DISCONNECT_CMD "\21\25\11\24"  /* disconnection string */
 

-static int sigALRM();
+static void sigALRM();

 static int timeout = 0;
 static jmp_buf timeoutbuf;
 
 static int timeout = 0;
 static jmp_buf timeoutbuf;
 


@@ -119,7 +151,7 @@ echo(s)
        }
 }
 
        }
 }
 

-static int
+static void

 sigALRM()
 {
 
 sigALRM()
 {
 


@@ -131,8 +163,8 @@ static int
 detect(s)
        register char *s;
 {
 detect(s)
        register char *s;
 {

+       sig_t f;

        char c;
        char c;

-       int (*f)();

 
        f = signal(SIGALRM, sigALRM);
        timeout = 0;
 
        f = signal(SIGALRM, sigALRM);
        timeout = 0;


@@ -156,8 +188,8 @@ static int
 flush(s)
        register char *s;
 {
 flush(s)
        register char *s;
 {

+       sig_t f;

        char c;
        char c;

-       int (*f)();

 
        f = signal(SIGALRM, sigALRM);
        while (*s++) {
 
        f = signal(SIGALRM, sigALRM);
        while (*s++) {


@@ -214,4 +246,3 @@ retry:
        }
        return (1);
 }
        }
        return (1);
 }

-#endif