ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent globbing on non-quoting variable

Browse Source
This commit is contained in:
Lzu Tao
2018-11-29 03:04:40 +07:00
parent c046e0b626
commit 3d18b4764d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/zstdgrep
+4
View File
@@ -103,9 +103,11 @@ EXIT_CODE=0
# call grep ... # call grep ...
if [ "$#" -lt 1 ]; then if [ "$#" -lt 1 ]; then
# ... on stdin # ... on stdin
set -f # Disable file name generation (globbing).
# shellcheck disable=SC2086 # shellcheck disable=SC2086
"${zcat}" -fq - | "${grep}" ${grep_args} -- "${pattern}" - "${zcat}" -fq - | "${grep}" ${grep_args} -- "${pattern}" -
EXIT_CODE=$? EXIT_CODE=$?
set +f
else else
# ... on all files given on the command line # ... on all files given on the command line
if [ "${silent}" -lt 1 ] && [ "$#" -gt 1 ]; then if [ "${silent}" -lt 1 ] && [ "$#" -gt 1 ]; then
@@ -113,6 +115,7 @@ else
fi fi
CUR_EXIT_CODE=0 CUR_EXIT_CODE=0
EXIT_CODE=1 EXIT_CODE=1
set -f
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
# shellcheck disable=SC2086 # shellcheck disable=SC2086
"${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" - "${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" -
@@ -122,6 +125,7 @@ else
fi fi
shift shift
done done
set +f
fi fi
exit "${EXIT_CODE}" exit "${EXIT_CODE}"