mirror of https://gitee.com/openkylin/bzip2.git
various changes specific to Debian.
This patch gathers all changes before source format 3.0. Most of its history is lost. Some parts should probably be forwarded upstream. Gbp-Pq: Name 20-legacy.patch
This commit is contained in:
Anibal Monsalve Salazar
luoyaoming
parent
d2df8e557c
commit
f68714b74b
134
bzgrep
134
bzgrep
|
|
@ -1,27 +1,75 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Bzgrep wrapped for bzip2,
|
||||
# adapted from zgrep by Philippe Troin <phil@fifi.org> for Debian GNU/Linux.
|
||||
## zgrep notice:
|
||||
## zgrep -- a wrapper around a grep program that decompresses files as needed
|
||||
## Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
|
||||
# bzgrep -- a wrapper around a grep program that decompresses files as needed
|
||||
# Adapted from zgrep of the Debian gzip package by Anibal Monsalve Salazar.
|
||||
# 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="/usr/bin:$PATH"; export PATH
|
||||
|
||||
prog=`echo $0 | sed 's|.*/||'`
|
||||
prog=`echo "$0" | sed 's|.*/||'`
|
||||
case "$prog" in
|
||||
*egrep) grep=${EGREP-egrep} ;;
|
||||
*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;;
|
||||
-A | -B) opt="$opt $1 $2"; shift;;
|
||||
-[ABCdm])opt="$opt $1 $2"; shift;;
|
||||
--) opt="$opt $1"; after_dash_dash=1;;
|
||||
-*) opt="$opt $1";;
|
||||
*) if test -z "$pat"; then
|
||||
pat="$1"
|
||||
|
|
@ -35,19 +83,9 @@ done
|
|||
if test -z "$pat"; then
|
||||
echo "grep through bzip2 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
|
||||
bzip2 -cdfq | $grep $opt "$pat"
|
||||
exit $?
|
||||
|
|
@ -56,30 +94,40 @@ fi
|
|||
res=0
|
||||
for i do
|
||||
if test -f "$i"; then :; else if test -f "$i.bz2"; then i="$i.bz2"; fi; fi
|
||||
if test $list -eq 1; then
|
||||
bzip2 -cdfq "$i" | $grep $opt "$pat" 2>&1 > /dev/null && echo $i
|
||||
r=$?
|
||||
elif test $# -eq 1 -o $silent -eq 1; then
|
||||
bzip2 -cdfq "$i" | $grep $opt "$pat"
|
||||
r=$?
|
||||
else
|
||||
j=$(echo "$i" | sed 's/\\/&&/g;s/|/\\&/g;s/&/\\&/g')
|
||||
j=`printf "%s" "$j" | tr '\n' ' '`
|
||||
# A trick adapted from
|
||||
# https://groups.google.com/forum/#!original/comp.unix.shell/x1345iu10eg/Nn1n-1r1uU0J
|
||||
# that has the same effect as the following bash code:
|
||||
# bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
|
||||
# r=${PIPESTATUS[1]}
|
||||
exec 3>&1
|
||||
eval `
|
||||
bzip2 -cdfq -- "$i" |
|
||||
if test $files_with_matches -eq 1; then
|
||||
$grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
|
||||
elif test $files_without_matches -eq 1; then
|
||||
$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
|
||||
sed_script="s|^|${i}:|"
|
||||
fi
|
||||
# Hack adapted from GPLed code at
|
||||
# https://groups.google.com/forum/#!original/comp.unix.shell/x1345iu10eg/Nn1n-1r1uU0J
|
||||
# Has the same effect as the following two lines of bash:
|
||||
#
|
||||
# $grep $opt "$pat" | sed "$sed_script"
|
||||
# exit ${PIPESTATUS[0]}
|
||||
#
|
||||
# Inside the `...`, fd4 goes to the pipe whose other end is read
|
||||
# and passed to eval; fd1 is the normal standard output
|
||||
# preserved the line before with exec 3>&1
|
||||
exec 3>&1
|
||||
eval `
|
||||
exec 4>&1 >&3 3>&-
|
||||
{
|
||||
bzip2 -cdfq "$i" 4>&-
|
||||
} | {
|
||||
$grep $opt "$pat" 4>&-; echo "r=$?;" >&4
|
||||
} | sed "s|^|${j}:|"
|
||||
`
|
||||
fi
|
||||
test "$r" -ne 0 && res="$r"
|
||||
$grep $opt "$pat" 4>&-; echo "r=$?;" >&4
|
||||
} | sed "$sed_script"
|
||||
`
|
||||
exit $r
|
||||
fi
|
||||
r=$?
|
||||
test $res -lt $r && res=$r
|
||||
done
|
||||
exit $res
|
||||
|
|
|
|||
8
bzip2.c
8
bzip2.c
|
|
@ -1890,7 +1890,9 @@ IntNative main ( IntNative argc, Char *argv[] )
|
|||
case '8': blockSize100k = 8; break;
|
||||
case '9': blockSize100k = 9; break;
|
||||
case 'V':
|
||||
case 'L': license(); break;
|
||||
case 'L': license();
|
||||
exit ( 0 );
|
||||
break;
|
||||
case 'v': verbosity++; break;
|
||||
case 'h': usage ( progName );
|
||||
exit ( 0 );
|
||||
|
|
@ -1916,8 +1918,8 @@ IntNative main ( IntNative argc, Char *argv[] )
|
|||
if (ISFLAG("--keep")) keepInputFiles = True; else
|
||||
if (ISFLAG("--small")) smallMode = True; else
|
||||
if (ISFLAG("--quiet")) noisy = False; else
|
||||
if (ISFLAG("--version")) license(); else
|
||||
if (ISFLAG("--license")) license(); else
|
||||
if (ISFLAG("--version")) { license(); exit ( 0 ); } else
|
||||
if (ISFLAG("--license")) { license(); exit ( 0 ); } else
|
||||
if (ISFLAG("--exponential")) workFactor = 1; else
|
||||
if (ISFLAG("--repetitive-best")) redundant(aa->name); else
|
||||
if (ISFLAG("--repetitive-fast")) redundant(aa->name); else
|
||||
|
|
|
|||
8
bzmore
8
bzmore
|
|
@ -24,10 +24,10 @@ else
|
|||
# 'stty min 1' resets eof to ^a on both SunOS and SysV!
|
||||
cb='min 1 -icanon'; ncb='icanon eof ^d'
|
||||
fi
|
||||
if test $? -eq 0 -a -n "$oldtty"; then
|
||||
trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
|
||||
if test $? -eq 0 && test -n "$oldtty"; then
|
||||
trap 'stty $oldtty 2>/dev/null; exit' 0 INT QUIT TRAP USR1 PIPE TERM
|
||||
else
|
||||
trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
|
||||
trap 'stty $ncb echo 2>/dev/null; exit' 0 INT QUIT TRAP USR1 PIPE TERM
|
||||
fi
|
||||
|
||||
if test $# = 0; then
|
||||
|
|
@ -46,7 +46,7 @@ else
|
|||
ANS=`dd bs=1 count=1 2>/dev/null`
|
||||
stty $ncb echo 2>/dev/null
|
||||
echo " "
|
||||
if test "$ANS" = 'e' -o "$ANS" = 'q'; then
|
||||
if test "$ANS" = 'e' || test "$ANS" = 'q'; then
|
||||
exit
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue