From owner-svn-src-head@FreeBSD.ORG  Wed Nov 19 00:14:15 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 76922106564A;
	Wed, 19 Nov 2008 00:14:15 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60DA88FC19;
	Wed, 19 Nov 2008 00:14:15 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAJ0EFfa098226;
	Wed, 19 Nov 2008 00:14:15 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAJ0EFh0098225;
	Wed, 19 Nov 2008 00:14:15 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200811190014.mAJ0EFh0098225@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 19 Nov 2008 00:14:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185074 - head/usr.bin/killall
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 19 Nov 2008 00:14:15 -0000

Author: delphij
Date: Wed Nov 19 00:14:15 2008
New Revision: 185074
URL: http://svn.freebsd.org/changeset/base/185074

Log:
  Use strlcpy() where appropriate.

Modified:
  head/usr.bin/killall/killall.c

Modified: head/usr.bin/killall/killall.c
==============================================================================
--- head/usr.bin/killall/killall.c	Wed Nov 19 00:09:01 2008	(r185073)
+++ head/usr.bin/killall/killall.c	Wed Nov 19 00:14:15 2008	(r185074)
@@ -64,8 +64,7 @@ upper(const char *str)
 	static char buf[80];
 	char *s;
 
-	strncpy(buf, str, sizeof(buf));
-	buf[sizeof(buf) - 1] = '\0';
+	strlcpy(buf, str, sizeof(buf));
 	for (s = buf; *s; s++)
 		*s = toupper((unsigned char)*s);
 	return buf;
@@ -327,8 +326,7 @@ main(int ac, char **av)
 		if ((procs[i].ki_stat & SZOMB) == SZOMB && !zflag)
 			continue;
 		thispid = procs[i].ki_pid;
-		strncpy(thiscmd, procs[i].ki_comm, MAXCOMLEN);
-		thiscmd[MAXCOMLEN] = '\0';
+		strlcpy(thiscmd, procs[i].ki_comm, sizeof(thiscmd));
 		thistdev = procs[i].ki_tdev;
 		if (eflag)
 			thisuid = procs[i].ki_uid;	/* effective uid */