From owner-svn-src-head@FreeBSD.ORG  Tue Jun 11 17:46:33 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3EA4549B;
 Tue, 11 Jun 2013 17:46:33 +0000 (UTC) (envelope-from flo@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 30FF51156;
 Tue, 11 Jun 2013 17:46:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BHkXMX028423;
 Tue, 11 Jun 2013 17:46:33 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BHkX5u028422;
 Tue, 11 Jun 2013 17:46:33 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201306111746.r5BHkX5u028422@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Tue, 11 Jun 2013 17:46:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251618 - head/sbin/dmesg
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: Tue, 11 Jun 2013 17:46:33 -0000

Author: flo (ports committer)
Date: Tue Jun 11 17:46:32 2013
New Revision: 251618
URL: http://svnweb.freebsd.org/changeset/base/251618

Log:
  Move the check whether the clear flag is set. This has 2 advantages
  
  - When operating on a core file (-M) and -c is specified we don't clear
    the message buffer of the running system.
  - If we don't have permission to clear the buffer print the error message
    only. That's what Linux does in this case, where this feature was ported
    from, and it ensures that the error message doesn't get lost in the noise.
  
  Discussed with:	antoine, cognet
  Approved by:	cognet

Modified:
  head/sbin/dmesg/dmesg.c

Modified: head/sbin/dmesg/dmesg.c
==============================================================================
--- head/sbin/dmesg/dmesg.c	Tue Jun 11 15:37:07 2013	(r251617)
+++ head/sbin/dmesg/dmesg.c	Tue Jun 11 17:46:32 2013	(r251618)
@@ -120,6 +120,9 @@ main(int argc, char *argv[])
 			errx(1, "malloc failed");
 		if (sysctlbyname("kern.msgbuf", bp, &buflen, NULL, 0) == -1)
 			err(1, "sysctl kern.msgbuf");
+		if (clear)
+			if (sysctlbyname("kern.msgbuf_clear", NULL, NULL, &clear, sizeof(int)))
+				err(1, "sysctl kern.msgbuf_clear");
 	} else {
 		/* Read in kernel message buffer and do sanity checks. */
 		kd = kvm_open(nlistf, memf, NULL, O_RDONLY, "dmesg");
@@ -196,10 +199,6 @@ main(int argc, char *argv[])
 		(void)strvisx(visbp, p, nextp - p, 0);
 		(void)printf("%s", visbp);
 	}
-	if (clear)
-		if (sysctlbyname("kern.msgbuf_clear", NULL, NULL, &clear, sizeof(int)))
-			err(1, "sysctl kern.msgbuf_clear");
-
 	exit(0);
 }