BSD 4_3_Tahoe release

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

diff --git a/usr/src/usr.bin/tip/tip.c b/usr/src/usr.bin/tip/tip.c
index e36593a..019f29e 100644 (file)
--- a/usr/src/usr.bin/tip/tip.c
+++ b/usr/src/usr.bin/tip/tip.c
@@ -1,29 +1,18 @@
 /*
 /*

- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1983 The Regents of the University of California.\n\
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif /* not lint */
+#endif not lint

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)tip.c      5.8 (Berkeley) %G%";
-#endif /* not lint */
+static char sccsid[] = "@(#)tip.c      5.6 (Berkeley) 10/22/87";
+#endif not lint

 
 /*
  * tip - UNIX link to other systems
 
 /*
  * tip - UNIX link to other systems


@@ -128,7 +117,7 @@ notnumber:
        }
        if (i == -1) {
                printf("link down\n");
        }
        if (i == -1) {
                printf("link down\n");

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

                exit(3);
        }
        setbuf(stdout, NULL);
                exit(3);
        }
        setbuf(stdout, NULL);


@@ -144,7 +133,7 @@ notnumber:
        setparity("even");                      /* set the parity table */
        if ((i = speed(number(value(BAUDRATE)))) == NULL) {
                printf("tip: bad baud rate %d\n", number(value(BAUDRATE)));
        setparity("even");                      /* set the parity table */
        if ((i = speed(number(value(BAUDRATE)))) == NULL) {
                printf("tip: bad baud rate %d\n", number(value(BAUDRATE)));

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

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


@@ -167,7 +156,7 @@ notnumber:
        if (p = connect()) {
                printf("\07%s\n[EOT]\n", p);
                daemon_uid();
        if (p = connect()) {
                printf("\07%s\n[EOT]\n", p);
                daemon_uid();

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

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


@@ -213,7 +202,7 @@ cleanup()
 {
 
        daemon_uid();
 {
 
        daemon_uid();

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

        if (odisc)
                ioctl(0, TIOCSETD, (char *)&odisc);
        exit(0);
        if (odisc)
                ioctl(0, TIOCSETD, (char *)&odisc);
        exit(0);