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

29618: Fix some syntax to not depend on SHORT_LOOPS being set.

Browse source
This commit is contained in:
Mikael Magnusson 2011-07-27 10:26:25 +00:00
parent 45913f43e5
commit c3d1277229
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2011-07-27 Mikael Magnusson <mikachu@gmail.com>
* 29618: Completion/Linux/Command/_ethtool,
Completion/Zsh/Type/_file_descriptors: Fix some syntax to not depend
on SHORT_LOOPS being set.
2011-07-25 Peter Stephenson <pws@csr.com> 2011-07-25 Peter Stephenson <pws@csr.com>
* 29561: Src/exec.c, Src/utils.c, Test/A04redirect.ztst: Allow * 29561: Src/exec.c, Src/utils.c, Test/A04redirect.ztst: Allow
@ -15159,5 +15165,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5407 $ * $Revision: 1.5408 $
***************************************************** *****************************************************

8
Completion/Linux/Command/_ethtool
View file

@ -3,9 +3,9 @@
local -a cmds local -a cmds
if [[ $CURRENT -ge 4 ]]; then if [[ $CURRENT -ge 4 ]]; then
case $words[CURRENT-1]; in case $words[CURRENT-1] in
rx|tx) rx|tx)
if [[ $words[2] = '-G' ]] && _message -e n 'number of ring entries' || _wanted -x onoff expl 'enabled' compadd off on [[ $words[2] = '-G' ]] && _message -e n 'number of ring entries' || _wanted -x onoff expl 'enabled' compadd off on
;; ;;
autoneg|adaptive-rx|adaptive-tx|raw|hex|sg|tso|ufo|gso) autoneg|adaptive-rx|adaptive-tx|raw|hex|sg|tso|ufo|gso)
_wanted -x onoff expl 'enabled' compadd off on _wanted -x onoff expl 'enabled' compadd off on
@ -55,7 +55,7 @@ if [[ $CURRENT -ge 4 ]]; then
_wanted files expl 'raw register dump files' _files _wanted files expl 'raw register dump files' _files
;; ;;
*) *)
case $words[2]; in case $words[2] in
-A|--pause) -A|--pause)
_values -S ' ' -w 'pause options' \ _values -S ' ' -w 'pause options' \
'autoneg[specify if pause autonegotiation is enabled]' \ 'autoneg[specify if pause autonegotiation is enabled]' \
@ -111,7 +111,7 @@ if [[ $CURRENT -ge 4 ]]; then
'gso[specify if generic segmentation offload is enabled]' 'gso[specify if generic segmentation offload is enabled]'
;; ;;
-p|--identify) -p|--identify)
if [[ $CURRENT -eq 4 ]] && _message -e length 'seconds' [[ $CURRENT -eq 4 ]] && _message -e length 'seconds'
;; ;;
-t|--test) -t|--test)
_values -S ' ' -w 'selftest option' \ _values -S ' ' -w 'selftest option' \

4
Completion/Zsh/Type/_file_descriptors
View file

@ -13,7 +13,9 @@ if zstyle -T ":completion:${curcontext}:" verbose && [[ -h /proc/$$/fd/$fds[1] ]
list+=( "$i $sep ${link[1]}" ) list+=( "$i $sep ${link[1]}" )
done done
elif (( $+commands[readlink] )); then elif (( $+commands[readlink] )); then
for i in "${fds[@]}"; list+=( "$i $sep $(readlink /proc/$$/fd/$i)" ) for i in "${fds[@]}"; do
list+=( "$i $sep $(readlink /proc/$$/fd/$i)" )
done
else else
for i in "${fds[@]}"; do for i in "${fds[@]}"; do
list+=( "$i $sep $(ls -l /proc/$$/fd/$i|sed 's/.*-> //' )" ) list+=( "$i $sep $(ls -l /proc/$$/fd/$i|sed 's/.*-> //' )" )