From owner-svn-src-head@FreeBSD.ORG  Mon Dec  3 21:49:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 42039E76;
 Mon,  3 Dec 2012 21:49:38 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0E0E38FC18;
 Mon,  3 Dec 2012 21:49:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3Lnbld055990;
 Mon, 3 Dec 2012 21:49:37 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3LnbZV055989;
 Mon, 3 Dec 2012 21:49:37 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212032149.qB3LnbZV055989@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 3 Dec 2012 21:49:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243834 - head/usr.bin/less
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Dec 2012 21:49:38 -0000

Author: delphij
Date: Mon Dec  3 21:49:37 2012
New Revision: 243834
URL: http://svnweb.freebsd.org/changeset/base/243834

Log:
  Note that the manual page of less(1) says:
  
    Note  that  a preprocessor cannot output an empty file, since that
    is interpreted as meaning there is no replacement, and the  origi-
    nal file is used.  To avoid this, if LESSOPEN starts with two ver-
    tical bars, the exit status of the script becomes meaningful.   If
    the  exit  status is zero, the output is considered to be replace-
    ment text, even if it empty.  If the exit status is  nonzero,  any
    output  is ignored and the original file is used.  For compatibil-
    ity with previous versions of less, if LESSOPEN starts  with  only
    one vertical bar, the exit status of the preprocessor is ignored.
  
  Use two pipe symbols for zless, so that zless'ing a compressed empty
  file will give output rather than being interpreted as its compressed
  form, which is typically a binary.
  
  Thanks Mark Nudelman for pointing out this difference and the
  suggested solution.
  
  Reported by:	Matthias Meyser <meyser xenet.de>
  PR:		bin/168839
  MFC after:	2 weeks

Modified:
  head/usr.bin/less/zless.sh

Modified: head/usr.bin/less/zless.sh
==============================================================================
--- head/usr.bin/less/zless.sh	Mon Dec  3 21:38:02 2012	(r243833)
+++ head/usr.bin/less/zless.sh	Mon Dec  3 21:49:37 2012	(r243834)
@@ -3,5 +3,5 @@
 # $FreeBSD$
 #
 
-export LESSOPEN="|/usr/bin/lesspipe.sh %s"
+export LESSOPEN="||/usr/bin/lesspipe.sh %s"
 exec /usr/bin/less "$@"