From owner-svn-src-all@FreeBSD.ORG  Mon Mar 21 08:37:51 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F3031065673;
	Mon, 21 Mar 2011 08:37:51 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DD9F8FC19;
	Mon, 21 Mar 2011 08:37:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2L8bpup004951;
	Mon, 21 Mar 2011 08:37:51 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2L8bpHC004949;
	Mon, 21 Mar 2011 08:37:51 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201103210837.p2L8bpHC004949@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 21 Mar 2011 08:37:50 +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: r219816 - head/sbin/hastd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 21 Mar 2011 08:37:51 -0000

Author: pjd
Date: Mon Mar 21 08:37:50 2011
New Revision: 219816
URL: http://svn.freebsd.org/changeset/base/219816

Log:
  Use snprlcat() instead of two strlcat(3)s.
  
  MFC after:	1 week

Modified:
  head/sbin/hastd/hooks.c

Modified: head/sbin/hastd/hooks.c
==============================================================================
--- head/sbin/hastd/hooks.c	Mon Mar 21 08:36:50 2011	(r219815)
+++ head/sbin/hastd/hooks.c	Mon Mar 21 08:37:50 2011	(r219816)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <pjdlog.h>
 
 #include "hooks.h"
+#include "subr.h"
 #include "synch.h"
 
 /* Report processes that are running for too long not often than this value. */
@@ -184,8 +185,8 @@ hook_alloc(const char *path, char **args
 	(void)strlcpy(hp->hp_comm, path, sizeof(hp->hp_comm));
 	/* We start at 2nd argument as we don't want to have exec name twice. */
 	for (ii = 1; args[ii] != NULL; ii++) {
-		(void)strlcat(hp->hp_comm, " ", sizeof(hp->hp_comm));
-		(void)strlcat(hp->hp_comm, args[ii], sizeof(hp->hp_comm));
+		(void)snprlcat(hp->hp_comm, sizeof(hp->hp_comm), " %s",
+		    args[ii]);
 	}
 	if (strlen(hp->hp_comm) >= sizeof(hp->hp_comm) - 1) {
 		pjdlog_error("Exec path too long, correct configuration file.");