From owner-svn-src-stable-7@FreeBSD.ORG  Tue Oct  6 21:49:14 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DA51106566B;
	Tue,  6 Oct 2009 21:49:14 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF8B38FC0C;
	Tue,  6 Oct 2009 21:49:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n96LnDxA065034;
	Tue, 6 Oct 2009 21:49:13 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n96LnDgL065032;
	Tue, 6 Oct 2009 21:49:13 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <200910062149.n96LnDgL065032@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 6 Oct 2009 21:49:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197819 - in stable/7/usr.sbin/lpr: . lp
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 21:49:14 -0000

Author: jilles
Date: Tue Oct  6 21:49:13 2009
New Revision: 197819
URL: http://svn.freebsd.org/changeset/base/197819

Log:
  MFC r197625: Fix using lp(1) without the new -t option after r195349.

Modified:
  stable/7/usr.sbin/lpr/   (props changed)
  stable/7/usr.sbin/lpr/lp/lp.sh

Modified: stable/7/usr.sbin/lpr/lp/lp.sh
==============================================================================
--- stable/7/usr.sbin/lpr/lp/lp.sh	Tue Oct  6 21:46:03 2009	(r197818)
+++ stable/7/usr.sbin/lpr/lp/lp.sh	Tue Oct  6 21:49:13 2009	(r197819)
@@ -70,7 +70,7 @@ do
 	s)			# (silent option)
 		: ;;
 	t)			# title for banner page
-		title="-J${OPTARG}";;
+		title="${OPTARG}";;
 	*)			# (error msg printed by getopts)
 		exit 2;;
 	esac
@@ -78,4 +78,4 @@ done
 
 shift $(($OPTIND - 1))
 
-exec /usr/bin/lpr "-P${dest}" ${symlink} ${ncopies} ${mailafter} "${title}" "$@"
+exec /usr/bin/lpr "-P${dest}" ${symlink} ${ncopies} ${mailafter} ${title:+-J"${title}"} "$@"