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.

1 files changed, 1 insertions, 38 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