Handle empty filename completions better

Bash 4.4 hangs in an awkward way (probably outputting the literal null
char in some unexpected context) without this; I'm not sure if this is a
bug or whether it's just been tolerated behaviour until now.

1 files changed, 9 insertions, 5 deletions

diff --git a/bash/bash_completion.d/path.bash b/bash/bash_completion.d/path.bash
index 60b36844..e0e7732d 100644
--- a/bash/bash_completion.d/path.bash
+++ b/bash/bash_completion.d/path.bash
@@ -19,6 +19,7 @@ _path() {
             insert|append|check)
                 local dirname
                 while IFS= read -rd '' dirname ; do
+                    [[ -n $dirname ]] || continue
                     COMPREPLY[${#COMPREPLY[@]}]=$dirname
                 done < <(
 
@@ -30,11 +31,14 @@ _path() {
                     dirnames=("${COMP_WORDS[COMP_CWORD]}"*/)
                     dirnames=("${dirnames[@]%/}")
 
-                    # Bail if no results to prevent empty output
-                    ((${#dirnames[@]})) || exit 1
-
-                    # Print results, quoted and null-delimited
-                    printf '%q\0' "${dirnames[@]}"
+                    # Print quoted entries, null-delimited, if there was at
+                    # least one; otherwise, just print a null character to stop
+                    # this hanging in Bash 4.4
+                    if ((${#dirnames[@]})) ; then
+                        printf '%q\0' "${dirnames[@]}"
+                    else
+                        printf '\0'
+                    fi
                 )
                 ;;