Merge almost-empty pathnames.h into tip.h.

6 files changed, 12 insertions, 48 deletions

diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 509aab22514..c7c96288862 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.41 2010/07/01 21:43:38 nicm Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.42 2010/07/02 07:32:16 nicm Exp $	*/
 /*	$NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  */
 
 #include "tip.h"
-#include "pathnames.h"
 
+#include <paths.h>
 #include <util.h>
 #include <vis.h>
 
diff --git a/usr.bin/tip/pathnames.h b/usr.bin/tip/pathnames.h
deleted file mode 100644
index 3369ad60074..00000000000
--- a/usr.bin/tip/pathnames.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$OpenBSD: pathnames.h,v 1.5 2010/06/29 20:09:39 nicm Exp $	*/
-/*	$NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	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. 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.
- *
- *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
- */
-
-#include <paths.h>
-
-#define	_PATH_ACULOG	"/var/log/aculog"
-#define	_PATH_REMOTE	"/etc/remote"
diff --git a/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index e4c7d519462..def7c84d4d8 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: remote.c,v 1.30 2010/07/02 05:56:29 nicm Exp $	*/
+/*	$OpenBSD: remote.c,v 1.31 2010/07/02 07:32:16 nicm Exp $	*/
 /*	$NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $	*/
 
 /*
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "pathnames.h"
 #include "tip.h"
 
 static char	*db_array[3] = { _PATH_REMOTE, 0, 0 };
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 1272ec71738..e2817c26a6f 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.c,v 1.50 2010/07/02 05:52:48 nicm Exp $	*/
+/*	$OpenBSD: tip.c,v 1.51 2010/07/02 07:32:16 nicm Exp $	*/
 /*	$NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $	*/
 
 /*
@@ -43,7 +43,6 @@
 #include <util.h>
 
 #include "tip.h"
-#include "pathnames.h"
 
 static void	intprompt(int);
 static void	tipin(void);
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index d2ef1cddf6b..61126f1784d 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tip.h,v 1.51 2010/07/02 05:56:29 nicm Exp $	*/
+/*	$OpenBSD: tip.h,v 1.52 2010/07/02 07:32:16 nicm Exp $	*/
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
 
 /*
@@ -56,6 +56,10 @@
 #include <err.h>
 #include <limits.h>
 
+/* tip paths. */
+#define _PATH_ACULOG "/var/log/aculog"
+#define _PATH_REMOTE "/etc/remote"
+
 /* Variable table entry. */
 typedef	struct {
 	char	*v_name;	/* variable name */
@@ -142,7 +146,6 @@ int	gotdefterm;
 FILE	*fscript;		/* FILE for scripting */
 
 int	FD;			/* open file descriptor to remote host */
-int	AC;			/* open file descriptor to dialer (v831 only) */
 int	vflag;			/* print .tiprc initialization sequence */
 int	noesc;			/* no `~' escape char */
 int	sfd;			/* for ~< operation */
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index 4020d51517d..140ccd40557 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vars.c,v 1.17 2010/07/01 21:43:38 nicm Exp $	*/
+/*	$OpenBSD: vars.c,v 1.18 2010/07/02 07:32:16 nicm Exp $	*/
 /*	$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $	*/
 
 /*
@@ -31,7 +31,8 @@
  */
 
 #include "tip.h"
-#include "pathnames.h"
+
+#include <paths.h>
 
 /*
  * Definition of variables