386BSD 0.1 development

[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 c0ee813..da958b9 100644 (file)
--- a/usr/src/usr.bin/tip/acu.c
+++ b/usr/src/usr.bin/tip/acu.c
@@ -1,18 +1,45 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983 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[] = "@(#)acu.c      5.3 (Berkeley) 4/3/86";
-#endif not lint
+static char sccsid[] = "@(#)acu.c      5.8 (Berkeley) 3/2/91";
+#endif /* not lint */

 
 #include "tip.h"
 
 static acu_t *acu = NOACU;
 static int conflag;
 
 #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;
 /*


@@ -42,6 +69,7 @@ connect()
        if (!DU) {              /* regular connect message */
                if (CM != NOSTR)
                        pwrite(FD, CM, size(CM));
        if (!DU) {              /* regular connect message */
                if (CM != NOSTR)
                        pwrite(FD, CM, size(CM));

+               logent(value(HOST), "", DV, "call completed");

                return (NOSTR);
        }
        /*
                return (NOSTR);
        }
        /*


@@ -62,8 +90,7 @@ connect()
                        else
                                (*acu->acu_abort)();
                }
                        else
                                (*acu->acu_abort)();
                }

-               delock(uucplock);
-               exit(1);
+               return ("interrupt");

        }
        if ((acu = acutype(AT)) == NOACU)
                return ("unknown ACU type");
        }
        if ((acu = acutype(AT)) == NOACU)
                return ("unknown ACU type");


@@ -131,8 +158,10 @@ connect()
 disconnect(reason)
        char *reason;
 {
 disconnect(reason)
        char *reason;
 {

-       if (!conflag)
+       if (!conflag) {
+               logent(value(HOST), "", DV, "call terminated");

                return;
                return;

+       }

        if (reason == NOSTR) {
                logent(value(HOST), "", acu->acu_name, "call terminated");
                if (boolean(value(VERBOSE)))
        if (reason == NOSTR) {
                logent(value(HOST), "", acu->acu_name, "call terminated");
                if (boolean(value(VERBOSE)))


@@ -142,7 +171,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);