svn commit: r195349 - in stable/7/usr.sbin/lpr: . lp

[Brian Somers]

Author: brian
Date: Sun Jul  5 06:32:10 2009
New Revision: 195349
URL: http://svn.freebsd.org/changeset/base/195349

Log:
  MFC: Add -m and -t options.
  
  PR:		129554

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

Modified: stable/7/usr.sbin/lpr/lp/lp.1
==============================================================================
--- stable/7/usr.sbin/lpr/lp/lp.1	Sun Jul  5 06:28:23 2009	(r195348)
+++ stable/7/usr.sbin/lpr/lp/lp.1	Sun Jul  5 06:32:10 2009	(r195349)
@@ -78,6 +78,8 @@ or
 .Ev PRINTER
 (with this precedence)
 are taken as the destination printer.
+.It Fl m
+Send mail upon completion.
 .It Fl n Ar num
 Specify that
 .Ar num
@@ -91,6 +93,9 @@ Silent operation.
 Not supported,
 provided only as a compatibility option for
 .St -susv2 .
+.It Fl t Ar title
+Set the job title to
+.Ar title .
 .El
 .Sh ENVIRONMENT
 As described above, the variables

Modified: stable/7/usr.sbin/lpr/lp/lp.sh
==============================================================================
--- stable/7/usr.sbin/lpr/lp/lp.sh	Sun Jul  5 06:28:23 2009	(r195348)
+++ stable/7/usr.sbin/lpr/lp/lp.sh	Sun Jul  5 06:32:10 2009	(r195349)
@@ -41,6 +41,8 @@
 
 ncopies=""
 symlink="-s"
+mailafter=""
+title=""
 
 # Posix says LPDEST gets precedence over PRINTER
 dest=${LPDEST:-${PRINTER:-lp}}
@@ -51,7 +53,7 @@ dest=${LPDEST:-${PRINTER:-lp}}
 # XXX We include the -s flag as a dummy.  SUSv2 requires it,
 # although we do not yet emit the affected messages.
 #
-while getopts "cd:n:o:s" option
+while getopts "cd:mn:o:st:" option
 do
 	case $option in
 
@@ -59,12 +61,16 @@ do
 		symlink="";;
 	d)			# destination
 		dest="${OPTARG}";;
+	m)			# mail after job
+		mailafter="-m";;
 	n)			# number of copies
 		ncopies="-#${OPTARG}";;
 	o)			# (printer option)
 		: ;;
 	s)			# (silent option)
 		: ;;
+	t)			# title for banner page
+		title="-J${OPTARG}";;
 	*)			# (error msg printed by getopts)
 		exit 2;;
 	esac
@@ -72,4 +78,4 @@ done
 
 shift $(($OPTIND - 1))
 
-exec /usr/bin/lpr "-P${dest}" ${symlink} ${ncopies} "$@"
+exec /usr/bin/lpr "-P${dest}" ${symlink} ${ncopies} ${mailafter} "${title}" "$@"