diff options
| author | se <se@FreeBSD.org> | 1995-12-28 14:40:59 +0000 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 1995-12-28 14:40:59 +0000 |
| commit | 985b2705b5819a93a05cfc48833a6187683fb16b (patch) | |
| tree | 27ab6931b3fbfe69e746b44973d1fb9f7a338578 /usr.sbin | |
| parent | d555d3cbdc73c76bb1c805f54a4d484f19a1d6b0 (diff) | |
| download | FreeBSD-src-985b2705b5819a93a05cfc48833a6187683fb16b.zip FreeBSD-src-985b2705b5819a93a05cfc48833a6187683fb16b.tar.gz | |
Remove reference to _PATH_UNIX and make -N option functional.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ncrcontrol/ncrcontrol.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/usr.sbin/ncrcontrol/ncrcontrol.c b/usr.sbin/ncrcontrol/ncrcontrol.c index 9b486a8..f7c687d 100644 --- a/usr.sbin/ncrcontrol/ncrcontrol.c +++ b/usr.sbin/ncrcontrol/ncrcontrol.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncrcontrol.c,v 1.8 1995/05/30 03:49:12 rgrimes Exp $ +** $Id: ncrcontrol.c,v 1.9 1995/09/14 18:14:28 se Exp $ ** ** Utility for NCR 53C810 device driver. ** @@ -182,11 +182,14 @@ void open_kvm(int flags) if (kvm_isopen) return; #if (__FreeBSD__ >= 2) - vmunix = getbootfile(); -#endif - if (vmunix == NULL) { + if (!vmunix) { + vmunix = getbootfile(); + } +#else + if (!vmunix) { vmunix = _PATH_UNIX; } +#endif #if defined(__NetBSD__) || (__FreeBSD__ >= 2) kvm = kvm_openfiles(vmunix, kmemf, NULL, flags, errbuf); if (kvm == NULL) { @@ -1621,7 +1624,13 @@ void main(argc, argv) "-k? list tortures\n" "-M <kernelimage> (default: %s)\n" "-N <symboltable> (default: %s)\n" - , prog, _PATH_KMEM, _PATH_UNIX); + , prog, _PATH_KMEM, +#if (__FreeBSD__ >= 2) + getbootfile() +#else + _PATH_UNIX +#endif + ); if (verbose) fprintf (stderr, ident); exit (1); } |
