From 35e4fb6045ddb0ecb07ca1cd746258735b8b124e Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 28 Dec 2011 00:32:13 +0000 Subject: Do not skip manuals shared across architectures when building databases. --- mandocdb.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'mandocdb.c') diff --git a/mandocdb.c b/mandocdb.c index cf92d6dd..6b25b4e9 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.41 2011/12/25 19:31:25 kristaps Exp $ */ +/* $Id: mandocdb.c,v 1.42 2011/12/28 00:32:13 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -615,8 +615,8 @@ index_merge(const struct of *of, struct mparse *mp, /* * By default, skip a file if the manual section - * and architecture given in the file disagree - * with the directory where the file is located. + * given in the file disagrees with the directory + * where the file is located. */ skip = 0; @@ -631,6 +631,21 @@ index_merge(const struct of *of, struct mparse *mp, skip = 1; } + /* + * Manual page directories exist for each kernel + * architecture as returned by machine(1). + * However, many manuals only depend on the + * application architecture as returned by arch(1). + * For example, some (2/ARM) manuals are shared + * across the "armish" and "zaurus" kernel + * architectures. + * A few manuals are even shared across completely + * different architectures, for example fdformat(1) + * on amd64, i386, sparc, and sparc64. + * Thus, warn about architecture mismatches, + * but don't skip manuals for this reason. + */ + assert(of->arch); assert(march); if (strcasecmp(march, of->arch)) { @@ -639,7 +654,7 @@ index_merge(const struct of *of, struct mparse *mp, "architecture \"%s\" manual " "in \"%s\" directory\n", fn, march, of->arch); - skip = 1; + march = of->arch; } /* -- cgit v1.2.3-56-ge451