# 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, 2006, 2007, 2009 Free Software Foundation
+# Copyright (C) 1998, 2001, 2002, 2006, 2007, 2009, 2010 Free Software
+# Foundation
+
# Copyright (C) 1993 Jean-loup Gailly
# This program is free software; you can redistribute it and/or modify
grep='${GREP-grep}'
version='zgrep (gzip) @VERSION@
-Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.
Report bugs to <bug-gzip@gnu.org>."
# sed script to escape all ' for the shell, and then (to handle trailing
-# newlines correctly) turn trailing X on last line into '.
+# newlines correctly) append ' to the last line.
escape='
s/'\''/'\''\\'\'''\''/g
- $s/X$/'\''/
+ $s/$/'\''/
'
operands=
have_pat=0
-pat_on_stdin=0
files_with_matches=0
files_without_matches=0
no_filename=0
optarg=
case $option in
- (-[0123456789abcdhHiIKLlnoqrRsTuUvVwxyzZ]?*)
- arg2=-\'$(expr "X${option}X" : 'X-.[0-9]*\(.*\)' | sed "$escape")
+ (-[0123456789EFGHIKLPRTUVZabchilnoqrsuvwxyz]?*)
+ arg2=-\'$(expr "X$option" : 'X-.[0-9]*\(.*\)' | sed "$escape")
eval "set -- $arg2 "'${1+"$@"}'
option=$(expr "X$option" : 'X\(-.[0-9]*\)');;
(--binary-*=* | --[lm]a*=* | --reg*=*)
;;
- (-[ABCDefm] | --binary-* | --file | --[lm]a* | --reg*)
+ (-[ABCDXdefm] | binary-* | --file | --[lm]a* | --reg*)
case ${1?"$option option requires an argument"} in
(*\'*)
- optarg=" '"$(printf '%sX\n' "$1" | sed "$escape");;
+ optarg=" '"$(printf '%s\n' "$1" | sed "$escape");;
(*)
optarg=" '$1'";;
esac
shift;;
+ (-f?*\'*)
+ optarg=" '"$(expr "X$option" : 'X-f\(.*\)' | sed "$escape")
+ option=-f;;
+ (-f?*)
+ optarg=" '"$(expr "X$option" : 'X-f\(.*\)')\'
+ option=-f;;
+ (--file=*\'*)
+ optarg=" '"$(expr "X$option" : 'X--file=\(.*\)' | sed "$escape")
+ option=--file;;
+ (--file=*)
+ optarg=" '"$(expr "X$option" : 'X--file=\(.*\)')\'
+ option=--file;;
(--)
break;;
(-?*)
(*)
case $option in
(*\'*)
- operands="$operands '"$(printf '%sX\n' "$option" | sed "$escape");;
+ operands="$operands '"$(printf '%s\n' "$option" | sed "$escape");;
(*)
operands="$operands '$option'";;
esac
(-[drRzZ] | --di* | --exc* | --inc* | --rec* | --nu*)
printf >&2 '%s: %s: option not supported\n' "$0" "$option"
exit 2;;
- (-[ef]* | --file | --file=* | --reg*)
+ (-e* | --reg*)
+ have_pat=1;;
+ (-f | --file)
# The pattern is coming from a file rather than the command-line.
# If the file is actually stdin then we need to do a little
- # magic, (since we use stdin to pass the gzip output to grep).
- # So find a free fd and change the argument to then use this
- # file descriptor for the pattern.
+ # magic, since we use stdin to pass the gzip output to grep.
+ # Turn the -f option into an -e option by copying the file's
+ # contents into OPTARG.
case $optarg in
(" '-'" | " '/dev/stdin'" | " '/dev/fd/0'")
- pat_on_stdin=1
- eval 'test -e .' 2>/dev/null \
- && eval 'exists(){ test -e "$@"; }' \
- || eval 'exists(){ test -r "$@" || test -w "$@"; }'
- # Start search from 6 since the script already uses 3 and 5
- fd=6
- pat_fd=
- while : ; do
- if ! exists /proc/$$/fd/$fd; then
- pat_fd=$fd
- break;
- fi
- fd=$(expr $fd + 1)
- if test $fd = 255; then
- printf >&2 '%s: no free file descriptor\n' "$0"
- exit 2
- fi
- done
- optarg=/dev/fd/$pat_fd;
+ option=-e
+ optarg=" '"$(sed "$escape") || exit 2;;
esac
have_pat=1;;
(--h | --he | --hel | --help)
files_with_matches=1;;
(-L | --files-witho*)
files_without_matches=1;;
- (--no-f*)
+ (-h | --no-f*)
no_filename=1;;
(-V | --v | --ve | --ver | --vers | --versi | --versio | --version)
echo "$version" || exit 2
case $option in
(*\'?*)
- option=\'$(expr "X${option}X" : 'X\(.*\)' | sed "$escape");;
+ option=\'$(printf '%s\n' "$option" | sed "$escape");;
(*)
option="'$option'";;
esac
if test $have_pat -eq 0; then
case ${1?"missing pattern; try \`$0 --help' for help"} in
(*\'*)
- grep="$grep -- '"$(printf '%sX\n' "$1" | sed "$escape");;
+ grep="$grep -- '"$(printf '%s\n' "$1" | sed "$escape");;
(*)
grep="$grep -- '$1'";;
esac
# Fail if gzip or grep (or sed) fails.
gzip_status=$(
exec 5>&1
- if test $pat_on_stdin -eq 1; then
- eval "exec $pat_fd<&0"
- fi
(gzip -cdfq -- "$i" 5>&-; echo $? >&5) 3>&- |
if test $files_with_matches -eq 1; then
eval "$grep" >/dev/null && { printf '%s\n' "$i" || exit 2; }
elif test $files_without_matches -eq 1; then
eval "$grep" >/dev/null || {
- r=$?
- if test $r -eq 1; then
- printf '%s\n' "$i" || r=2
- fi
- exit $r
+ r=$?
+ if test $r -eq 1; then
+ printf '%s\n' "$i" || r=2
+ fi
+ exit $r
}
elif test $with_filename -eq 0 &&
- { test $# -eq 1 || test $no_filename -eq 1; }; then
+ { test $# -eq 1 || test $no_filename -eq 1; }; then
eval "$grep"
else
case $i in
(*'
'* | *'&'* | *'\'* | *'|'*)
i=$(printf '%s\n' "$i" |
- sed '
- $!N
- $s/[&\|]/\\&/g
- $s/\n/\\n/g
- ');;
+ sed '
+ $!N
+ $s/[&\|]/\\&/g
+ $s/\n/\\n/g
+ ');;
esac
sed_script="s|^|$i:|"
# Fail if grep or sed fails.
r=$(
- exec 4>&1
- (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
- ) || r=2
- exit $r
+ exec 4>&1
+ (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
+ ) && exit $r
+ r=$?
+ test 1 -lt $r && exit $r || exit 2
fi >&3 5>&-
)
r=$?
+ test 128 -lt $r && exit $r
test "$gzip_status" -eq 0 || test "$gzip_status" -eq 2 || r=2
test $res -lt $r && res=$r
done
projects / debian / gzip / blobdiff