BSD 4_3_Net_2 release

[unix-history] / 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 adac659..49a633d 100644 (file)
--- a/usr/src/usr.bin/tip/hunt.c
+++ b/usr/src/usr.bin/tip/hunt.c
@@ -1,6 +1,39 @@
+/*
+ * 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
 #ifndef lint

-static char sccsid[] = "@(#)hunt.c     4.7 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)hunt.c     5.6 (Berkeley) 6/1/90";
+#endif /* not lint */

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


@@ -10,9 +43,9 @@ extern char *rindex();
 static jmp_buf deadline;
 static int deadfl;
 
 static jmp_buf deadline;
 static int deadfl;
 

+void

 dead()
 {
 dead()
 {

-

        deadfl = 1;
        longjmp(deadline, 1);
 }
        deadfl = 1;
        longjmp(deadline, 1);
 }


@@ -21,16 +54,14 @@ hunt(name)
        char *name;
 {
        register char *cp;
        char *name;
 {
        register char *cp;

-       int (*f)();
+       sig_t f;

 
        f = signal(SIGALRM, dead);
 
        f = signal(SIGALRM, dead);

-       deadfl = 0;

        while (cp = getremote(name)) {
        while (cp = getremote(name)) {

+               deadfl = 0;

                uucplock = rindex(cp, '/')+1;
                uucplock = rindex(cp, '/')+1;

-               if (mlock(uucplock) < 0) {
-                       delock(uucplock);
+               if (uu_lock(uucplock) < 0)

                        continue;
                        continue;

-               }

                /*
                 * Straight through call units, such as the BIZCOMP,
                 * VADIC and the DF, must indicate they're hardwired in
                /*
                 * Straight through call units, such as the BIZCOMP,
                 * VADIC and the DF, must indicate they're hardwired in


@@ -45,13 +76,17 @@ hunt(name)
                        FD = open(cp, O_RDWR);
                }
                alarm(0);
                        FD = open(cp, O_RDWR);
                }
                alarm(0);

+               if (FD < 0) {
+                       perror(cp);
+                       deadfl = 1;
+               }

                if (!deadfl) {
                        ioctl(FD, TIOCEXCL, 0);
                        ioctl(FD, TIOCHPCL, 0);
                        signal(SIGALRM, SIG_DFL);
                        return ((int)cp);
                }
                if (!deadfl) {
                        ioctl(FD, TIOCEXCL, 0);
                        ioctl(FD, TIOCHPCL, 0);
                        signal(SIGALRM, SIG_DFL);
                        return ((int)cp);
                }

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

        }
        signal(SIGALRM, f);
        return (deadfl ? -1 : (int)cp);
        }
        signal(SIGALRM, f);
        return (deadfl ? -1 : (int)cp);