maint: use noreturn, not ATTRIBUTE_NORETURN

[debian/gzip] / zless.in

diff --git a/zless.in b/zless.in
index 92209f27e60c7f293a912339057dd8ec800bc5c2..9a3f399d5d37c36942b7240b5b45518a15b531f3 100644 (file)
--- a/zless.in
+++ b/zless.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

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

 
 # 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
 
 # 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


@@ -16,16 +16,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="zless (gzip) @VERSION@
 version="zless (gzip) @VERSION@

-Copyright (C) 2007, 2011-2013 Free Software Foundation, Inc.
+Copyright (C) 2007, 2011-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 Paul Eggert."
 There is NO WARRANTY, to the extent permitted by law.
 
 Written by Paul Eggert."


@@ -53,15 +47,25 @@ if test "${LESSMETACHARS+set}" != set; then
   export LESSMETACHARS
 fi
 
   export LESSMETACHARS
 fi
 

-less_version=`less -V` || exit
+less_version=`less -V 2>/dev/null`
+case $less_version in
+less' '45[1-9]* | \
+less' '4[6-9][0-9]* | \
+less' '[5-9][0-9][0-9]* | \
+less' '[1-9][0-9][0-9][0-9]*)
+   check_exit_status='|';;
+*) check_exit_status='';;
+esac

 case $less_version in
 case $less_version in

-'less 429
-'* | 'less '4[3-9][0-9]* | 'less '[5-9][0-9][0-9]* | 'less '[1-9][0-9][0-9][0-9]*)
+less' '429* | \
+less' '4[3-9][0-9]* | \
+less' '[5-9][0-9][0-9]* | \
+less' '[1-9][0-9][0-9][0-9]*)

    use_input_pipe_on_stdin='-';;
 *) use_input_pipe_on_stdin='';;
 esac
 
    use_input_pipe_on_stdin='-';;
 *) use_input_pipe_on_stdin='';;
 esac
 

-LESSOPEN="|${use_input_pipe_on_stdin}gzip -cdfq -- %s"
+LESSOPEN="|$check_exit_status${use_input_pipe_on_stdin}gzip -cdfq -- %s"

 export LESSOPEN
 
 exec less "$@"
 export LESSOPEN
 
 exec less "$@"