leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: bpftool: Fix minor bash completion mistakes

Browse Source 
Minor fixes for bash completion: addition of program name completion for
two subcommands, and correction for program test-runs and map pinning.

The completion for the following commands is fixed or improved:

    # bpftool prog run [TAB]
    # bpftool prog pin [TAB]
    # bpftool map pin [TAB]
    # bpftool net attach xdp name [TAB]

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200312184608.12050-3-quentin@isovalent.com
This commit is contained in:
Quentin Monnet 2020-03-12 18:46:08 +00:00 committed by Daniel Borkmann
parent 75a1e792c3
commit 132c1af0a2
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/bpf/bpftool/bash-completion/bpftool
View File

@ -542,8 +542,8 @@ _bpftool()
esac esac
;; ;;
run) run)
if [[ ${#words[@]} -lt 5 ]]; then if [[ ${#words[@]} -eq 4 ]]; then
_filedir COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) )
return 0 return 0
fi fi
case $prev in case $prev in
@ -551,6 +551,10 @@ _bpftool()
_bpftool_get_prog_ids _bpftool_get_prog_ids
return 0 return 0
;; ;;
name)
_bpftool_get_prog_names
return 0
;;
data_in|data_out|ctx_in|ctx_out) data_in|data_out|ctx_in|ctx_out)
_filedir _filedir
return 0 return 0
@ -756,11 +760,17 @@ _bpftool()
esac esac
;; ;;
pin) pin)
if [[ $prev == "$command" ]]; then case $prev in
COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) ) $command)
else COMPREPLY=( $( compgen -W "$MAP_TYPE" -- "$cur" ) )
_filedir ;;
fi id)
_bpftool_get_map_ids
;;
name)
_bpftool_get_map_names
;;
esac
return 0 return 0
;; ;;
event_pipe) event_pipe)
@ -987,6 +997,9 @@ _bpftool()
id) id)
_bpftool_get_prog_ids _bpftool_get_prog_ids
;; ;;
name)
_bpftool_get_prog_names
;;
pinned) pinned)
_filedir _filedir
;; ;;