BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/tip/aculib/v3451.c b/usr/src/usr.bin/tip/aculib/v3451.c
index c3201bb..9211941 100644 (file)
--- a/usr/src/usr.bin/tip/aculib/v3451.c
+++ b/usr/src/usr.bin/tip/aculib/v3451.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
  *

- * 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.
+ * 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[] = "@(#)v3451.c    5.4 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)v3451.c    5.5 (Berkeley) 3/2/91";

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


@@ -39,6 +53,8 @@ v3451_dialer(num, acu)
 #ifdef ACULOG
        char line[80];
 #endif
 #ifdef ACULOG
        char line[80];
 #endif

+       static int expect();
+       static void vawrite();

 
        /*
         * Get in synch
 
        /*
         * Get in synch


@@ -116,7 +132,7 @@ v3451_abort()
        close(FD);
 }
 
        close(FD);
 }
 

-static
+static void

 vawrite(cp, delay)
        register char *cp;
        int delay;
 vawrite(cp, delay)
        register char *cp;
        int delay;


@@ -132,7 +148,9 @@ expect(cp)
 {
        char buf[300];
        register char *rp = buf;
 {
        char buf[300];
        register char *rp = buf;

-       int alarmtr(), timeout = 30, online = 0;
+       int timeout = 30, online = 0;
+       static int notin();
+       static void alarmtr();

 
        if (strcmp(cp, "\"\"") == 0)
                return (1);
 
        if (strcmp(cp, "\"\"") == 0)
                return (1);


@@ -165,17 +183,17 @@ expect(cp)
        return (1);
 }
 
        return (1);
 }
 

-static
+static void

 alarmtr()
 {
 alarmtr()
 {

-

        longjmp(Sjbuf, 1);
 }
 
        longjmp(Sjbuf, 1);
 }
 

-static
+static int

 notin(sh, lg)
        char *sh, *lg;
 {
 notin(sh, lg)
        char *sh, *lg;
 {

+       static int prefix();

 
        for (; *lg; lg++)
                if (prefix(sh, lg))
 
        for (; *lg; lg++)
                if (prefix(sh, lg))