gzip 1.3.5

diff --git a/zgrep.in b/zgrep.in
index 9fcd8282bde148d2fbfd84ac8bbc4dff67cfe3e2..d2beeab164f1206b4f0a897030465585a031ac99 100644 (file)
--- a/zgrep.in
+++ b/zgrep.in
@@ -4,6 +4,24 @@
 # zgrep -- a wrapper around a grep program that decompresses files as needed
 # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
 
+# Copyright (C) 1998, 2001, 2002 Free Software Foundation
+# Copyright (C) 1993 Jean-loup Gailly
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
 PATH="BINDIR:$PATH"; export PATH
 
 prog=`echo $0 | sed 's|.*/||'`
@@ -12,13 +30,46 @@ case "$prog" in
        *fgrep) grep=${FGREP-fgrep}     ;;
        *)      grep=${GREP-grep}       ;;
 esac
+
 pat=""
+after_dash_dash=""
+files_with_matches=0
+files_without_matches=0
+no_filename=0
+with_filename=0
+
 while test $# -ne 0; do
-  case "$1" in
-  -e | -f) opt="$opt $1"; shift; pat="$1"
+  case "$after_dash_dash$1" in
+  --d* | --rec*)       echo >&2 "$0: $1: option not supported"; exit 2;;
+  --files-with-*)      files_with_matches=1;;
+  --files-witho*)      files_without_matches=1;;
+  --no-f*)     no_filename=1;;
+  --wi*)       with_filename=1;;
+  --*) ;;
+  -*)
+       case "$1" in
+       -*[dr]*) echo >&2 "$0: $1: option not supported"; exit 2;;
+       esac
+       case "$1" in
+       -*H*)   with_filename=1;;
+       esac
+       case "$1" in
+       -*h*)   no_filename=1;;
+       esac
+       case "$1" in
+       -*L*)   files_without_matches=1;;
+       esac
+       case "$1" in
+       -*l*)   files_with_matches=1;;
+       esac;;
+  esac
+  case "$after_dash_dash$1" in
+  -[ef])   opt="$opt $1"; shift; pat="$1"
            if test "$grep" = grep; then  # grep is buggy with -e on SVR4
              grep=egrep
            fi;;
+  -[ABCdm])opt="$opt $1 $2"; shift;;
+  --)      opt="$opt $1"; after_dash_dash=1;;
   -*)     opt="$opt $1";;
    *)      if test -z "$pat"; then
             pat="$1"
@@ -32,19 +83,9 @@ done
 if test -z "$pat"; then
   echo "grep through gzip files"
   echo "usage: $prog [grep_options] pattern [files]"
-  exit 1
+  exit 2
 fi
 
-list=0
-silent=0
-op=`echo "$opt" | sed -e 's/ //g' -e 's/-//g'`
-case "$op" in
-  *l*) list=1
-esac
-case "$op" in
-  *h*) silent=1
-esac
-
 if test $# -eq 0; then
   gzip -cdfq | $grep $opt "$pat"
   exit $?
@@ -52,16 +93,22 @@ fi
 
 res=0
 for i do
-  if test $list -eq 1; then
-    gzip -cdfq "$i" | $grep $opt "$pat" > /dev/null && echo $i
-    r=$?
-  elif test $# -eq 1 -o $silent -eq 1; then
-    gzip -cdfq "$i" | $grep $opt "$pat"
-    r=$?
-  else
-    gzip -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${i}:|"
-    r=$?
-  fi
-  test "$r" -ne 0 && res="$r"
+  gzip -cdfq "$i" |
+    if test $files_with_matches -eq 1; then
+      $grep $opt "$pat" > /dev/null && echo $i
+    elif test $files_without_matches -eq 1; then
+      $grep $opt "$pat" > /dev/null || echo $i
+    elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename -eq 1; }; then
+      $grep $opt "$pat"
+    else
+      if test $with_filename -eq 1; then
+       sed_script="s|^[^:]*:|${i}:|"
+      else
+       sed_script="s|^|${i}:|"
+      fi
+      $grep $opt "$pat" | sed "$sed_script"
+    fi
+  r=$?
+  test $res -lt $r && res=$r
 done
 exit $res