X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/95f51977ddc18faa2e212f30c00a39540b39f325..638231e6203d8d8447c87fcb959bb90da83f521f:/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 a25cb3202b..61b9cb1498 100644
--- a/usr/src/usr.bin/tip/cu.c
+++ b/usr/src/usr.bin/tip/cu.c
@@ -1,17 +1,43 @@
 /*
- * 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
-static char sccsid[] = "@(#)cu.c	5.2 (Berkeley) 1/13/86";
-#endif not lint
+static char sccsid[] = "@(#)cu.c	5.9 (Berkeley) 6/1/90";
+#endif /* not lint */
 
 #include "tip.h"
 
-int	cleanup();
-int	timeout();
+void	cleanup();
 
 /*
  * Botch the interface to look like cu's
@@ -27,6 +53,7 @@ cumain(argc, argv)
 		exit(8);
 	}
 	CU = DV = NOSTR;
+	BR = DEFBR;
 	for (; argc > 1; argv++, argc--) {
 		if (argv[1][0] != '-')
 			PN = argv[1];
@@ -42,7 +69,7 @@ cumain(argc, argv)
 			break;
 
 		case 's':
-			if (speed(atoi(argv[2])) == 0) {
+			if (argc < 3 || speed(atoi(argv[2])) == 0) {
 				fprintf(stderr, "cu: unsupported speed %s\n",
 					argv[2]);
 				exit(3);
@@ -76,23 +103,19 @@ cumain(argc, argv)
 	 * The "cu" host name is used to define the
 	 * attributes of the generic dialer.
 	 */
-	if ((i = hunt(sprintf(sbuf, "cu%d", BR))) == 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");
-		delock(uucplock);
+		(void)uu_unlock(uucplock);
 		exit(3);
 	}
 	setbuf(stdout, NULL);
 	loginit();
-	gid = getgid();
-	egid = getegid();
-	uid = getuid();
-	euid = geteuid();
-	setregid(egid, gid);
-	setreuid(euid, uid);
+	user_uid();
 	vinit();
 	setparity("none");
 	boolean(value(VERBOSE)) = 0;
@@ -100,9 +123,8 @@ cumain(argc, argv)
 		ttysetup(speed(BR));
 	if (connect()) {
 		printf("Connect failed\n");
-		setreuid(uid, euid);
-		setregid(gid, egid);
-		delock(uucplock);
+		daemon_uid();
+		(void)uu_unlock(uucplock);
 		exit(1);
 	}
 	if (!HW)