From owner-svn-src-all@FreeBSD.ORG  Tue Feb  2 19:02:09 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 44BCA1065672;
	Tue,  2 Feb 2010 19:02:09 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 355218FC1A;
	Tue,  2 Feb 2010 19:02:09 +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 o12J29NE049092;
	Tue, 2 Feb 2010 19:02:09 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o12J29su049090;
	Tue, 2 Feb 2010 19:02:09 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201002021902.o12J29su049090@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 2 Feb 2010 19:02:09 +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: r203391 - head/lib/libc/string
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: Tue, 02 Feb 2010 19:02:09 -0000

Author: ed
Date: Tue Feb  2 19:02:08 2010
New Revision: 203391
URL: http://svn.freebsd.org/changeset/base/203391

Log:
  Implement strndup(3) using strnlen(3).
  
  This makes the implementation a bit more consistent with strdup(3),
  which uses strlen(3).

Modified:
  head/lib/libc/string/strndup.c

Modified: head/lib/libc/string/strndup.c
==============================================================================
--- head/lib/libc/string/strndup.c	Tue Feb  2 18:50:02 2010	(r203390)
+++ head/lib/libc/string/strndup.c	Tue Feb  2 19:02:08 2010	(r203391)
@@ -42,9 +42,7 @@ strndup(const char *str, size_t n)
 	size_t len;
 	char *copy;
 
-	for (len = 0; len < n && str[len]; len++)
-		continue;
-
+	len = strnlen(str, n);
 	if ((copy = malloc(len + 1)) == NULL)
 		return (NULL);
 	memcpy(copy, str, len);