BSD 4_4 release

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

diff --git a/usr/src/usr.bin/tip/acu.c b/usr/src/usr.bin/tip/acu.c
index 383ec9e..f7bde99 100644 (file)
--- a/usr/src/usr.bin/tip/acu.c
+++ b/usr/src/usr.bin/tip/acu.c
@@ -1,31 +1,45 @@
 /*
 /*

- * 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: (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[] = "@(#)acu.c      5.7 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)acu.c      8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include "tip.h"
 
 static acu_t *acu = NOACU;
 static int conflag;
 #endif /* not lint */
 
 #include "tip.h"
 
 static acu_t *acu = NOACU;
 static int conflag;

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

 static acu_t *acutype();
 static jmp_buf jmpbuf;
 /*
 static acu_t *acutype();
 static jmp_buf jmpbuf;
 /*


@@ -88,6 +102,8 @@ connect()
                                *cp++ = '\0';
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                *cp++ = '\0';
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {

+                               if (CM != NOSTR)
+                                       pwrite(FD, CM, size(CM));

                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");
                                return (NOSTR);
                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");
                                return (NOSTR);


@@ -124,6 +140,8 @@ connect()
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                fclose(fd);
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                fclose(fd);

+                               if (CM != NOSTR)
+                                       pwrite(FD, CM, size(CM));

                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");
                                return (NOSTR);
                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");
                                return (NOSTR);


@@ -157,7 +175,7 @@ disconnect(reason)
        (*acu->acu_disconnect)();
 }
 
        (*acu->acu_disconnect)();
 }
 

-static int
+static void

 acuabort(s)
 {
        signal(s, SIG_IGN);
 acuabort(s)
 {
        signal(s, SIG_IGN);