update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / zstd / programs / zstdgrep

diff --git a/ceph/src/zstd/programs/zstdgrep b/ceph/src/zstd/programs/zstdgrep
index cb804b8bead47fda30314464c080c773ea554c0d..61efaa9474a0058699a0780c769c4b49e487b3e1 100755 (executable)
--- a/ceph/src/zstd/programs/zstdgrep
+++ b/ceph/src/zstd/programs/zstdgrep
@@ -58,6 +58,9 @@ while [ "$#" -gt 0 ] && [ "${endofopts}" -eq 0 ]; do
                     shift 2
                     break
                     ;;
+                -f)
+                    pattern_found=2
+                    ;;
                 *)
                     ;;
             esac
@@ -106,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}" - | "${grep}" ${grep_args} -- "${pattern}" -
     EXIT_CODE=$?
     set +f
 else
@@ -117,7 +120,11 @@ else
     set -f
     while [ "$#" -gt 0 ]; do
         # shellcheck disable=SC2086
-        "${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" -
+        if [ $pattern_found -eq 2 ]; then
+            "${zcat}" -- "$1" | "${grep}" --label="${1}" ${grep_args} -- -
+        else
+            "${zcat}" -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" -
+        fi
         [ "$?" -ne 0 ] && EXIT_CODE=1
         shift
     done