mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
Centralize _PATH_* definitions.
Submitted by: Tim Kientzle <kientzle@acm.org> (embellished by me)
This commit is contained in:
parent
bedb455962
commit
8d5c19ffbc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=114763
@ -67,8 +67,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <sysexits.h>
|
#include <sysexits.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "pathnames.h"
|
|
||||||
|
|
||||||
int fflg, iflg, nflg, vflg;
|
int fflg, iflg, nflg, vflg;
|
||||||
|
|
||||||
int copy(char *, char *);
|
int copy(char *, char *);
|
||||||
|
@ -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"
|
|
@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
|
|||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <paths.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Shell variables.
|
* Shell variables.
|
||||||
@ -105,7 +106,7 @@ const struct varinit varinit[] = {
|
|||||||
NULL },
|
NULL },
|
||||||
{ &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=",
|
{ &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=",
|
||||||
NULL },
|
NULL },
|
||||||
{ &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin",
|
{ &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH,
|
||||||
changepath },
|
changepath },
|
||||||
{ &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=",
|
{ &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=",
|
||||||
NULL },
|
NULL },
|
||||||
|
@ -53,7 +53,7 @@ static TIME parsed_time;
|
|||||||
|
|
||||||
struct client_config top_level_config;
|
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 [] = {
|
u_int32_t default_requested_options [] = {
|
||||||
DHO_SUBNET_MASK,
|
DHO_SUBNET_MASK,
|
||||||
|
@ -25,6 +25,12 @@
|
|||||||
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
|
#if __FreeBSD__
|
||||||
|
# include <paths.h>
|
||||||
|
#else
|
||||||
|
# define _PATH_BSHELL "/bin/sh"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if MSDOS
|
#if MSDOS
|
||||||
# include <process.h>
|
# include <process.h>
|
||||||
#endif
|
#endif
|
||||||
@ -1549,7 +1555,7 @@ new_volume (enum access_mode access)
|
|||||||
pid_t child;
|
pid_t child;
|
||||||
const char *shell = getenv ("SHELL");
|
const char *shell = getenv ("SHELL");
|
||||||
if (! shell)
|
if (! shell)
|
||||||
shell = "/bin/sh";
|
shell = _PATH_BSHELL;
|
||||||
child = xfork ();
|
child = xfork ();
|
||||||
if (child == 0)
|
if (child == 0)
|
||||||
{
|
{
|
||||||
|
@ -59,6 +59,8 @@
|
|||||||
#define _PATH_DRUM "/dev/drum"
|
#define _PATH_DRUM "/dev/drum"
|
||||||
#define _PATH_ETC "/etc"
|
#define _PATH_ETC "/etc"
|
||||||
#define _PATH_FTPUSERS "/etc/ftpusers"
|
#define _PATH_FTPUSERS "/etc/ftpusers"
|
||||||
|
#define _PATH_HALT "/sbin/halt"
|
||||||
|
#define _PATH_IFCONFIG "/sbin/ifconfig"
|
||||||
#define _PATH_KMEM "/dev/kmem"
|
#define _PATH_KMEM "/dev/kmem"
|
||||||
#define _PATH_LIBMAP_CONF "/etc/libmap.conf"
|
#define _PATH_LIBMAP_CONF "/etc/libmap.conf"
|
||||||
#define _PATH_LOGIN "/usr/bin/login"
|
#define _PATH_LOGIN "/usr/bin/login"
|
||||||
@ -67,7 +69,9 @@
|
|||||||
#define _PATH_MEM "/dev/mem"
|
#define _PATH_MEM "/dev/mem"
|
||||||
#define _PATH_NOLOGIN "/var/run/nologin"
|
#define _PATH_NOLOGIN "/var/run/nologin"
|
||||||
#define _PATH_RCP "/bin/rcp"
|
#define _PATH_RCP "/bin/rcp"
|
||||||
|
#define _PATH_REBOOT "/sbin/reboot"
|
||||||
#define _PATH_RLOGIN "/usr/bin/rlogin"
|
#define _PATH_RLOGIN "/usr/bin/rlogin"
|
||||||
|
#define _PATH_RM "/bin/rm"
|
||||||
#define _PATH_RSH "/usr/bin/rsh"
|
#define _PATH_RSH "/usr/bin/rsh"
|
||||||
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
|
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
|
||||||
#define _PATH_SHELLS "/etc/shells"
|
#define _PATH_SHELLS "/etc/shells"
|
||||||
|
@ -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"
|
|
@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <paths.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
@ -61,8 +62,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "pathnames.h"
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#undef _PATH_NOLOGIN
|
#undef _PATH_NOLOGIN
|
||||||
#define _PATH_NOLOGIN "./nologin"
|
#define _PATH_NOLOGIN "./nologin"
|
||||||
|
@ -256,7 +256,7 @@ main(argc, argv)
|
|||||||
username, (long)conn_time);
|
username, (long)conn_time);
|
||||||
sprintf(buf, "LINE=%d %s %s down",
|
sprintf(buf, "LINE=%d %s %s down",
|
||||||
diali ? (dialc - 1) % diali : 0,
|
diali ? (dialc - 1) % diali : 0,
|
||||||
downscript ? downscript : "/sbin/ifconfig" , unitname);
|
downscript ? downscript : _PATH_IFCONFIG , unitname);
|
||||||
(void) system(buf);
|
(void) system(buf);
|
||||||
logged_in = 0;
|
logged_in = 0;
|
||||||
}
|
}
|
||||||
@ -458,7 +458,7 @@ main(argc, argv)
|
|||||||
|
|
||||||
sprintf(buf, "LINE=%d %s %s up",
|
sprintf(buf, "LINE=%d %s %s up",
|
||||||
diali ? (dialc - 1) % diali : 0,
|
diali ? (dialc - 1) % diali : 0,
|
||||||
upscript ? upscript : "/sbin/ifconfig" , unitname);
|
upscript ? upscript : _PATH_IFCONFIG , unitname);
|
||||||
(void) system(buf);
|
(void) system(buf);
|
||||||
|
|
||||||
printd(", ready\n");
|
printd(", ready\n");
|
||||||
|
@ -64,7 +64,7 @@ vinum_create(int argc, char *argv[], char *arg0[])
|
|||||||
|
|
||||||
editor = getenv("EDITOR");
|
editor = getenv("EDITOR");
|
||||||
if (editor == NULL)
|
if (editor == NULL)
|
||||||
editor = "/usr/bin/vi";
|
editor = _PATH_VI;
|
||||||
sprintf(tempfile, "/var/tmp/" VINUMMOD ".create.%d", getpid()); /* create a temp file */
|
sprintf(tempfile, "/var/tmp/" VINUMMOD ".create.%d", getpid()); /* create a temp file */
|
||||||
tf = fopen(tempfile, "w"); /* open it */
|
tf = fopen(tempfile, "w"); /* open it */
|
||||||
if (tf == NULL) {
|
if (tf == NULL) {
|
||||||
|
@ -1,4 +1,8 @@
|
|||||||
/* @(#)pathnames.h.in 8.4 (Berkeley) 6/26/96 */
|
/* @(#)pathnames.h.in 8.4 (Berkeley) 6/26/96 */
|
||||||
|
/* $FreeBSD$ */
|
||||||
|
|
||||||
|
/* Read standard system paths first. */
|
||||||
|
#include <paths.h>
|
||||||
|
|
||||||
#ifndef _PATH_BSHELL
|
#ifndef _PATH_BSHELL
|
||||||
#define _PATH_BSHELL "/bin/sh"
|
#define _PATH_BSHELL "/bin/sh"
|
||||||
|
Loading…
Reference in New Issue
Block a user