X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=zgrep.in;h=aa3567f2c3898c8d30ef77f569d9d9e0c3c5364c;hb=0095746c83f59e1f45c9e803d61e205ab6cbfa83;hp=b91330d3c1a61c529e471ca07e21d2464ab3b519;hpb=302189d124ed5849c2589ea92e912eb24fdc4ab3;p=gzip

diff --git a/zgrep.in b/zgrep.in
index b91330d..aa3567f 100755
--- a/zgrep.in
+++ b/zgrep.in
@@ -4,7 +4,7 @@
 # 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 Free Software Foundation
+# 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
@@ -24,7 +24,7 @@
 
 PATH="BINDIR:$PATH"; export PATH
 
-prog=`echo $0 | sed 's|.*/||'`
+prog=`echo "$0" | sed 's|.*/||'`
 case "$prog" in
 	*egrep)	grep=${EGREP-egrep}	;;
 	*fgrep)	grep=${FGREP-fgrep}	;;
@@ -40,7 +40,7 @@ with_filename=0
 
 while test $# -ne 0; do
   case "$after_dash_dash$1" in
-  --d* | --rec*)	echo >&2 "$0: $1: option not supported"; exit 1;;
+  --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;;
@@ -48,7 +48,7 @@ while test $# -ne 0; do
   --*)	;;
   -*)
 	case "$1" in
-	-*[dr]*) echo >&2 "$0: $1: option not supported"; exit 1;;
+	-*[dr]*) echo >&2 "$0: $1: option not supported"; exit 2;;
 	esac
 	case "$1" in
 	-*H*)	with_filename=1;;
@@ -83,7 +83,7 @@ done
 if test -z "$pat"; then
   echo "grep through gzip files"
   echo "usage: $prog [grep_options] pattern [files]"
-  exit 1
+  exit 2
 fi
 
 if test $# -eq 0; then
@@ -95,12 +95,13 @@ res=0
 for i do
   gzip -cdfq "$i" |
     if test $files_with_matches -eq 1; then
-      $grep $opt "$pat" > /dev/null && echo $i
+      $grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
     elif test $files_without_matches -eq 1; then
-      $grep $opt "$pat" > /dev/null || echo $i
+      $grep $opt "$pat" > /dev/null || printf "%s\n" "$i"
     elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename -eq 1; }; then
       $grep $opt "$pat"
     else
+      i=$(echo "$i" | sed -e 's/[\\|&]/\\&/g')
       if test $with_filename -eq 1; then
 	sed_script="s|^[^:]*:|${i}:|"
       else