From owner-svn-src-all@FreeBSD.ORG  Mon Apr 30 01:10:14 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E0AE1065670;
	Mon, 30 Apr 2012 01:10:14 +0000 (UTC) (envelope-from gad@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0945A8FC08;
	Mon, 30 Apr 2012 01:10:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3U1ADo0041143;
	Mon, 30 Apr 2012 01:10:13 GMT (envelope-from gad@svn.freebsd.org)
Received: (from gad@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3U1ADTT041141;
	Mon, 30 Apr 2012 01:10:13 GMT (envelope-from gad@svn.freebsd.org)
Message-Id: <201204300110.q3U1ADTT041141@svn.freebsd.org>
From: Garance A Drosehn <gad@FreeBSD.org>
Date: Mon, 30 Apr 2012 01:10:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234826 - head/usr.sbin/lpr/lpc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2012 01:10:14 -0000

Author: gad
Date: Mon Apr 30 01:10:13 2012
New Revision: 234826
URL: http://svn.freebsd.org/changeset/base/234826

Log:
  Print out a warning message if a `lpc setstatus' is done when
  the queue is not 'lpc stop'-ed.  In that situation `lpq' will
  not display the status message to the user, and the operator
  may think the queue is already stopped when it is not.
  
  MFC after:	3 weeks

Modified:
  head/usr.sbin/lpr/lpc/cmds.c

Modified: head/usr.sbin/lpr/lpc/cmds.c
==============================================================================
--- head/usr.sbin/lpr/lpc/cmds.c	Mon Apr 30 01:08:18 2012	(r234825)
+++ head/usr.sbin/lpr/lpc/cmds.c	Mon Apr 30 01:10:13 2012	(r234826)
@@ -1009,12 +1009,30 @@ setstatus_gi(int argc __unused, char *ar
 void
 setstatus_q(struct printer *pp)
 {
+	struct stat stbuf;
+	int not_shown;
 	char lf[MAXPATHLEN];
 
 	lock_file_name(pp, lf, sizeof lf);
 	printf("%s:\n", pp->printer);
 
 	upstat(pp, generic_msg, 1);
+
+	/*
+	 * Warn the user if 'lpq' will not display this new status-message.
+	 * Note that if lock file does not exist, then the queue is enabled
+	 * for both queuing and printing.
+	 */
+	not_shown = 1;
+	if (stat(lf, &stbuf) >= 0) {
+		if (stbuf.st_mode & LFM_PRINT_DIS)
+			not_shown = 0;
+	}
+	if (not_shown) {
+		printf("\tnote: This queue currently has printing enabled,\n");
+		printf("\t    so this -msg will only be shown by 'lpq' if\n");
+		printf("\t    a job is actively printing on it.\n");
+	}
 }
 
 /*