BSD 4_4 release

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

diff --git a/usr/src/usr.bin/tip/aculib/ventel.c b/usr/src/usr.bin/tip/aculib/ventel.c
index 8d36d3b..28b0d28 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/ventel.c
+++ b/usr/src/usr.bin/tip/aculib/ventel.c
@@ -1,22 +1,38 @@
 /*
 /*

- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The 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, 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[] = "@(#)ventel.c   5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)ventel.c   8.1 (Berkeley) 6/6/93";

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


@@ -27,7 +43,7 @@ static char sccsid[] = "@(#)ventel.c  5.2 (Berkeley) %G%";
 
 #define        MAXRETRY        5
 
 
 #define        MAXRETRY        5
 

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

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


@@ -48,6 +64,8 @@ ven_dialer(num, acu)
        register char *cp;
        register int connected = 0;
        char *msg, *index(), line[80];
        register char *cp;
        register int connected = 0;
        char *msg, *index(), line[80];

+       static int gobble(), vensync();
+       static void echo();

 
        /*
         * Get in synch with a couple of carriage returns
 
        /*
         * Get in synch with a couple of carriage returns


@@ -119,7 +137,7 @@ ven_abort()
        close(FD);
 }
 
        close(FD);
 }
 

-static int
+static void

 echo(s)
        register char *s;
 {
 echo(s)
        register char *s;
 {


@@ -143,10 +161,9 @@ echo(s)
        }
 }
 
        }
 }
 

-static int
+static void

 sigALRM()
 {
 sigALRM()
 {

-

        printf("\07timeout waiting for reply\n");
        timeout = 1;
        longjmp(timeoutbuf, 1);
        printf("\07timeout waiting for reply\n");
        timeout = 1;
        longjmp(timeoutbuf, 1);


@@ -158,10 +175,10 @@ gobble(match, response)
        char response[];
 {
        register char *cp = response;
        char response[];
 {
        register char *cp = response;

+       sig_t f;

        char c;
        char c;

-       int (*f)();

 
 

-       signal(SIGALRM, sigALRM);
+       f = signal(SIGALRM, sigALRM);

        timeout = 0;
        do {
                if (setjmp(timeoutbuf)) {
        timeout = 0;
        do {
                if (setjmp(timeoutbuf)) {