 @@ -1,14 +1,14 @@
-/* $NetBSD: t_stat.c,v 1.2 2011/10/16 08:28:10 jruoho Exp $ */
+/* $NetBSD: t_stat.c,v 1.3 2012/03/06 10:32:15 jruoho Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,31 +19,34 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_stat.c,v 1.2 2011/10/16 08:28:10 jruoho Exp $");
+__RCSID("$NetBSD: t_stat.c,v 1.3 2012/03/06 10:32:15 jruoho Exp $");
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
 #include <limits.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
 static const char *path = "stat";
 ATF_TC_WITH_CLEANUP(stat_chflags);
 @@ -304,26 +307,71 @@ ATF_TC_BODY(stat_size, tc)
 		if (sb.st_size != sc.st_size)
 			atf_tc_fail("stat(2) and fstat(2) mismatch");
+	}
 	ATF_REQUIRE(close(fd) == 0);
 	ATF_REQUIRE(unlink(path) == 0);
+}
 ATF_TC_CLEANUP(stat_size, tc)
+{
 	(void)unlink(path);
+}
 ATF_TC(stat_socket);
 ATF_TC_HEAD(stat_socket, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test fstat(2) with a socket");
+}
 ATF_TC_BODY(stat_socket, tc)
+{
 	struct sockaddr_in addr;
 	struct stat st;
 	uint32_t iaddr;
 	int fd, flags;
 	atf_tc_expect_fail("PR kern/46077");
 	(void)memset(&st, 0, sizeof(struct stat));
 	(void)memset(&addr, 0, sizeof(struct sockaddr_in));
 	fd = socket(AF_INET, SOCK_STREAM, 0);
 	ATF_REQUIRE(fd >= 0);
 	flags = fcntl(fd, F_GETFL);
 	ATF_REQUIRE(flags != -1);
 	ATF_REQUIRE(fcntl(fd, F_SETFL, flags | O_NONBLOCK) != -1);
 	ATF_REQUIRE(inet_pton(AF_INET, "127.0.0.1", &iaddr) == 1);
 	addr.sin_port = htons(42);
 	addr.sin_family = AF_INET;
 	addr.sin_addr.s_addr = iaddr;
 	errno = 0;
 	ATF_REQUIRE_ERRNO(EINPROGRESS,
 	    connect(fd, (struct sockaddr *)&addr,
 		sizeof(struct sockaddr_in)) == -1);
 	errno = 0;
 	if (fstat(fd, &st) != 0 || errno != 0)
 		atf_tc_fail("fstat(2) failed for a EINPROGRESS socket");
 	(void)close(fd);
+}
 ATF_TC_WITH_CLEANUP(stat_symlink);
 ATF_TC_HEAD(stat_symlink, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test symbolic links with stat(2)");
+}
 ATF_TC_BODY(stat_symlink, tc)
+{
 	const char *pathlink = "pathlink";
 	struct stat sa, sb;
 	int fd;
 	(void)memset(&sa, 0, sizeof(struct stat));
 @@ -353,17 +401,18 @@ ATF_TC_CLEANUP(stat_symlink, tc)
+{
 	(void)unlink(path);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, stat_chflags);
 	ATF_TP_ADD_TC(tp, stat_dir);
 	ATF_TP_ADD_TC(tp, stat_err);
 	ATF_TP_ADD_TC(tp, stat_mtime);
 	ATF_TP_ADD_TC(tp, stat_perm);
 	ATF_TP_ADD_TC(tp, stat_size);
 	ATF_TP_ADD_TC(tp, stat_socket);
 	ATF_TP_ADD_TC(tp, stat_symlink);
 	return atf_no_error();
+}