Nuke -DCONNECT and -DACULOG which we always set, also trim huge useless comment

from Makefile.

5 files changed, 6 insertions, 33 deletions

diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile
index e83ece49908..c3168f542c2 100644
--- a/usr.bin/tip/Makefile
+++ b/usr.bin/tip/Makefile
@@ -1,24 +1,9 @@
-#	$OpenBSD: Makefile,v 1.12 2010/06/29 16:41:56 nicm Exp $
-#
-# Files are:
-#	/etc/remote		remote host description file
-#	/var/log/aculog		ACU accounting file, owned by ${OWNER} and
-#				mode 6?? {if ACULOG defined}
-#
-# Configuration defines:
-#	ACULOG			turn on tip logging of ACU use
-#	CONNECT			worthless command
-#	DEFBR			default baud rate to make connection at
-#	DEFFS			default frame size for FTP buffering of
-#				writes on local side
-#	BUFSIZ			buffer sizing from stdio, must be fed
-#				explicitly to remcap.c if not 1024
-#	CONNECT			enable ~C command (connect pgm to remote)
+#	$OpenBSD: Makefile,v 1.13 2010/06/29 16:44:38 nicm Exp $
 
 PROG=	tip
 LINKS=	${BINDIR}/tip ${BINDIR}/cu
 MAN=	tip.1 cu.1
-CFLAGS+=-I${.CURDIR} -DDEFBR=9600 -DDEFFS=BUFSIZ -DACULOG -DCONNECT
+CFLAGS+=-I${.CURDIR} -DDEFBR=9600 -DDEFFS=BUFSIZ
 SRCS=	cmds.c cmdtab.c cu.c hunt.c log.c partab.c remote.c tip.c \
 	tipout.c uucplock.c value.c vars.c
 
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 6615f84e495..777fdca7e3d 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.33 2010/06/29 16:41:56 nicm Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.34 2010/06/29 16:44:38 nicm Exp $	*/
 /*	$NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $	*/
 
 /*
@@ -511,7 +511,6 @@ pipeout(int c)
 	signal(SIGQUIT, SIG_DFL);
 }
 
-#ifdef CONNECT
 /*
  * Fork a program with:
  *  0 <-> remote tty in
@@ -561,7 +560,6 @@ consh(int c)
 	signal(SIGINT, SIG_DFL);
 	signal(SIGQUIT, SIG_DFL);
 }
-#endif
 
 /*
  * Escape to local shell
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 7276df62579..74d8827e096 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.9 2009/12/12 18:14:00 nicm Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.10 2010/06/29 16:44:38 nicm Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $	*/
 
 /*
@@ -40,9 +40,7 @@ esctable_t etable[] = {
 	{ 'p',		"put file to remote UNIX",		cu_put },
 	{ '|',		"pipe remote file",			pipefile },
 	{ '$',		"pipe local command to remote host",	pipeout },
-#ifdef CONNECT
 	{ 'C',  	"connect program to remote host",	consh },
-#endif
 	{ 'c',		"change directory",		 	chdirectory },
 	{ '.',		"exit from tip",			finish },
 	{ CTRL('d'),	"exit from tip",			finish },
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index b66d0f9770d..106b8060e9e 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.11 2010/06/29 16:41:56 nicm Exp $	*/
+/*	$OpenBSD: log.c,v 1.12 2010/06/29 16:44:38 nicm Exp $	*/
 /*	$NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $	*/
 
 /*
@@ -32,7 +32,6 @@
 
 #include "tip.h"
 
-#ifdef ACULOG
 static	FILE *flog = NULL;
 
 /*
@@ -74,4 +73,3 @@ loginit(void)
 	if (flog == NULL)
 		fprintf(stderr, "can't open log file %s.\r\n", value(LOG));
 }
-#endif
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index cc43e36c17c..349df99d6f5 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.h,v 1.35 2010/06/29 16:41:56 nicm Exp $	*/
+/*	$OpenBSD: tip.h,v 1.36 2010/06/29 16:44:38 nicm Exp $	*/
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
 
 /*
@@ -159,16 +159,10 @@ extern int	vflag;		/* verbose during reading of .tiprc file */
 extern int	noesc;		/* no escape `~' char */
 extern value_t	vtable[];	/* variable table */
 
-#ifndef ACULOG
-#define logent(a, b, c)
-#define loginit()
-#endif
-
 /*
  * Definition of indices into variable table so
  *  value(DEFINE) turns into a static address.
  */
-
 enum {
 	BEAUTIFY = 0,
 	BAUDRATE,