From owner-svn-src-all@FreeBSD.ORG  Mon Aug  9 20:16:52 2010
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 EA4AD1065673;
	Mon,  9 Aug 2010 20:16:52 +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 D9AB48FC1E;
	Mon,  9 Aug 2010 20:16:52 +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 o79KGqrn095212;
	Mon, 9 Aug 2010 20:16:52 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o79KGqma095210;
	Mon, 9 Aug 2010 20:16:52 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201008092016.o79KGqma095210@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 9 Aug 2010 20:16:52 +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: r211116 - head/tools/regression/fstest
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, 09 Aug 2010 20:16:53 -0000

Author: pjd
Date: Mon Aug  9 20:16:52 2010
New Revision: 211116
URL: http://svn.freebsd.org/changeset/base/211116

Log:
  Linux has no strlcpy().

Modified:
  head/tools/regression/fstest/fstest.c

Modified: head/tools/regression/fstest/fstest.c
==============================================================================
--- head/tools/regression/fstest/fstest.c	Mon Aug  9 19:53:24 2010	(r211115)
+++ head/tools/regression/fstest/fstest.c	Mon Aug  9 20:16:52 2010	(r211116)
@@ -541,7 +541,8 @@ call_syscall(struct syscall_desc *scall,
 		struct sockaddr_un sunx;
 
 		sunx.sun_family = AF_UNIX;
-		strlcpy(sunx.sun_path, STR(0), sizeof(sunx.sun_path));
+		strncpy(sunx.sun_path, STR(0), sizeof(sunx.sun_path) - 1);
+		sunx.sun_path[sizeof(sunx.sun_path) - 1] = '\0';
 		rval = socket(AF_UNIX, SOCK_STREAM, 0);
 		if (rval < 0)
 			break;
@@ -553,7 +554,8 @@ call_syscall(struct syscall_desc *scall,
 		struct sockaddr_un sunx;
 
 		sunx.sun_family = AF_UNIX;
-		strlcpy(sunx.sun_path, STR(0), sizeof(sunx.sun_path));
+		strncpy(sunx.sun_path, STR(0), sizeof(sunx.sun_path) - 1);
+		sunx.sun_path[sizeof(sunx.sun_path) - 1] = '\0';
 		rval = socket(AF_UNIX, SOCK_STREAM, 0);
 		if (rval < 0)
 			break;