386BSD 0.1 development

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

diff --git a/usr/src/usr.bin/tip/remote.c b/usr/src/usr.bin/tip/remote.c
index 8dd9e9f..62219b3 100644 (file)
--- a/usr/src/usr.bin/tip/remote.c
+++ b/usr/src/usr.bin/tip/remote.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
  */
 
 #ifndef lint

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

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


@@ -37,6 +64,17 @@ getremcap(host)
        register char **p, ***q;
 
        if ((stat = rgetent(tbuf, host)) <= 0) {
        register char **p, ***q;
 
        if ((stat = rgetent(tbuf, host)) <= 0) {

+               if (DV ||
+                   host[0] == '/' && access(DV = host, R_OK | W_OK) == 0) {
+                       CU = DV;
+                       HO = host;
+                       HW = 1;
+                       DU = 0;
+                       if (!BR)
+                               BR = DEFBR;
+                       FS = DEFFS;
+                       return;
+               }

                fprintf(stderr, stat == 0 ?
                        "tip: unknown host %s\n" :
                        "tip: can't open host description file\n", host);
                fprintf(stderr, stat == 0 ?
                        "tip: unknown host %s\n" :
                        "tip: can't open host description file\n", host);


@@ -101,9 +139,9 @@ getremcap(host)
                boolean(value(RAWFTP)) = 1;
        if (rgetflag("hd"))
                boolean(value(HALFDUPLEX)) = 1;
                boolean(value(RAWFTP)) = 1;
        if (rgetflag("hd"))
                boolean(value(HALFDUPLEX)) = 1;

-       if (*RE == NULL)
+       if (RE == NOSTR)

                RE = (char *)"tip.record";
                RE = (char *)"tip.record";

-       if (*EX == NULL)
+       if (EX == NOSTR)

                EX = (char *)"\t\n\b\f";
        if (ES != NOSTR)
                vstring("es", ES);
                EX = (char *)"\t\n\b\f";
        if (ES != NOSTR)
                vstring("es", ES);