From owner-svn-src-all@FreeBSD.ORG  Fri Nov  2 18:57:38 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E9F89685;
 Fri,  2 Nov 2012 18:57:38 +0000 (UTC)
 (envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id D2B778FC0C;
 Fri,  2 Nov 2012 18:57:38 +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 qA2Ivcih082691;
 Fri, 2 Nov 2012 18:57:38 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA2Ivc2O082689;
 Fri, 2 Nov 2012 18:57:38 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201211021857.qA2Ivc2O082689@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Fri, 2 Nov 2012 18:57:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242489 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 02 Nov 2012 18:57:39 -0000

Author: alfred
Date: Fri Nov  2 18:57:38 2012
New Revision: 242489
URL: http://svn.freebsd.org/changeset/base/242489

Log:
  Merge 242488, better use of strlcpy.
  
  Submitted by:	Eric van Gyzen <eric@vangyzen.net>

Modified:
  head/sys/kern/kern_shutdown.c
Directory Properties:
  head/sys/   (props changed)

Modified: head/sys/kern/kern_shutdown.c
==============================================================================
--- head/sys/kern/kern_shutdown.c	Fri Nov  2 18:54:10 2012	(r242488)
+++ head/sys/kern/kern_shutdown.c	Fri Nov  2 18:57:38 2012	(r242489)
@@ -720,6 +720,7 @@ SYSCTL_STRING(_kern_shutdown, OID_AUTO, 
 int
 set_dumper(struct dumperinfo *di, const char *devname)
 {
+	size_t wantcopy;
 
 	if (di == NULL) {
 		bzero(&dumper, sizeof dumper);
@@ -729,8 +730,8 @@ set_dumper(struct dumperinfo *di, const 
 	if (dumper.dumper != NULL)
 		return (EBUSY);
 	dumper = *di;
-	strlcpy(dumpdevname, devname, sizeof(dumpdevname));
-	if (strlen(dumpdevname) != strlen(devname)) {
+	wantcopy = strlcpy(dumpdevname, devname, sizeof(dumpdevname));
+	if (wantcopy >= sizeof(dumpdevname)) {
 		printf("set_dumper: device name truncated from '%s' -> '%s'\n",
 			devname, dumpdevname);
 	}