diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2003-05-05 22:49:23 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2003-05-05 22:49:23 +0000 |
commit | 8d5c19ffbccf759faae955929ac28c0d0252cf78 (patch) | |
tree | 98ff85a15a26642640d555e4b28d599d775702fe /sbin | |
parent | bedb455962e86ad0b0160b1bc6d7ceb499e07e27 (diff) | |
download | src-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
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/shutdown/pathnames.h | 41 | ||||
-rw-r--r-- | sbin/shutdown/shutdown.c | 3 | ||||
-rw-r--r-- | sbin/startslip/startslip.c | 4 | ||||
-rw-r--r-- | sbin/vinum/commands.c | 2 |
4 files changed, 4 insertions, 46 deletions
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) { |