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 0ee72b7..da958b9 100644 (file)
--- a/usr/src/usr.bin/tip/acu.c
+++ b/usr/src/usr.bin/tip/acu.c
@@ -1,12 +1,45 @@
+/*
+ * 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      4.10 (Berkeley) %G%";
-#endif
+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;
 /*


@@ -35,7 +68,8 @@ connect()
 
        if (!DU) {              /* regular connect message */
                if (CM != NOSTR)
 
        if (!DU) {              /* regular connect message */
                if (CM != NOSTR)

-                       pwrite(FD, cp, size(CM));
+                       pwrite(FD, CM, size(CM));
+               logent(value(HOST), "", DV, "call completed");

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


@@ -52,18 +86,17 @@ connect()
                if (acu != NOACU) {
                        boolean(value(VERBOSE)) = FALSE;
                        if (conflag)
                if (acu != NOACU) {
                        boolean(value(VERBOSE)) = FALSE;
                        if (conflag)

-                               disconnect();
+                               disconnect(NOSTR);

                        else
                                (*acu->acu_abort)();
                }
                        else
                                (*acu->acu_abort)();
                }

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

        }
        if ((acu = acutype(AT)) == NOACU)
                return ("unknown ACU type");
        if (*cp != '@') {
                while (*cp) {
        }
        if ((acu = acutype(AT)) == NOACU)
                return ("unknown ACU type");
        if (*cp != '@') {
                while (*cp) {

-                       for (phnum = cp; any(*cp, "0123456789-*=K"); cp++)
+                       for (phnum = cp; *cp && *cp != ','; cp++)

                                ;
                        if (*cp)
                                *cp++ = '\0';
                                ;
                        if (*cp)
                                *cp++ = '\0';


@@ -98,9 +131,10 @@ connect()
                                fclose(fd);
                                return ("missing phone number");
                        }
                                fclose(fd);
                                return ("missing phone number");
                        }

-                       for (phnum = cp; any(*cp, "0123456789-*="); cp++)
+                       for (phnum = cp; *cp && *cp != ',' && *cp != '\n'; cp++)

                                ;
                                ;

-                       *cp = '\0';
+                       if (*cp)
+                               *cp++ = '\0';

                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                fclose(fd);
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                fclose(fd);


@@ -121,17 +155,23 @@ connect()
        return (tried ? "call failed" : "missing phone number");
 }
 
        return (tried ? "call failed" : "missing phone number");
 }
 

-disconnect()
+disconnect(reason)
+       char *reason;

 {
 {

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

                return;
                return;

-       logent(value(HOST), "", acu->acu_name, "call terminated");
-       if (boolean(value(VERBOSE)))
-               printf("\r\ndisconnecting...");
+       }
+       if (reason == NOSTR) {
+               logent(value(HOST), "", acu->acu_name, "call terminated");
+               if (boolean(value(VERBOSE)))
+                       printf("\r\ndisconnecting...");
+       } else 
+               logent(value(HOST), "", acu->acu_name, reason);

        (*acu->acu_disconnect)();
 }
 
        (*acu->acu_disconnect)();
 }
 

-static int
+static void

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