From: Nick Terrell Date: Mon, 2 Mar 2020 19:25:36 +0000 (-0800) Subject: [zstdgrep] Log zstd decompression errors to stderr X-Git-Tag: v1.4.5^2~85^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c10bbd8666bb9944ff9c9a1adb5bfbced67e41e;p=thirdparty%2Fzstd.git [zstdgrep] Log zstd decompression errors to stderr --- diff --git a/programs/zstdgrep b/programs/zstdgrep index 4879fb0da..cd6ed5495 100755 --- a/programs/zstdgrep +++ b/programs/zstdgrep @@ -109,7 +109,7 @@ if [ "$#" -lt 1 ]; then # ... on stdin set -f # Disable file name generation (globbing). # shellcheck disable=SC2086 - "${zcat}" -fq - | "${grep}" ${grep_args} -- "${pattern}" - + "${zcat}" -f - | "${grep}" ${grep_args} -- "${pattern}" - EXIT_CODE=$? set +f else @@ -121,9 +121,9 @@ else while [ "$#" -gt 0 ]; do # shellcheck disable=SC2086 if [ $pattern_found -eq 2 ]; then - "${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- - + "${zcat}" -f -- "$1" | "${grep}" --label="${1}" ${grep_args} -- - else - "${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" - + "${zcat}" -f -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" - fi [ "$?" -ne 0 ] && EXIT_CODE=1 shift