Marcus Meissner
aa667cf72c
- update to 1.5 - gzip -cdf mishandles some concatenated input streams: test it - gzip -cdf now handles concatenation of gzip'd and uncompressed data - gzip: fix a data-loss bug when decompressing with --suffix='' - gzip: fix nondeterministic compression results - fix "znew -K" to work without use of compress utility - Decode FHCRC flag properly, as per Internet RFC 1952. - zgrep: fix parsing of -Eh options - zgrep: terminate gracefully when a pipeline is interrupted by a signal - zgrep: fix shell portability bug with -f; fix mishandling of "-e -" - zless: decompress stdin too, if less 429 or later - dropped gzip-stdio.in.patch, refreshed others OBS-URL: https://build.opensuse.org/request/show/138375 OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=20
25 lines
684 B
Diff
25 lines
684 B
Diff
Index: zgrep.in
|
|
===================================================================
|
|
--- zgrep.in.orig 2012-01-01 09:53:58.000000000 +0100
|
|
+++ zgrep.in 2012-10-16 13:22:26.304769138 +0200
|
|
@@ -174,10 +174,18 @@ res=0
|
|
|
|
for i
|
|
do
|
|
+ case $i in
|
|
+ *.bz2)
|
|
+ uncompress=bzip2
|
|
+ ;;
|
|
+ *)
|
|
+ uncompress=gzip
|
|
+ ;;
|
|
+ esac
|
|
# Fail if gzip or grep (or sed) fails.
|
|
gzip_status=$(
|
|
exec 5>&1
|
|
- (gzip -cdfq -- "$i" 5>&-; echo $? >&5) 3>&- |
|
|
+ ($uncompress -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
|