From 2e499a79d101cf86577ad8a8229f0cc2d5ef40cb Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 29 May 2016 22:33:39 +0000 Subject: [PATCH] Call the path for makewhatis _PATH_MAKEWHATIS instead of _PATH_WHATIS, for clarity. --- usr.sbin/catman/catman.c | 6 +++--- usr.sbin/catman/pathnames.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/catman/catman.c b/usr.sbin/catman/catman.c index bd4fedc7da56..afc0006cb3eb 100644 --- a/usr.sbin/catman/catman.c +++ b/usr.sbin/catman/catman.c @@ -1,4 +1,4 @@ -/* $NetBSD: catman.c,v 1.36 2016/05/29 22:09:51 dholland Exp $ */ +/* $NetBSD: catman.c,v 1.37 2016/05/29 22:33:39 dholland Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ #include #ifndef lint -__RCSID("$NetBSD: catman.c,v 1.36 2016/05/29 22:09:51 dholland Exp $"); +__RCSID("$NetBSD: catman.c,v 1.37 2016/05/29 22:33:39 dholland Exp $"); #endif /* not lint */ #include @@ -602,7 +602,7 @@ makewhatis(void) err(1, "malloc"); TAILQ_FOREACH(e_whatdb, &whatdbp->entrylist, q) { snprintf(sysbuf, sizeof(sysbuf), "%s %s", - _PATH_WHATIS, dirname(e_whatdb->s)); + _PATH_MAKEWHATIS, dirname(e_whatdb->s)); if (f_noprint == 0) printf("%s\n", sysbuf); if (f_noaction == 0) diff --git a/usr.sbin/catman/pathnames.h b/usr.sbin/catman/pathnames.h index 947df1b09fc3..650d0203ad9e 100644 --- a/usr.sbin/catman/pathnames.h +++ b/usr.sbin/catman/pathnames.h @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:25:13 agc Exp $ */ +/* $NetBSD: pathnames.h,v 1.6 2016/05/29 22:33:39 dholland Exp $ */ /* * Copyright (c) 1989, 1993 @@ -34,4 +34,4 @@ #define _PATH_MANCONF "/etc/man.conf" #define _PATH_PAGER "/usr/bin/more -s" #define _PATH_TMP "/tmp/man.XXXXXX" -#define _PATH_WHATIS "/usr/libexec/makewhatis" +#define _PATH_MAKEWHATIS "/usr/libexec/makewhatis"