aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2003-05-05 22:49:23 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2003-05-05 22:49:23 +0000
commit8d5c19ffbccf759faae955929ac28c0d0252cf78 (patch)
tree98ff85a15a26642640d555e4b28d599d775702fe
parentbedb455962e86ad0b0160b1bc6d7ceb499e07e27 (diff)
downloadsrc-8d5c19ffbccf759faae955929ac28c0d0252cf78.tar.gz
src-8d5c19ffbccf759faae955929ac28c0d0252cf78.zip
Centralize _PATH_* definitions.
Submitted by: Tim Kientzle <kientzle@acm.org> (embellished by me)
Notes
Notes: svn path=/head/; revision=114763
-rw-r--r--bin/mv/mv.c2
-rw-r--r--bin/mv/pathnames.h37
-rw-r--r--bin/sh/var.c3
-rw-r--r--contrib/isc-dhcp/client/clparse.c2
-rw-r--r--contrib/tar/src/buffer.c8
-rw-r--r--include/paths.h4
-rw-r--r--sbin/shutdown/pathnames.h41
-rw-r--r--sbin/shutdown/shutdown.c3
-rw-r--r--sbin/startslip/startslip.c4
-rw-r--r--sbin/vinum/commands.c2
-rw-r--r--usr.bin/vi/pathnames.h4
11 files changed, 22 insertions, 88 deletions
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 70b92d4d9b80..009ce513f2ca 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 2692deddddfa..000000000000
--- 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 1893d7769754..508867f269ef 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 },
diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c
index d4e114b6149e..c2047dd6cf50 100644
--- a/contrib/isc-dhcp/client/clparse.c
+++ b/contrib/isc-dhcp/client/clparse.c
@@ -53,7 +53,7 @@ static TIME parsed_time;
struct client_config top_level_config;
-char client_script_name [] = "/sbin/dhclient-script";
+char client_script_name [] = _PATH_DHCLIENT_SCRIPT;
u_int32_t default_requested_options [] = {
DHO_SUBNET_MASK,
diff --git a/contrib/tar/src/buffer.c b/contrib/tar/src/buffer.c
index 6f44df2bd7fc..ae6eb5d9f1b5 100644
--- a/contrib/tar/src/buffer.c
+++ b/contrib/tar/src/buffer.c
@@ -25,6 +25,12 @@
#include <signal.h>
+#if __FreeBSD__
+# include <paths.h>
+#else
+# define _PATH_BSHELL "/bin/sh"
+#endif
+
#if MSDOS
# include <process.h>
#endif
@@ -1549,7 +1555,7 @@ new_volume (enum access_mode access)
pid_t child;
const char *shell = getenv ("SHELL");
if (! shell)
- shell = "/bin/sh";
+ shell = _PATH_BSHELL;
child = xfork ();
if (child == 0)
{
diff --git a/include/paths.h b/include/paths.h
index 48e3618f9c6f..2e90cc563d78 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -59,6 +59,8 @@
#define _PATH_DRUM "/dev/drum"
#define _PATH_ETC "/etc"
#define _PATH_FTPUSERS "/etc/ftpusers"
+#define _PATH_HALT "/sbin/halt"
+#define _PATH_IFCONFIG "/sbin/ifconfig"
#define _PATH_KMEM "/dev/kmem"
#define _PATH_LIBMAP_CONF "/etc/libmap.conf"
#define _PATH_LOGIN "/usr/bin/login"
@@ -67,7 +69,9 @@
#define _PATH_MEM "/dev/mem"
#define _PATH_NOLOGIN "/var/run/nologin"
#define _PATH_RCP "/bin/rcp"
+#define _PATH_REBOOT "/sbin/reboot"
#define _PATH_RLOGIN "/usr/bin/rlogin"
+#define _PATH_RM "/bin/rm"
#define _PATH_RSH "/usr/bin/rsh"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#define _PATH_SHELLS "/etc/shells"
diff --git a/sbin/shutdown/pathnames.h b/sbin/shutdown/pathnames.h
deleted file mode 100644
index a1afc1881aa3..000000000000
--- a/sbin/shutdown/pathnames.h
+++ /dev/null
@@ -1,41 +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) 6/5/93
- * $FreeBSD$
- */
-
-#include <paths.h>
-
-#define _PATH_FASTBOOT "/fastboot"
-#define _PATH_HALT "/sbin/halt"
-#define _PATH_REBOOT "/sbin/reboot"
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 85b1985718a2..9e2f8c6c7ba5 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <ctype.h>
#include <err.h>
#include <fcntl.h>
+#include <paths.h>
#include <pwd.h>
#include <setjmp.h>
#include <signal.h>
@@ -61,8 +62,6 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-#include "pathnames.h"
-
#ifdef DEBUG
#undef _PATH_NOLOGIN
#define _PATH_NOLOGIN "./nologin"
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index f949a5f54d6f..cc8a716df0f0 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -256,7 +256,7 @@ restart:
username, (long)conn_time);
sprintf(buf, "LINE=%d %s %s down",
diali ? (dialc - 1) % diali : 0,
- downscript ? downscript : "/sbin/ifconfig" , unitname);
+ downscript ? downscript : _PATH_IFCONFIG , unitname);
(void) system(buf);
logged_in = 0;
}
@@ -458,7 +458,7 @@ restart:
sprintf(buf, "LINE=%d %s %s up",
diali ? (dialc - 1) % diali : 0,
- upscript ? upscript : "/sbin/ifconfig" , unitname);
+ upscript ? upscript : _PATH_IFCONFIG , unitname);
(void) system(buf);
printd(", ready\n");
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index 61ddfb8b95d1..1301a3a31833 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -64,7 +64,7 @@ vinum_create(int argc, char *argv[], char *arg0[])
editor = getenv("EDITOR");
if (editor == NULL)
- editor = "/usr/bin/vi";
+ editor = _PATH_VI;
sprintf(tempfile, "/var/tmp/" VINUMMOD ".create.%d", getpid()); /* create a temp file */
tf = fopen(tempfile, "w"); /* open it */
if (tf == NULL) {
diff --git a/usr.bin/vi/pathnames.h b/usr.bin/vi/pathnames.h
index f469351ac439..72c8bb3daa45 100644
--- a/usr.bin/vi/pathnames.h
+++ b/usr.bin/vi/pathnames.h
@@ -1,4 +1,8 @@
/* @(#)pathnames.h.in 8.4 (Berkeley) 6/26/96 */
+/* $FreeBSD$ */
+
+/* Read standard system paths first. */
+#include <paths.h>
#ifndef _PATH_BSHELL
#define _PATH_BSHELL "/bin/sh"