From e1de133c2ef2853c646fc02e07b0443729750d2b Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Tue, 11 Jun 2013 17:46:32 +0000 Subject: [PATCH] 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 --- sbin/dmesg/dmesg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 1d548a7bef3..f0fcb812587 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -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); }