From 3af41a23c4c0ac6f5fd116eb90591d9bea498158 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Fri, 9 Feb 2024 23:00:05 +0200 Subject: [PATCH] xzless: Use --show-preproc-errors with "less" 632 and newer. This makes "less" show a warning if a decompression error occurred. (cherry picked from commit fd0692b0525e6c26b496492be9e2c865cab734f8) (cherry picked from commit 5e7a8c0869d9b4c32c34d70b48b0935721aa37fd) --- src/scripts/xzless.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/scripts/xzless.in b/src/scripts/xzless.in index 79a849e2..93a415d7 100644 --- a/src/scripts/xzless.in +++ b/src/scripts/xzless.in @@ -47,13 +47,20 @@ if test "${LESSMETACHARS+set}" != set; then LESSMETACHARS="$space$tab$nl'"';*?"()<>[|&^`#\$%=~' fi -if test "$(less -V | { read _ ver _ && echo ${ver%%.*}; })" -ge 429; then +VER=$(less -V | { read _ ver _ && echo ${ver%%.*}; }) +if test "$VER" -ge 429; then # less 429 or later: LESSOPEN pipe will be used on # standard input if $LESSOPEN begins with |-. LESSOPEN="|-$xz -cdfqQ -- %s" else LESSOPEN="|$xz -cdfqQ -- %s" fi + +SHOW_PREPROC_ERRORS= +if test "$VER" -ge 632; then + SHOW_PREPROC_ERRORS=--show-preproc-errors +fi + export LESSMETACHARS LESSOPEN -exec less "$@" +exec less $SHOW_PREPROC_ERRORS "$@"