diff options
| author | obrien <obrien@FreeBSD.org> | 2003-05-05 22:49:23 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-05-05 22:49:23 +0000 |
| commit | df429f4699c1360689b59e8c2440ab71c5c80656 (patch) | |
| tree | 98ff85a15a26642640d555e4b28d599d775702fe /contrib | |
| parent | 2e101cf42bcedd60b9f18df6082dffdf52b8ca77 (diff) | |
| download | FreeBSD-src-df429f4699c1360689b59e8c2440ab71c5c80656.zip FreeBSD-src-df429f4699c1360689b59e8c2440ab71c5c80656.tar.gz | |
Centralize _PATH_* definitions.
Submitted by: Tim Kientzle <kientzle@acm.org> (embellished by me)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/isc-dhcp/client/clparse.c | 2 | ||||
| -rw-r--r-- | contrib/tar/src/buffer.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c index d4e114b..c2047dd 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 6f44df2..ae6eb5d 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) { |
