From owner-svn-src-head@FreeBSD.ORG  Sun Oct  4 19:44:42 2009
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 1265F106568D;
	Sun,  4 Oct 2009 19:44:42 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 021518FC19;
	Sun,  4 Oct 2009 19:44:42 +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 n94JifMU083559;
	Sun, 4 Oct 2009 19:44:41 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n94JifN8083557;
	Sun, 4 Oct 2009 19:44:41 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200910041944.n94JifN8083557@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Sun, 4 Oct 2009 19:44:41 +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: r197753 - head/tools/regression/lib/libc/stdio
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: Sun, 04 Oct 2009 19:44:42 -0000

Author: das
Date: Sun Oct  4 19:44:41 2009
New Revision: 197753
URL: http://svn.freebsd.org/changeset/base/197753

Log:
  Regression tests for r197752 (handling of empty/NULL buffers).

Modified:
  head/tools/regression/lib/libc/stdio/test-getdelim.c

Modified: head/tools/regression/lib/libc/stdio/test-getdelim.c
==============================================================================
--- head/tools/regression/lib/libc/stdio/test-getdelim.c	Sun Oct  4 19:43:36 2009	(r197752)
+++ head/tools/regression/lib/libc/stdio/test-getdelim.c	Sun Oct  4 19:44:41 2009	(r197753)
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
 
 	srandom(0);
 
-	printf("1..5\n");
+	printf("1..6\n");
 
 	/*
 	 * Test multiple times with different buffer sizes
@@ -103,6 +103,7 @@ main(int argc, char *argv[])
 		assert(getline(&line, &linecap, fp) == -1);
 		assert(line[0] == '\0');
 		free(line);
+		line = NULL;
 		assert(feof(fp));
 		assert(!ferror(fp));
 		fclose(fp);
@@ -164,5 +165,23 @@ main(int argc, char *argv[])
 	fclose(fp);
 	printf("ok 5 - nul\n");
 
+	/* Make sure NULL *linep and zero *linecapp are handled. */
+	fp = mkfilebuf();
+	free(line);
+	line = NULL;
+	linecap = 42;
+	assert(getline(&line, &linecap, fp) == sizeof(apothegm) - 1);
+	assert(memcmp(line, apothegm, sizeof(apothegm)) == 0);
+	fp = mkfilebuf();
+	free(line);
+	line = malloc(100);
+	linecap = 0;
+	assert(getline(&line, &linecap, fp) == sizeof(apothegm) - 1);
+	assert(memcmp(line, apothegm, sizeof(apothegm)) == 0);
+	free(line);
+	assert(!ferror(fp));
+	fclose(fp);
+	printf("ok 6 - empty/NULL initial buffer\n");
+
 	exit(0);
 }