 @@ -1,14 +1,14 @@
-/* $NetBSD: t_fnmatch.c,v 1.3 2012/04/08 09:58:59 jruoho Exp $ */
+/* $NetBSD: t_fnmatch.c,v 1.4 2014/10/12 18:59:35 justin Exp $ */
 /*-
  * Copyright (c) 2012 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,27 +19,27 @@
  * 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_fnmatch.c,v 1.3 2012/04/08 09:58:59 jruoho Exp $");
+__RCSID("$NetBSD: t_fnmatch.c,v 1.4 2014/10/12 18:59:35 justin Exp $");
 #include <atf-c.h>
 #include <fnmatch.h>
 #include <stdio.h>
 ATF_TC(fnmatch_backslashes);
 ATF_TC_HEAD(fnmatch_backslashes, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Test translation of '\\' with fnmatch(3) (PR lib/41558)");
+}
 ATF_TC_BODY(fnmatch_backslashes, tc)
 @@ -143,25 +143,50 @@ ATF_TC_BODY(fnmatch_period, tc)
 	ATF_CHECK(fnmatch("*.c", "x.c", FNM_PATHNAME | FNM_PERIOD) == 0);
 	ATF_CHECK(fnmatch("*/?", "x/y", FNM_PATHNAME | FNM_PERIOD) == 0);
 	ATF_CHECK(fnmatch("*/*", "x/y", FNM_PATHNAME | FNM_PERIOD) == 0);
 	ATF_CHECK(fnmatch(".*/?", ".x/y", FNM_PATHNAME | FNM_PERIOD) == 0);
 	ATF_CHECK(fnmatch("*/.?", "x/.y", FNM_PATHNAME | FNM_PERIOD) == 0);
 	ATF_CHECK(fnmatch("x[.]y", "x.y", FNM_PATHNAME | FNM_PERIOD) == 0);
 	ATF_CHECK(fnmatch("?x/y", ".x/y", FNM_PATHNAME | FNM_PERIOD) != 0);
 	ATF_CHECK(fnmatch("*x/y", ".x/y", FNM_PATHNAME | FNM_PERIOD) != 0);
 	ATF_CHECK(fnmatch("x/?y", "x/.y", FNM_PATHNAME | FNM_PERIOD) != 0);
 	ATF_CHECK(fnmatch("x/*y", "x/.y", FNM_PATHNAME | FNM_PERIOD) != 0);
+}
 ATF_TC(fnmatch_initialbracket);
 ATF_TC_HEAD(fnmatch_initialbracket, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test fnmatch with initial [");
+}
 ATF_TC_BODY(fnmatch_initialbracket, tc)
+{
 	ATF_CHECK(fnmatch("[[?*\\]", "\\", 0) == 0);
 	ATF_CHECK(fnmatch("[]?*\\]", "]", 0) == 0);
 	ATF_CHECK(fnmatch("[!]a-]", "b", 0) == 0);
 	ATF_CHECK(fnmatch("[]-_]", "^", 0) == 0); /* range: ']', '^', '_' */
 	ATF_CHECK(fnmatch("[!]-_]", "X", 0) == 0);
 	ATF_CHECK(fnmatch("[a-z]/[a-z]", "a/b", 0) == 0);
 	ATF_CHECK(fnmatch("[*]/b", "*/b", 0) == 0);
 	ATF_CHECK(fnmatch("[?]/b", "?/b", 0) == 0);
 	ATF_CHECK(fnmatch("[[a]/b", "a/b", 0) == 0);
 	ATF_CHECK(fnmatch("[[a]/b", "[/b", 0) == 0);
 	ATF_CHECK(fnmatch("[/b", "[/b", 0) == 0);
 	ATF_CHECK(fnmatch("[*]/b", "a/b", 0) != 0);
 	ATF_CHECK(fnmatch("[?]/b", "a/b", 0) != 0);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, fnmatch_backslashes);
 	ATF_TP_ADD_TC(tp, fnmatch_casefold);
 	ATF_TP_ADD_TC(tp, fnmatch_leadingdir);
 	ATF_TP_ADD_TC(tp, fnmatch_noescape);
 	ATF_TP_ADD_TC(tp, fnmatch_pathname);
 	ATF_TP_ADD_TC(tp, fnmatch_period);
 	ATF_TP_ADD_TC(tp, fnmatch_initialbracket);
 	return atf_no_error();
+}