Centralize _PATH_* definitions.

Submitted by:	Tim Kientzle <kientzle@acm.org> (embellished by me)

3 files changed, 2 insertions, 40 deletions

diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 70b92d4..009ce51 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -67,8 +67,6 @@ __FBSDID("$FreeBSD$");
 #include <sysexits.h>
 #include <unistd.h>
 
-#include "pathnames.h"
-
 int fflg, iflg, nflg, vflg;
 
 int	copy(char *, char *);
diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h
deleted file mode 100644
index 2692ded..0000000
--- a/bin/mv/pathnames.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. 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) 5/31/93
- * $FreeBSD$
- */
-
-#define	_PATH_RM	"/bin/rm"
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 1893d77..508867f 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <unistd.h>
 #include <stdlib.h>
+#include <paths.h>
 
 /*
  * Shell variables.
@@ -105,7 +106,7 @@ const struct varinit varinit[] = {
 	  NULL },
 	{ &vmpath,	VSTRFIXED|VTEXTFIXED|VUNSET,	"MAILPATH=",
 	  NULL },
-	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=/bin:/usr/bin",
+	{ &vpath,	VSTRFIXED|VTEXTFIXED,		"PATH=" _PATH_DEFPATH,
 	  changepath },
 	{ &vppid,	VSTRFIXED|VTEXTFIXED|VUNSET,	"PPID=",
 	  NULL },