From owner-svn-src-user@FreeBSD.ORG Fri Nov 2 18:54:11 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1415551B; Fri, 2 Nov 2012 18:54:11 +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 EF6BB8FC0C; Fri, 2 Nov 2012 18:54:10 +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 qA2IsAtq082144; Fri, 2 Nov 2012 18:54:10 GMT (envelope-from alfred@svn.freebsd.org) Received: (from alfred@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA2IsAVd082142; Fri, 2 Nov 2012 18:54:10 GMT (envelope-from alfred@svn.freebsd.org) Message-Id: <201211021854.qA2IsAVd082142@svn.freebsd.org> From: Alfred Perlstein Date: Fri, 2 Nov 2012 18:54:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r242488 - user/alfred/9-alfred/sys/kern X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2012 18:54:11 -0000 Author: alfred Date: Fri Nov 2 18:54:10 2012 New Revision: 242488 URL: http://svn.freebsd.org/changeset/base/242488 Log: Optimize sysctl, better strlcpy test. Submitted by: Eric van Gyzen Modified: user/alfred/9-alfred/sys/kern/kern_shutdown.c Modified: user/alfred/9-alfred/sys/kern/kern_shutdown.c ============================================================================== --- user/alfred/9-alfred/sys/kern/kern_shutdown.c Fri Nov 2 17:31:27 2012 (r242487) +++ user/alfred/9-alfred/sys/kern/kern_shutdown.c Fri Nov 2 18:54:10 2012 (r242488) @@ -719,6 +719,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); @@ -728,8 +729,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); }