BSD 4_3_Tahoe 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 6094c8a..1cc74cc 100644 (file)
--- a/usr/src/usr.bin/tip/acu.c
+++ b/usr/src/usr.bin/tip/acu.c
@@ -1,6 +1,14 @@
-/*     acu.c   4.2     81/10/02        */
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)acu.c      5.5 (Berkeley) 12/4/87";
+#endif not lint
+

 #include "tip.h"
 #include "tip.h"

-#include <setjmp.h>

 
 static acu_t *acu = NOACU;
 static int conflag;
 
 static acu_t *acu = NOACU;
 static int conflag;


@@ -33,8 +41,9 @@ connect()
 
        if (!DU) {              /* regular connect message */
                if (CM != NOSTR)
 
        if (!DU) {              /* regular connect message */
                if (CM != NOSTR)

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

        }
        /*
         * @ =>'s use data base in PHONES environment variable
        }
        /*
         * @ =>'s use data base in PHONES environment variable


@@ -50,41 +59,41 @@ 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)
        }
        if ((acu = acutype(AT)) == NOACU)

-               return("unknown ACU type");
+               return ("unknown ACU type");

        if (*cp != '@') {
                while (*cp) {
        if (*cp != '@') {
                while (*cp) {

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

                                ;
                                ;

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

                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");

-                               return(NOSTR);
+                               return (NOSTR);

                        } else
                                logent(value(HOST), phnum, acu->acu_name,
                        } else
                                logent(value(HOST), phnum, acu->acu_name,

-                                       "no answer");
+                                       "call failed");

                        tried++;
                }
        } else {
                if ((fd = fopen(PH, "r")) == NOFILE) {
                        printf("%s: ", PH);
                        tried++;
                }
        } else {
                if ((fd = fopen(PH, "r")) == NOFILE) {
                        printf("%s: ", PH);

-                       return("can't open phone number file");
+                       return ("can't open phone number file");

                }
                while (fgets(string, sizeof(string), fd) != NOSTR) {
                        for (cp = string; !any(*cp, " \t\n"); cp++)
                                ;
                        if (*cp == '\n') {
                                fclose(fd);
                }
                while (fgets(string, sizeof(string), fd) != NOSTR) {
                        for (cp = string; !any(*cp, " \t\n"); cp++)
                                ;
                        if (*cp == '\n') {
                                fclose(fd);

-                               return("unrecognizable host name");
+                               return ("unrecognizable host name");

                        }
                        *cp++ = '\0';
                        if (strcmp(string, value(HOST)))
                        }
                        *cp++ = '\0';
                        if (strcmp(string, value(HOST)))


@@ -93,36 +102,45 @@ connect()
                                cp++;
                        if (*cp == '\n') {
                                fclose(fd);
                                cp++;
                        if (*cp == '\n') {
                                fclose(fd);

-                               return("missing phone number");
+                               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);
                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");
                        
                        if (conflag = (*acu->acu_dialer)(phnum, CU)) {
                                fclose(fd);
                                logent(value(HOST), phnum, acu->acu_name,
                                        "call completed");

-                               return(NOSTR);
+                               return (NOSTR);

                        } else
                                logent(value(HOST), phnum, acu->acu_name,
                        } else
                                logent(value(HOST), phnum, acu->acu_name,

-                                       "no answer");
+                                       "call failed");

                        tried++;
                }
                fclose(fd);
        }
        if (!tried)
                logent(value(HOST), "", acu->acu_name, "missing phone number");
                        tried++;
                }
                fclose(fd);
        }
        if (!tried)
                logent(value(HOST), "", acu->acu_name, "missing phone number");

-       return(tried ? "no answer" : "missing phone number");
+       else
+               (*acu->acu_abort)();
+       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)();
 }
 


@@ -130,18 +148,18 @@ static int
 acuabort(s)
 {
        signal(s, SIG_IGN);
 acuabort(s)
 {
        signal(s, SIG_IGN);

-       longjmp(jmpbuf);
+       longjmp(jmpbuf, 1);

 }
 
 static acu_t *
 acutype(s)
 }
 
 static acu_t *
 acutype(s)

-register char *s;
+       register char *s;

 {
        register acu_t *p;
        extern acu_t acutable[];
 
        for (p = acutable; p->acu_name != '\0'; p++)
                if (!strcmp(s, p->acu_name))
 {
        register acu_t *p;
        extern acu_t acutable[];
 
        for (p = acutable; p->acu_name != '\0'; p++)
                if (!strcmp(s, p->acu_name))

-                       return(p);
-       return(NOACU);
+                       return (p);
+       return (NOACU);

 }
 }