tests: don’t be so strict about timestamps

[debian/gzip] / zmore.in

diff --git a/zmore.in b/zmore.in
index b5fbe669ee672d8ad77bd861fe6ff926d30f00c2..1c9cebb3dea1e4bcd9f05888a53f538d8bfdb5a1 100644 (file)
--- a/zmore.in
+++ b/zmore.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-# Copyright (C) 2001, 2002, 2007 Free Software Foundation
+# Copyright (C) 2001-2002, 2007, 2010-2017 Free Software Foundation, Inc.

 # Copyright (C) 1992, 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 1992, 1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify


@@ -17,16 +17,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 

-bindir=@bindir@
-case $1 in
---__bindir) bindir=${2?}; shift; shift;;
-esac
-PATH=$bindir:$PATH; export PATH
-

 version="zmore (gzip) @VERSION@
 version="zmore (gzip) @VERSION@

-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2010-2017 Free Software Foundation, Inc.

 This is free software.  You may redistribute copies of it under the terms of
 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>.
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.

 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Jean-loup Gailly."


@@ -36,57 +30,25 @@ Like 'more', but operate on the uncompressed contents of any compressed FILEs.
 
 Report bugs to <bug-gzip@gnu.org>."
 
 
 Report bugs to <bug-gzip@gnu.org>."
 

-if test "`echo -n a`" = "-n a"; then
-  # looks like a SysV system:
-  n1=''; n2='\c'
-else
-  n1='-n'; n2=''
-fi
-oldtty=`stty -g 2>/dev/null`
-if stty -cbreak 2>/dev/null; then
-  cb='cbreak'; ncb='-cbreak'
-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 && test -n "$oldtty"; then
-   trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
-else
-   trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
-fi
+case $1 in
+  --h*) exec printf '%s\n' "$usage";;
+  --v*) exec printf '%s\n' "$version";;
+  --) shift;;
+  -?*) printf >&2 '%s\n' "$0: $1: unknown option; try '$0 --help' for help"
+       exit 1;;
+esac

 
 if test $# = 0; then
     if test -t 0; then
 
 if test $# = 0; then
     if test -t 0; then

-       echo "$usage"
-    else
-       gzip -cdfq | eval ${PAGER-more}
+        printf >&2 '%s\n' "$0: missing operands; try '$0 --help' for help"
+        exit 1

     fi
     fi

-else
-    FIRST=1
-    for FILE
-    do
-       case $FILE in
-       --h*) exec echo "$usage";;
-       --v*) exec echo "$version";;
-       esac
-
-       < "$FILE" || continue
-       if test $FIRST -eq 0; then
-               echo $n1 "--More--(Next file: $FILE)$n2"
-               stty $cb -echo 2>/dev/null
-               ANS=`dd bs=1 count=1 2>/dev/null`
-               stty $ncb echo 2>/dev/null
-               echo " "
-               case "$ANS" in
-               [eq]) exit;;
-               esac
-       fi
-       if test "$ANS" != 's'; then
-               echo "------> $FILE <------"
-               gzip -cdfq -- "$FILE" | eval ${PAGER-more}
-       fi
-       if test -t 1; then
-               FIRST=0
-       fi
-    done
+    set -- -

 fi
 fi

+
+for FILE
+do
+  test $# -lt 2 ||
+    printf '::::::::::::::\n%s\n::::::::::::::\n' "$FILE" || break
+  gzip -cdfq -- "$FILE"
+done 2>&1 | eval ${PAGER-more}