386BSD 0.1 development

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

diff --git a/usr/src/usr.bin/tip/cu.c b/usr/src/usr.bin/tip/cu.c
index 1bc0774..61b9cb1 100644 (file)
--- a/usr/src/usr.bin/tip/cu.c
+++ b/usr/src/usr.bin/tip/cu.c
@@ -1,9 +1,43 @@
-/*     cu.c    4.1     81/11/29        */
+/*
+ * 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
+static char sccsid[] = "@(#)cu.c       5.9 (Berkeley) 6/1/90";
+#endif /* not lint */

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

-int    cleanup();
-int    timeout();
+void   cleanup();

 
 /*
  * Botch the interface to look like cu's
 
 /*
  * Botch the interface to look like cu's


@@ -12,25 +46,18 @@ cumain(argc, argv)
        char *argv[];
 {
        register int i;
        char *argv[];
 {
        register int i;

+       static char sbuf[12];

 
 

-       signal(SIGINT, cleanup);
-       signal(SIGQUIT, cleanup);
-       signal(SIGHUP, cleanup);
-       signal(SIGTERM, cleanup);
-       setbuf(stdout, NULL);
-       loginit();
-       setuid(getuid());
-       setgid(getgid());
-       vinit();
-       boolean(value(VERBOSE)) = 0;

        if (argc < 2) {
        if (argc < 2) {

-               printf("usage: cu telno [-t] [-s speed] [-a acu] [-l line]\n");
+               printf("usage: cu telno [-t] [-s speed] [-a acu] [-l line] [-#]\n");

                exit(8);
        }
                exit(8);
        }

+       CU = DV = NOSTR;
+       BR = DEFBR;

        for (; argc > 1; argv++, argc--) {
                if (argv[1][0] != '-')
                        PN = argv[1];
        for (; argc > 1; argv++, argc--) {
                if (argv[1][0] != '-')
                        PN = argv[1];

-               else switch(argv[1][1]) {
+               else switch (argv[1][1]) {

 
                case 't':
                        HW = 1, DU = -1;
 
                case 't':
                        HW = 1, DU = -1;


@@ -42,8 +69,9 @@ cumain(argc, argv)
                        break;
 
                case 's':
                        break;
 
                case 's':

-                       if (speed(atoi(argv[2])) == 0) {
-                               printf("cu: unsupported speed %s\n", argv[2]);
+                       if (argc < 3 || speed(atoi(argv[2])) == 0) {
+                               fprintf(stderr, "cu: unsupported speed %s\n",
+                                       argv[2]);

                                exit(3);
                        }
                        BR = atoi(argv[2]); ++argv; --argc;
                                exit(3);
                        }
                        BR = atoi(argv[2]); ++argv; --argc;


@@ -55,7 +83,10 @@ cumain(argc, argv)
 
                case '0': case '1': case '2': case '3': case '4':
                case '5': case '6': case '7': case '8': case '9':
 
                case '0': case '1': case '2': case '3': case '4':
                case '5': case '6': case '7': case '8': case '9':

-                       CU[strlen(CU)-1] = argv[1][1];
+                       if (CU)
+                               CU[strlen(CU)-1] = argv[1][1];
+                       if (DV)
+                               DV[strlen(DV)-1] = argv[1][1];

                        break;
 
                default:
                        break;
 
                default:


@@ -63,24 +94,37 @@ cumain(argc, argv)
                        break;
                }
        }
                        break;
                }
        }

+       signal(SIGINT, cleanup);
+       signal(SIGQUIT, cleanup);
+       signal(SIGHUP, cleanup);
+       signal(SIGTERM, cleanup);
+

        /*
         * The "cu" host name is used to define the
         * attributes of the generic dialer.
         */
        /*
         * The "cu" host name is used to define the
         * attributes of the generic dialer.
         */

-       if ((i = hunt("cu")) == 0) {
+       (void)sprintf(sbuf, "cu%d", BR);
+       if ((i = hunt(sbuf)) == 0) {

                printf("all ports busy\n");
                exit(3);
        }
        if (i == -1) {
                printf("link down\n");
                printf("all ports busy\n");
                exit(3);
        }
        if (i == -1) {
                printf("link down\n");

-               delock(uucplock);
+               (void)uu_unlock(uucplock);

                exit(3);
        }
                exit(3);
        }

+       setbuf(stdout, NULL);
+       loginit();
+       user_uid();
+       vinit();
+       setparity("none");
+       boolean(value(VERBOSE)) = 0;

        if (HW)
                ttysetup(speed(BR));
        if (connect()) {
                printf("Connect failed\n");
        if (HW)
                ttysetup(speed(BR));
        if (connect()) {
                printf("Connect failed\n");

-               delock(uucplock);
+               daemon_uid();
+               (void)uu_unlock(uucplock);

                exit(1);
        }
        if (!HW)
                exit(1);
        }
        if (!HW)