Module Name: src
Committed By: dholland
Date: Sun May 29 22:33:39 UTC 2016
Modified Files:
src/usr.sbin/catman: catman.c pathnames.h
Log Message:
Call the path for makewhatis _PATH_MAKEWHATIS instead of _PATH_WHATIS,
for clarity.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/catman/catman.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/catman/pathnames.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/catman/catman.c
diff -u src/usr.sbin/catman/catman.c:1.36 src/usr.sbin/catman/catman.c:1.37
--- src/usr.sbin/catman/catman.c:1.36 Sun May 29 22:09:51 2016
+++ src/usr.sbin/catman/catman.c Sun May 29 22:33:39 2016
@@ -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 <sys/cdefs.h>
#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 <sys/types.h>
@@ -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)
Index: src/usr.sbin/catman/pathnames.h
diff -u src/usr.sbin/catman/pathnames.h:1.5 src/usr.sbin/catman/pathnames.h:1.6
--- src/usr.sbin/catman/pathnames.h:1.5 Thu Aug 7 11:25:13 2003
+++ src/usr.sbin/catman/pathnames.h Sun May 29 22:33:39 2016
@@ -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"
