maint: adjust copyright notices in *.in files to be consistent

[debian/gzip] / zgrep.in

diff --git a/zgrep.in b/zgrep.in
index 6afa62cf64851eb253b8160db95985b18237ee21..a2f4201afbfb41f065e9400868015018a5204559 100644 (file)
--- a/zgrep.in
+++ b/zgrep.in
@@ -3,8 +3,8 @@
 # zgrep -- a wrapper around a grep program that decompresses files as needed
 # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
 
 # 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, 2010 Free Software
-# Foundation
+# Copyright (C) 1998, 2001-2002, 2006-2007, 2009-2015 Free Software
+# Foundation, Inc.

 
 # Copyright (C) 1993 Jean-loup Gailly
 
 
 # Copyright (C) 1993 Jean-loup Gailly
 


@@ -28,10 +28,10 @@ case $1 in
 esac
 PATH=$bindir:$PATH
 
 esac
 PATH=$bindir:$PATH
 

-grep='${GREP-grep}'
+grep='${GREP-'\''@GREP@'\''}'

 
 version='zgrep (gzip) @VERSION@
 
 version='zgrep (gzip) @VERSION@

-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2010-2015 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.
 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.


@@ -42,19 +42,21 @@ usage="Usage: $0 [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
 uncompressed contents if they are compressed.
 
 Look for instances of PATTERN in the input FILEs, using their
 uncompressed contents if they are compressed.
 

-OPTIONs are the same as for 'grep'.
+OPTIONs are the same as for 'grep', except that the following 'grep'
+options are not supported: --dereference-recursive (-R), --directories (-d),
+--exclude, --exclude-from, --exclude-dir, --include, --null (-Z),
+--null-data (-z), and --recursive (-r).

 
 Report bugs to <bug-gzip@gnu.org>."
 
 # sed script to escape all ' for the shell, and then (to handle trailing
 
 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
 escape='
   s/'\''/'\''\\'\'''\''/g

-  $s/X$/'\''/
+  $s/$/'\''/

 '
 operands=
 have_pat=0
 '
 operands=
 have_pat=0

-pat_on_stdin=0

 files_with_matches=0
 files_without_matches=0
 no_filename=0
 files_with_matches=0
 files_without_matches=0
 no_filename=0


@@ -66,8 +68,8 @@ while test $# -ne 0; do
   optarg=
 
   case $option in
   optarg=
 
   case $option in

-  (-[0123456789EFGHIKLPRTUVZabchilnoqrsuvwxyz]?*)
-    arg2=-\'$(expr "X${option}X" : 'X-.[0-9]*\(.*\)' | sed "$escape")
+  (-[0123456789EFGHIKLPRTUVZabchilnoqrsuvwxyz]*[!0123456789]*)
+    arg2=-\'$(expr "X$option" : 'X-.[0-9]*\(.*\)' | sed "$escape")

     eval "set -- $arg2 "'${1+"$@"}'
     option=$(expr "X$option" : 'X\(-.[0-9]*\)');;
   (--binary-*=* | --[lm]a*=* | --reg*=*)
     eval "set -- $arg2 "'${1+"$@"}'
     option=$(expr "X$option" : 'X\(-.[0-9]*\)');;
   (--binary-*=* | --[lm]a*=* | --reg*=*)


@@ -75,11 +77,23 @@ while test $# -ne 0; do
   (-[ABCDXdefm] | binary-* | --file | --[lm]a* | --reg*)
     case ${1?"$option option requires an argument"} in
     (*\'*)
   (-[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;;
     (*)
       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;;
   (-?*)
   (--)
     break;;
   (-?*)


@@ -87,7 +101,7 @@ while test $# -ne 0; do
   (*)
     case $option in
     (*\'*)
   (*)
     case $option in
     (*\'*)

-      operands="$operands '"$(printf '%sX\n' "$option" | sed "$escape");;
+      operands="$operands '"$(printf '%s\n' "$option" | sed "$escape");;

     (*)
       operands="$operands '$option'";;
     esac
     (*)
       operands="$operands '$option'";;
     esac


@@ -99,33 +113,18 @@ while test $# -ne 0; do
   (-[drRzZ] | --di* | --exc* | --inc* | --rec* | --nu*)
     printf >&2 '%s: %s: option not supported\n' "$0" "$option"
     exit 2;;
   (-[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
     # 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'")
     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)
     esac
     have_pat=1;;
   (--h | --he | --hel | --help)


@@ -149,7 +148,7 @@ while test $# -ne 0; do
 
   case $option in
   (*\'?*)
 
   case $option in
   (*\'?*)

-    option=\'$(expr "X${option}X" : 'X\(.*\)' | sed "$escape");;
+    option=\'$(printf '%s\n' "$option" | sed "$escape");;

   (*)
     option="'$option'";;
   esac
   (*)
     option="'$option'";;
   esac


@@ -162,7 +161,7 @@ eval "set -- $operands "'${1+"$@"}'
 if test $have_pat -eq 0; then
   case ${1?"missing pattern; try \`$0 --help' for help"} in
   (*\'*)
 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
   (*)
     grep="$grep -- '$1'";;
   esac


@@ -174,16 +173,13 @@ if test $# -eq 0; then
 fi
 
 exec 3>&1
 fi
 
 exec 3>&1

-res=0
+res=1

 
 for i
 do
   # Fail if gzip or grep (or sed) fails.
   gzip_status=$(
     exec 5>&1
 
 for i
 do
   # 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; }
     (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; }


@@ -217,15 +213,27 @@ do
         (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
       ) && exit $r
       r=$?
         (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
       ) && exit $r
       r=$?

-      test $r -gt 128 && test $r -le 143 && exit $r || exit 2
+      test 1 -lt $r && exit $r || exit 2

     fi >&3 5>&-
   )
   r=$?
     fi >&3 5>&-
   )
   r=$?

-  if test $r -gt 128 && test $r -le 143; then
-    kill -$(($r-128)) $$
-    exit $r
-  fi
-  test "$gzip_status" -eq 0 || test "$gzip_status" -eq 2 || r=2
-  test $res -lt $r && res=$r
+
+  # Ignore gzip status 2, as it is just a warning.
+  # gzip status 1 is an error, like grep status 2.
+  test $gzip_status -eq 2 && gzip_status=0
+  test $gzip_status -eq 1 && gzip_status=2
+
+  # Use the more serious of the grep and gzip statuses.
+  test $r -lt $gzip_status && r=$gzip_status
+
+  # Exit immediately on software configuration error.
+  test 126 -le $r && exit $r
+
+  # Accumulate the greatest status, except consider 0 to be greater than 1.
+  if test $r -le 1 && test $res -le 1; then
+     test $r -lt $res
+  else
+     test $res -lt $r
+  fi && res=$r

 done
 exit $res
 done
 exit $res