From b2b5c9e3fbce56ae131cb8cfe3808913566754c5 Mon Sep 17 00:00:00 2001 From: Richard Burke Date: Wed, 5 Oct 2016 23:10:25 +0100 Subject: Harden vis-complete --- vis-complete | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vis-complete b/vis-complete index fceea68..3a2d97b 100755 --- a/vis-complete +++ b/vis-complete @@ -3,6 +3,7 @@ set -e PATTERN="" COMPLETE_WORD=0 +FIND_FILE_LIMIT=1000 while [ $# -gt 0 ]; do case "$1" in @@ -24,12 +25,16 @@ while [ $# -gt 0 ]; do esac done +PATTERN="$(echo "$PATTERN" | sed "s/'/'\\\\''/g")" + if [ $COMPLETE_WORD = 1 ]; then CMD=$(printf "tr -cs '[:alnum:]_' '\n' | grep '^%s.' | sort -u" "$PATTERN") else - CMD=$(printf "find . ! -path '*/\.*' -a -path './%s*' | cut -b 3- | sort" "$PATTERN") + CMD=$(printf "find . ! -path '*/\.*' -a -path './%s*' 2>/dev/null | head -n $FIND_FILE_LIMIT | cut -b 3- | sort" "$PATTERN") fi -CMD=$(printf "$CMD | vis-menu -b | sed 's|^%s||' | tr -d '\n'" "$PATTERN") +PATTERN="$(echo "$PATTERN" | sed 's:/:\\/:g')" + +CMD=$(printf "$CMD | vis-menu -b | sed 's/^%s//' | tr -d '\n'" "$PATTERN") exec /bin/sh -c "$CMD" -- cgit v1.2.3