[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 38e9ef18b2150740871a569ff16c6aefd018d8a2

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 38e9ef18b2150740871a569ff16c6aefd018d8a2
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Apr 21 19:25:02 2010 +0300

    Fix leak of $arg from hcitool and cryptsetup completions.

diff --git a/contrib/bluez b/contrib/bluez
index c92d5a2..a420398 100644
--- a/contrib/bluez
+++ b/contrib/bluez
@@ -30,7 +30,7 @@ _bluetooth_packet_types()
 
 _hcitool()
 {
-    local cur prev split=false
+    local cur prev split=false arg
 
     COMPREPLY=()
     cur=`_get_cword`
diff --git a/contrib/cryptsetup b/contrib/cryptsetup
index 1c97958..5e88de3 100644
--- a/contrib/cryptsetup
+++ b/contrib/cryptsetup
@@ -15,7 +15,7 @@ _cryptsetup_device()
 have cryptsetup &&
 _cryptsetup()
 {
-    local cur prev
+    local cur prev arg
     COMPREPLY=()
     cur=`_get_cword`
     prev=`_get_pword`
diff --git a/test/completion/cryptsetup.exp b/test/completion/cryptsetup.exp
new file mode 100644
index 0000000..c28169a
--- /dev/null
+++ b/test/completion/cryptsetup.exp
@@ -0,0 +1 @@
+assert_source_completions cryptsetup
diff --git a/test/completion/hcitool.exp b/test/completion/hcitool.exp
new file mode 100644
index 0000000..d30c564
--- /dev/null
+++ b/test/completion/hcitool.exp
@@ -0,0 +1 @@
+assert_source_completions hcitool
diff --git a/test/lib/completions/abook.exp b/test/lib/completions/cryptsetup.exp
similarity index 80%
copy from test/lib/completions/abook.exp
copy to test/lib/completions/cryptsetup.exp
index 3f4e301..e94c3ac 100644
--- a/test/lib/completions/abook.exp
+++ b/test/lib/completions/cryptsetup.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "abook "
+assert_complete_any "cryptsetup "
 
 
 sync_after_int
diff --git a/test/lib/completions/abook.exp b/test/lib/completions/hcitool.exp
similarity index 82%
copy from test/lib/completions/abook.exp
copy to test/lib/completions/hcitool.exp
index 3f4e301..9283adf 100644
--- a/test/lib/completions/abook.exp
+++ b/test/lib/completions/hcitool.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "abook "
+assert_complete_any "hcitool "
 
 
 sync_after_int

-- 
bash-completion