Date: Fri, 2 Nov 2012 18:54:10 +0000 (UTC) From: Alfred Perlstein <alfred@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r242488 - user/alfred/9-alfred/sys/kern Message-ID: <201211021854.qA2IsAVd082142@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <eric@vangyzen.net> 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211021854.qA2IsAVd082142>