From 193a8fae68d5a51a2dad17c0ee77db1a6d60cb98 Mon Sep 17 00:00:00 2001 From: wollman Date: Sat, 24 Sep 1994 00:08:43 +0000 Subject: Get rid of _PATH_UNIX completely; use getbootfile(3) instead. DANGER WILL ROBINSON! _PATH_UNIX is currently defined as the literal string "don't use this". I am of two minds about this myself, but wanted to get something into the tree as quickly as possible. --- usr.sbin/kgmon/kgmon.c | 2 +- usr.sbin/kvm_mkdb/kvm_mkdb.c | 2 +- usr.sbin/kvm_mkdb/testdb.c | 2 +- usr.sbin/trpt/trpt.c | 2 +- usr.sbin/trsp/trsp.c | 2 +- usr.sbin/xntpd/util/tickadj.c | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index 1265ce2..cf75723 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -134,7 +134,7 @@ main(int argc, char **argv) } #endif if (system == NULL) - system = _PATH_UNIX; + system = (char *)getbootfile(); accessmode = openfiles(system, kmemf, &kvmvars); mode = getprof(&kvmvars); if (hflag) diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c index f80b109..2315352 100644 --- a/usr.sbin/kvm_mkdb/kvm_mkdb.c +++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c @@ -83,7 +83,7 @@ main(argc, argv) exit(0); #define basename(cp) ((p = rindex((cp), '/')) != NULL ? p + 1 : (cp)) - nlistpath = argc > 0 ? argv[0] : _PATH_UNIX; + nlistpath = argc > 0 ? argv[0] : (char *)getbootfile(); nlistname = basename(nlistpath); (void)snprintf(dbtemp, sizeof(dbtemp), "%skvm_%s.tmp", diff --git a/usr.sbin/kvm_mkdb/testdb.c b/usr.sbin/kvm_mkdb/testdb.c index f4f3bf0..fe4581e 100644 --- a/usr.sbin/kvm_mkdb/testdb.c +++ b/usr.sbin/kvm_mkdb/testdb.c @@ -66,7 +66,7 @@ testdb() if ((kd = open(_PATH_KMEM, O_RDONLY, 0)) < 0) goto close; - uf = _PATH_UNIX; + uf = (char *)getbootfile(); if ((cp = rindex(uf, '/')) != 0) uf = cp + 1; (void) snprintf(dbname, sizeof(dbname), "%skvm_%s.db", _PATH_VARDB, uf); diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index 7452cdd..ef18570 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -164,7 +164,7 @@ main(argc, argv) setgid(getgid()); } else - system = _PATH_UNIX; + system = (char *)getbootfile(); if (nlist(system, nl) < 0 || !nl[0].n_value) { fprintf(stderr, "trpt: %s: no namelist\n", system); diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c index c2c0267..7548c58 100644 --- a/usr.sbin/trsp/trsp.c +++ b/usr.sbin/trsp/trsp.c @@ -95,7 +95,7 @@ main(argc, argv) int i, mask = 0, npcbs = 0; char *system, *core; - system = _PATH_UNIX; + system = (char *)getbootfile(); core = _PATH_KMEM; argc--, argv++; diff --git a/usr.sbin/xntpd/util/tickadj.c b/usr.sbin/xntpd/util/tickadj.c index 1d7ba66..9bc8f35 100644 --- a/usr.sbin/xntpd/util/tickadj.c +++ b/usr.sbin/xntpd/util/tickadj.c @@ -420,9 +420,9 @@ getoffsets(filex, tick_off, tickadj_off, dosync_off, noprintf_off) {""}, }; #endif - static char *kernels[] = { -#ifdef _PATH_UNIX - _PATH_UNIX, + char *kernels[] = { +#if __FreeBSD__ > 2 + (char *)getbootfile(), #endif "/vmunix", "/unix", -- cgit v1.1