Since dial-up is no longer supported, no need to store a phone number, or

accept one to cu(1).

5 files changed, 9 insertions, 35 deletions

diff --git a/usr.bin/tip/cu.1 b/usr.bin/tip/cu.1
index 777052ccadd..de31dc7de69 100644
--- a/usr.bin/tip/cu.1
+++ b/usr.bin/tip/cu.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cu.1,v 1.11 2010/06/29 20:47:33 jmc Exp $
+.\"	$OpenBSD: cu.1,v 1.12 2010/06/29 23:32:52 nicm Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,6 @@
 .Op Fl eho
 .Op Fl l Ar line
 .Op Fl s Ar speed \*(Ba Fl Ar speed
-.Op Ar phone-number
 .Sh DESCRIPTION
 .Nm
 is used to connect to another system over a serial link.
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index b189d2d1f4b..b696b12da1a 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cu.c,v 1.29 2010/06/29 23:10:56 nicm Exp $	*/
+/*	$OpenBSD: cu.c,v 1.30 2010/06/29 23:32:52 nicm Exp $	*/
 /*	$NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $	*/
 
 /*
@@ -130,8 +130,7 @@ getopt:
 
 	switch (argc) {
 	case 1:
-		PN = argv[0];
-		break;
+		/* Was phone number but now ignored. */
 	case 0:
 		break;
 	default:
@@ -186,7 +185,6 @@ getopt:
 static void
 cuusage(void)
 {
-	fprintf(stderr, "usage: cu [-eho] [-l line] "
-	    "[-s speed | -speed] [phone-number]\n");
+	fprintf(stderr, "usage: cu [-eho] [-l line] [-s speed | -speed]\n");
 	exit(8);
 }
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index 1ef94689e93..8186a5cd1c1 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remote.c,v 1.23 2010/06/29 23:20:38 nicm Exp $	*/
+/*	$OpenBSD: remote.c,v 1.24 2010/06/29 23:32:52 nicm Exp $	*/
 /*	$NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $	*/
 
 /*
@@ -42,11 +42,11 @@
  *   data base.
  */
 static char **caps[] = {
-	&DV, &CM, &PN, &DI, 0
+	&DV, &CM, &DI, 0
 };
 
 static char *capstrings[] = {
-	"dv", "cm", "pn", "di", 0
+	"dv", "cm", "di", 0
 };
 
 static char	*db_array[3] = { _PATH_REMOTE, 0, 0 };
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 9dfa71f4c79..c90a63fea69 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.c,v 1.43 2010/06/29 23:10:56 nicm Exp $	*/
+/*	$OpenBSD: tip.c,v 1.44 2010/06/29 23:32:52 nicm Exp $	*/
 /*	$NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $	*/
 
 /*
@@ -99,28 +99,6 @@ main(int argc, char *argv[])
 		}
 	}
 
-	if (sys == NULL)
-		goto notnumber;
-	if (isalpha(*sys))
-		goto notnumber;
-	/*
-	 * System name is really a phone number...
-	 * Copy the number then stomp on the original (in case the number
-	 *	is private, we don't want 'ps' or 'w' to find it).
-	 */
-	if (strlen(sys) > sizeof PNbuf - 1) {
-		fprintf(stderr, "%s: phone number too long (max = %d bytes)\n",
-			__progname, (int)sizeof(PNbuf) - 1);
-		exit(1);
-	}
-	strlcpy(PNbuf, sys, sizeof PNbuf - 1);
-	for (p = sys; *p; p++)
-		*p = '\0';
-	PN = PNbuf;
-	(void)snprintf(sbuf, sizeof(sbuf), "tip%ld", number(value(BAUDRATE)));
-	sys = sbuf;
-
-notnumber:
 	(void)signal(SIGINT, cleanup);
 	(void)signal(SIGQUIT, cleanup);
 	(void)signal(SIGHUP, cleanup);
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index 074d33df42a..7651630d794 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.h,v 1.43 2010/06/29 23:20:38 nicm Exp $	*/
+/*	$OpenBSD: tip.h,v 1.44 2010/06/29 23:32:52 nicm Exp $	*/
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
 
 /*
@@ -61,7 +61,6 @@
  */
 char	*DV;			/* UNIX device(s) to open */
 char	*CM;			/* initial connection message */
-char	*PN;			/* phone number(s) */
 char	*DI;			/* disconnect string */
 
 /*