summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-06-29 17:42:36 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-06-29 17:42:36 +0000
commit5cc52556d450b53a3b903e631ce6b9e97513a31b (patch)
treec211daad1dfaec3911a9a93c2444ce7b8db27a6d
parentdfcc5003e05d073e26e9cd3835c6a56816372e30 (diff)
Now that there is no dial-up support, all connections are hardwired so drop the
flag and ignore the -t option to cu(1).
-rw-r--r--usr.bin/tip/cu.14
-rw-r--r--usr.bin/tip/cu.c14
-rw-r--r--usr.bin/tip/hunt.c14
-rw-r--r--usr.bin/tip/remote.c10
-rw-r--r--usr.bin/tip/tip.c16
-rw-r--r--usr.bin/tip/tip.h3
6 files changed, 14 insertions, 47 deletions
diff --git a/usr.bin/tip/cu.1 b/usr.bin/tip/cu.1
index f6e7d2a95ca..849d4c60560 100644
--- a/usr.bin/tip/cu.1
+++ b/usr.bin/tip/cu.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cu.1,v 1.9 2010/06/29 17:35:11 nicm Exp $
+.\" $OpenBSD: cu.1,v 1.10 2010/06/29 17:42:35 nicm Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -100,8 +100,6 @@ are given, then no parity is used
.It Fl s Ar speed \*(Ba Fl Ar speed
Set the speed of the connection.
The default is 9600.
-.It Fl t
-Connect via a hard-wired connection to a host on a dial-up line.
.El
.Pp
Line access is logged to
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index 261242ca986..975835c3b5d 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cu.c,v 1.26 2010/06/29 16:41:56 nicm Exp $ */
+/* $OpenBSD: cu.c,v 1.27 2010/06/29 17:42:35 nicm Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
/*
@@ -105,7 +105,7 @@ getopt:
HD = TRUE;
break;
case 't':
- HW = 1;
+ /* Was for a hardwired dial-up connection. */
break;
case 'o':
if (parity != 0)
@@ -173,25 +173,19 @@ getopt:
break;
}
setboolean(value(VERBOSE), FALSE);
- if (HW && ttysetup(BR)) {
+ if (ttysetup(BR)) {
fprintf(stderr, "%s: unsupported speed %ld\n",
__progname, BR);
(void)uu_unlock(uucplock);
exit(3);
}
con();
- if (!HW && ttysetup(BR)) {
- fprintf(stderr, "%s: unsupported speed %ld\n",
- __progname, BR);
- (void)uu_unlock(uucplock);
- exit(3);
- }
}
static void
cuusage(void)
{
- fprintf(stderr, "usage: cu [-ehot] [-l line] "
+ fprintf(stderr, "usage: cu [-eho] [-l line] "
"[-s speed | -speed] [phone-number]\n");
exit(8);
}
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index f4a4c4c6c05..77aefe1bd0b 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hunt.c,v 1.14 2009/10/27 23:59:44 deraadt Exp $ */
+/* $OpenBSD: hunt.c,v 1.15 2010/06/29 17:42:35 nicm Exp $ */
/* $NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $ */
/*
@@ -59,18 +59,9 @@ hunt(char *name)
uucplock = cp;
else
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
- * order to get an open file descriptor placed in FD.
- * Otherwise, as for a DN-11, the open will have to
- * be done in the "open" routine.
- */
- if (!HW)
- break;
+
if (setjmp(deadline) == 0) {
alarm(10);
FD = open(cp, (O_RDWR |
@@ -92,6 +83,7 @@ hunt(char *name)
signal(SIGALRM, SIG_DFL);
return ((long)cp);
}
+
(void)uu_unlock(uucplock);
}
signal(SIGALRM, f);
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index e996118329d..b668f55c301 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.c,v 1.20 2010/06/29 16:41:56 nicm Exp $ */
+/* $OpenBSD: remote.c,v 1.21 2010/06/29 17:42:35 nicm Exp $ */
/* $NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $ */
/*
@@ -78,7 +78,6 @@ getremcap(char *host)
if ((DV != NULL) ||
(host[0] == '/' && access(DV = host, R_OK | W_OK) == 0)) {
HO = host;
- HW = 1;
if (!BR)
BR = DEFBR;
FS = DEFFS;
@@ -117,13 +116,8 @@ getremcap(char *host)
}
HD = cgetflag("hd");
-
- /*
- * This effectively eliminates the "hw" attribute
- * from the description file
- */
- HW = 1;
HO = host;
+
/*
* see if uppercase mode should be turned on initially
*/
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 268f93a339b..a604e66379c 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.c,v 1.40 2010/06/29 16:41:56 nicm Exp $ */
+/* $OpenBSD: tip.c,v 1.41 2010/06/29 17:42:35 nicm Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
/*
@@ -141,24 +141,14 @@ notnumber:
vinit(); /* init variables */
setparity("none"); /* set the parity table */
- /*
- * Hardwired connections require the
- * line speed set before they make any transmissions
- * (this is particularly true of things like a DF03-AC)
- */
- if (HW && ttysetup(number(value(BAUDRATE)))) {
+ if (ttysetup(number(value(BAUDRATE)))) {
fprintf(stderr, "%s: bad baud rate %ld\n", __progname,
number(value(BAUDRATE)));
(void)uu_unlock(uucplock);
exit(3);
}
con();
- if (!HW && ttysetup(number(value(BAUDRATE)))) {
- fprintf(stderr, "%s: bad baud rate %ld\n", __progname,
- number(value(BAUDRATE)));
- (void)uu_unlock(uucplock);
- exit(3);
- }
+
cucommon:
/*
* From here down the code is shared with
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 349df99d6f5..43bd2453ad8 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.h,v 1.36 2010/06/29 16:44:38 nicm Exp $ */
+/* $OpenBSD: tip.h,v 1.37 2010/06/29 17:42:35 nicm Exp $ */
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
/*
@@ -74,7 +74,6 @@ char *HO; /* host name */
long BR; /* line speed for conversation */
long FS; /* frame size for transfers */
-short HW; /* this device is hardwired, see hunt.c */
char *ES; /* escape character */
char *EX; /* exceptions */
char *FO; /* force (literal next) char*/