from natano:

_PATH_BSHELL, _PATH_SENDMAIL, _PATH_TMP and _PATH_TTY are defined in
<paths.h> and _PATH_SYSV_TTY is unused. All of them can be removed from
pathnames.h. The other defines can be made unconditionally.

6 files changed, 11 insertions, 47 deletions

diff --git a/usr.bin/vi/build/pathnames.h b/usr.bin/vi/build/pathnames.h
index 7303aae7f17..83515da4628 100644
--- a/usr.bin/vi/build/pathnames.h
+++ b/usr.bin/vi/build/pathnames.h
@@ -1,46 +1,9 @@
-/*	$OpenBSD: pathnames.h,v 1.3 1997/07/27 22:27:54 downsj Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.4 2014/11/14 20:27:03 tedu Exp $	*/
 /* @(#)pathnames.h.in	8.4 (Berkeley) 6/26/96 */
 
-#ifndef	_PATH_BSHELL
-#define	_PATH_BSHELL	"/bin/sh"
-#endif
-
-#ifndef	_PATH_EXRC
 #define	_PATH_EXRC	".exrc"
-#endif
-
-#ifndef	_PATH_MSGCAT
 #define	_PATH_MSGCAT	"/usr/share/vi/catalog/"
-#endif
-
-#ifndef	_PATH_NEXRC
 #define	_PATH_NEXRC	".nexrc"
-#endif
-
-#ifndef	_PATH_PRESERVE
 #define	_PATH_PRESERVE	"/var/tmp/vi.recover"
-#endif
-
-#ifndef _PATH_SYSV_PTY
-#define	_PATH_SYSV_PTY	"/dev/ptmx"
-#endif
-
-#ifndef	_PATH_SENDMAIL
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
-#endif
-
-#ifndef	_PATH_SYSEXRC
 #define	_PATH_SYSEXRC	"/etc/vi.exrc"
-#endif
-
-#ifndef	_PATH_TAGS
 #define	_PATH_TAGS	"tags"
-#endif
-
-#ifndef	_PATH_TMP
-#define	_PATH_TMP	"/tmp"
-#endif
-
-#ifndef	_PATH_TTY
-#define	_PATH_TTY	"/dev/tty"
-#endif
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index 20aba143893..ec0122a7bd4 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl_main.c,v 1.23 2014/11/12 16:29:04 millert Exp $	*/
+/*	$OpenBSD: cl_main.c,v 1.24 2014/11/14 20:27:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -18,6 +18,7 @@
 #include <curses.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +29,6 @@
 
 #include "../common/common.h"
 #include "cl.h"
-#include "pathnames.h"
 
 GS *__global_list;				/* GLOBAL: List of screens. */
 sigset_t __sigblockset;				/* GLOBAL: Blocked signals. */
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index b7a77ef5c90..0920a00e8c0 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.23 2014/11/12 04:28:41 bentley Exp $	*/
+/*	$OpenBSD: main.c,v 1.24 2014/11/14 20:27:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,7 +28,6 @@
 
 #include "common.h"
 #include "../vi/vi.h"
-#include "pathnames.h"
 
 #ifdef DEBUG
 static void	 attach(GS *);
diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index 9bbc32680c2..c5347477ea6 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.17 2014/11/12 04:28:41 bentley Exp $	*/
+/*	$OpenBSD: options.c,v 1.18 2014/11/14 20:27:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -20,6 +20,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/vi/common/recover.c b/usr.bin/vi/common/recover.c
index 712de8a3f89..b66dfd225ba 100644
--- a/usr.bin/vi/common/recover.c
+++ b/usr.bin/vi/common/recover.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: recover.c,v 1.18 2014/11/12 16:29:04 millert Exp $	*/
+/*	$OpenBSD: recover.c,v 1.19 2014/11/14 20:27:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <paths.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,7 +36,6 @@
 #include <unistd.h>
 
 #include "common.h"
-#include "pathnames.h"
 
 /*
  * Recovery code.
diff --git a/usr.bin/vi/ex/ex_cscope.c b/usr.bin/vi/ex/ex_cscope.c
index bb9f2546b8e..757b741ca69 100644
--- a/usr.bin/vi/ex/ex_cscope.c
+++ b/usr.bin/vi/ex/ex_cscope.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_cscope.c,v 1.22 2014/11/12 16:29:04 millert Exp $	*/
+/*	$OpenBSD: ex_cscope.c,v 1.23 2014/11/14 20:27:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1994, 1996
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <paths.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,7 +31,6 @@
 #include <unistd.h>
 
 #include "../common/common.h"
-#include "pathnames.h"
 #include "tag.h"
 
 #define	CSCOPE_DBFILE		"cscope.out"