CVSROOT: /cvs
Module name: src
Changes by: schwa...@cvs.openbsd.org 2010/03/19 15:04:25
Modified files:
usr.bin/man : man.c
Log message:
Fix three bugs in man(1):
* when combining -m $path with -s $section, -s was ignored
* when combining -m with -s, ONLY $path was searched, like with -M
* when combining -M (or $MANPATH) with -s, -M was ignored
Instead, when combining -m, -M or $MANPATH with -s, let's simply look into
$path/{cat,man}$section{/$arch,} first (for -m) or only (for -M or $MANPATH).
Do not change the behaviour in other cases.
This required a rewrite of the whole path handling,
as a bonus also making the code easier to understand.
Hopefully, it helps to fix www.openbsd.org/cgi-bin/man.cgi properly.
Jason convinced me that changing the manual is not really needed.
Regression tests will follow when the tree unlocks completely.
"you are on the right track" beck@
tested and agreed by jmc@
