mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-06 09:01:13 +02:00
Code Releases Activity

50278: use man -w in preference to manpath; fix caching and precedence of -M

Browse source
This commit is contained in:
Bart Schaefer 2022-05-22 15:50:45 -07:00
parent a54d704579
commit 1e52cd968d
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2022-05-22 Bart Schaefer <schaefer@zsh.org>
* 50278: Completion/Unix/Command/_man: use `man -w` in preference
to `manpath` for portability; fix caching and precedence of -M
2022-05-20 Arvid Norlander <VorpalBlade@users.noreply.github.com> 2022-05-20 Arvid Norlander <VorpalBlade@users.noreply.github.com>
* github #91: Completion/Unix/Command/_find: _find * github #91: Completion/Unix/Command/_find: _find

47
Completion/Unix/Command/_man
View file

@ -16,7 +16,7 @@
_man() { _man() {
local dirs expl mrd awk variant noinsert local dirs expl mrd awk variant noinsert
local -a context line state state_descr args modes local -a context line state state_descr args modes
local -aU sects local -aU sects _manpath
local -A opt_args val_args sect_descs local -A opt_args val_args sect_descs
if [[ $service == man ]]; then if [[ $service == man ]]; then
@ -168,28 +168,39 @@ _man() {
_arguments -s -S : $args '*::: :->man' && return 0 _arguments -s -S : $args '*::: :->man' && return 0
[[ -n $state ]] || return 1 [[ -n $state ]] || return 1
if (( ! $#_manpath )); then
local mp
mp=( ${(s.:.)$(manpath 2>/dev/null)} )
[[ "$mp" == *:* ]] && mp=( ${(s.:.)mp} )
if (( $#mp )); then
_manpath=( $mp )
elif (( $#manpath )); then
_manpath=( $manpath )
fi
fi
(( $#_manpath )) ||
_manpath=( /usr/man(-/) /(opt|usr)/(pkg|dt|share|X11R6|local)/(cat|)man(-/) )
# Override man path # Override man path
[[ -n ${opt_args[-M]} ]] && [[ -n ${opt_args[-M]} ]] &&
_manpath=( ${(s<:>)opt_args[-M]} ) _manpath=( ${(s<:>)opt_args[-M]} )
# Restore cached man path to avoid $(manpath) if we can
if (( ! $#_manpath )); then
if (( ! $+_manpath_cache )); then
typeset -gHA _manpath_cache
fi
if [[ -z $_manpath_cache[$MANPATH] ]]; then
local mp
mp=( ${(s.:.)$({ command man -w || manpath } 2>/dev/null)} )
[[ "$mp" == *:* ]] && mp=( ${(s.:.)mp} )
if (( $#mp )); then
_manpath_cache[$MANPATH]=${(j.:.)mp}
elif (( $#manpath )); then
_manpath_cache[$MANPATH]=$MANPATH
fi
fi
_manpath=( ${(s.:.)_manpath_cache[$MANPATH]} )
fi
# Augment man path # Augment man path
[[ $variant == (netbsd|openbsd)* ]] && if [[ -n ${opt_args[-m]} ]]; then
[[ -n ${opt_args[-m]} ]] && [[ $variant == (netbsd|openbsd)* ]] &&
_manpath+=( ${(s<:>)opt_args[-m]} ) _manpath+=( ${(s<:>)opt_args[-m]} )
elif [[ $variant == aix* ]]; then
# _manpath declared -U so no need to test
_manpath+=( /usr/share/man )
fi
(( $#_manpath )) ||
_manpath=( /usr/man(-/) /(opt|usr)/(pkg|dt|share|X11R6|local)/(cat|)man(-/) )
# `sman' is the SGML manual directory for Solaris 7. # `sman' is the SGML manual directory for Solaris 7.
# 1M is system administrator commands on SVR4 # 1M is system administrator commands on SVR4