From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id pB9BIvwS004984 for ; Fri, 9 Dec 2011 06:18:57 -0500 (EST) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id pB9BIvGP015989; Fri, 9 Dec 2011 06:18:57 -0500 (EST) Date: Fri, 9 Dec 2011 06:18:57 -0500 (EST) Message-Id: <201112091118.pB9BIvGP015989@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: When specifying an architecture to X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- When specifying an architecture to whatis(1)/apropos(1)/man.cgi(7), do a comparison only if the manual specifies an architecture, otherwise let it through. Looked over by schwarze@. This brings us much more in line with OpenBSD's behaviour. Modified Files: -------------- mdocml: apropos_db.c Revision Data ------------- Index: apropos_db.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/apropos_db.c,v retrieving revision 1.21 retrieving revision 1.22 diff -Lapropos_db.c -Lapropos_db.c -u -p -r1.21 -r1.22 --- apropos_db.c +++ apropos_db.c @@ -541,8 +541,10 @@ single_search(struct rectree *tree, cons if (opts->cat && strcasecmp(opts->cat, r.res.cat)) continue; - if (opts->arch && strcasecmp(opts->arch, r.res.arch)) - continue; + + if (opts->arch && *r.res.arch) + if (strcasecmp(opts->arch, r.res.arch)) + continue; tree->node = rs = mandoc_realloc (rs, (tree->len + 1) * sizeof(struct rec)); -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv