Can somebody review this patch and run test/runUnit with the patch applied?
The patch needs to be tested with bash-4.2 and I don't have one.
This patch fixes following test case for me:
$ mkdir test
$ cd test
$ touch 'x' '[x]'
$ ls [x<TAB> # <- gives "ls x" instead of "ls [x]"
>From ef74848512b15c2bce4c407e28c832c241ccb941 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 15 Jan 2012 19:03:32 +0400
Subject: [PATCH] _filedir: Properly quote paths.
---
bash_completion | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/bash_completion b/bash_completion
index 6886f44..8f90fba 100644
--- a/bash_completion
+++ b/bash_completion
@@ -562,33 +562,32 @@ _filedir()
_tilde "$cur" || return 0
local -a toks
- local quoted tmp
+ local quoted x tmp
_quote_readline_by_ref "$cur" quoted
- toks=( $(
- compgen -d -- "$quoted" | {
- while read -r tmp; do
- # TODO: I have removed a "[ -n $tmp ] &&" before 'printf ..',
- # and everything works again. If this bug suddenly
- # appears again (i.e. "cd /b<TAB>" becomes "cd /"),
- # remember to check for other similar conditionals (here
- # and _filedir_xspec()). --David
- printf '%s\n' $tmp
- done
- }
- ))
+ x=$( compgen -d -- "$quoted" ) &&
+ while read -r tmp; do
+ toks+=( "$tmp" )
+ done <<< "$x"
if [[ "$1" != -d ]]; then
# Munge xspec to contain uppercase version too
# http://thread.gmane.org/gmane.comp.shells.bash.bugs/15294/focus=15306
xspec=${1:+"!*.@($1|${1^^})"}
- toks+=( $( compgen -f -X "$xspec" -- $quoted ) )
+ x=$( compgen -f -X "$xspec" -- $quoted ) &&
+ while read -r tmp; do
+ toks+=( "$tmp" )
+ done <<< "$x"
fi
# If the filter failed to produce anything, try without it if configured to
[[ -n ${COMP_FILEDIR_FALLBACK:-} && \
-n "$1" && "$1" != -d && ${#toks[@]} -lt 1 ]] && \
- toks+=( $( compgen -f -- $quoted ) )
+ x=$( compgen -f -- $quoted ) &&
+ while read -r tmp; do
+ toks+=( "$tmp" )
+ done <<< "$x"
+
if [[ ${#toks[@]} -ne 0 ]]; then
# 2>/dev/null for direct invocation, e.g. in the _filedir unit test
@@ -1806,7 +1805,6 @@ _filedir_xspec()
toks=( $(
compgen -d -- "$(quote_readline "$cur")" | {
while read -r tmp; do
- # see long TODO comment in _filedir() --David
printf '%s\n' $tmp
done
}
--
1.7.5.1
_______________________________________________
Bash-completion-devel mailing list
Bash-completion-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
