From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-2.sys.kth.se (smtp-2.sys.kth.se [130.237.32.160]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id pAQIRJ7B016468 for ; Sat, 26 Nov 2011 13:27:20 -0500 (EST) Received: from mailscan-1.sys.kth.se (mailscan-1.sys.kth.se [130.237.32.91]) by smtp-2.sys.kth.se (Postfix) with ESMTP id CFB8E14DC48; Sat, 26 Nov 2011 19:27:13 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-2.sys.kth.se ([130.237.32.160]) by mailscan-1.sys.kth.se (mailscan-1.sys.kth.se [130.237.32.91]) (amavisd-new, port 10024) with LMTP id HjxBNpaQh79V; Sat, 26 Nov 2011 19:27:12 +0100 (CET) X-KTH-Auth: kristaps [83.250.6.251] X-KTH-mail-from: kristaps@bsd.lv Received: from macky.local (c83-250-6-251.bredband.comhem.se [83.250.6.251]) by smtp-2.sys.kth.se (Postfix) with ESMTP id B9BF514D7E0; Sat, 26 Nov 2011 19:27:10 +0100 (CET) Message-ID: <4ED12F7E.2010207@bsd.lv> Date: Sat, 26 Nov 2011 19:27:10 +0100 From: Kristaps Dzonsons User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0) Gecko/20111105 Thunderbird/8.0 X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 To: tech@mdocml.bsd.lv CC: Ingo Schwarze Subject: Re: post-p2k11 resync References: <20111126165729.GF13912@iris.usta.de> In-Reply-To: <20111126165729.GF13912@iris.usta.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 26/11/2011 17:57, Ingo Schwarze wrote: > Hi, > > the OpenBSD part of the resync is done (well, there are still a few > minor patches outside the mandocsb/apropos area, i'll resend those > later). > > Here is the bsd.lv part, mostly removing trivial differences and > cleaning up whitespace. But there are a few real issues: > > * -M overrides MANPATH, not the other way round; > -m _prepends_ to the path, it doesn't _append_. > That was both implemented and documented the wrong way. > > * MANPATH is colon-separated, not comma-separated; > the implementation is correct, the manual in part wrong. > > * apropos.c doesn't need ctype.h any longer. > > * The apropos(1) usage() has -M and -m "path", not "dirs", > just type "apropos -x" on an OpenBSD system. > > * I fear removing the database close calls from the dir loop > in mandocdb(8) main because of file descriptor leaks; > or am i missing something? > > * manpath.c needs sys/types.h because of size_t. Ingo, Great---ok kristaps! As you can see, I tried to shove all of the MANPATH handling into manpath_parse(), which should set everything up from MANPATH, -m, -M, and man.conf/manpath(1) (which, yes, is extremely ugly). Only man.cgi doesn't use manpath_parse() because it reads manup's configuration file. By the way, catman is fine by me as a name; I didn't even know it existed. I'll look more into it later. Incidentally, I still think there's a case for MANPATH acting like -m as mentioned before. How else does one maintain a private manual tree? Using "-m" each time man(1) is invoked is ugly. Best, Kristaps -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv