X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/95f51977ddc18faa2e212f30c00a39540b39f325..4b3ef9ea1186109b3d77e078b30d80e95d307baf:/usr/src/usr.bin/tip/hunt.c

diff --git a/usr/src/usr.bin/tip/hunt.c b/usr/src/usr.bin/tip/hunt.c
index 3de4cbcbf4..49a633d485 100644
--- a/usr/src/usr.bin/tip/hunt.c
+++ b/usr/src/usr.bin/tip/hunt.c
@@ -1,12 +1,39 @@
 /*
- * 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[] = "@(#)hunt.c	5.1 (Berkeley) 4/30/85";
-#endif not lint
+static char sccsid[] = "@(#)hunt.c	5.6 (Berkeley) 6/1/90";
+#endif /* not lint */
 
 #include "tip.h"
 
@@ -16,9 +43,9 @@ extern char *rindex();
 static	jmp_buf deadline;
 static	int deadfl;
 
+void
 dead()
 {
-
 	deadfl = 1;
 	longjmp(deadline, 1);
 }
@@ -27,16 +54,14 @@ hunt(name)
 	char *name;
 {
 	register char *cp;
-	int (*f)();
+	sig_t f;
 
 	f = signal(SIGALRM, dead);
-	deadfl = 0;
 	while (cp = getremote(name)) {
+		deadfl = 0;
 		uucplock = rindex(cp, '/')+1;
-		if (mlock(uucplock) < 0) {
-			delock(uucplock);
+		if (uu_lock(uucplock) < 0)
 			continue;
-		}
 		/*
 		 * Straight through call units, such as the BIZCOMP,
 		 * VADIC and the DF, must indicate they're hardwired in
@@ -61,7 +86,7 @@ hunt(name)
 			signal(SIGALRM, SIG_DFL);
 			return ((int)cp);
 		}
-		delock(uucplock);
+		(void)uu_unlock(uucplock);
 	}
 	signal(SIGALRM, f);
 	return (deadfl ? -1 : (int)cp);