 @@ -1,14 +1,14 @@
-/* $NetBSD: t_printf.c,v 1.10 2023/04/04 19:39:38 he Exp $ */
+/* $NetBSD: t_printf.c,v 1.11 2024/05/08 18:19:57 riastradh Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,34 +18,36 @@
  * 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/types.h>
 #include <sys/resource.h>
 #include <atf-c.h>
 #include <errno.h>
 #include <float.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <stdlib.h>
 #include <errno.h>
 ATF_TC(snprintf_c99);
 ATF_TC_HEAD(snprintf_c99, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Test printf(3) C99 conformance (PR lib/22019)");
+}
 ATF_TC_BODY(snprintf_c99, tc)
+{
 	char s[4];
 @@ -181,27 +183,66 @@ ATF_TC_BODY(sprintf_zeropad, tc)
+}
 ATF_TC(snprintf_double_a);
 ATF_TC_HEAD(snprintf_double_a, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test printf a format");
+}
 ATF_TC_BODY(snprintf_double_a, tc)
+{
 	char buf[1000];
 	snprintf(buf, sizeof buf, "%.3a", (double)10.6);
-	ATF_REQUIRE_STREQ("0x1.533p+3", buf);
+	ATF_CHECK_MSG((strcmp(buf, "0x1.533p+3") == 0 ||
 		strcmp(buf, "0x2.a66p+2") == 0 ||
 		strcmp(buf, "0x5.4ccp+1") == 0 ||
 		strcmp(buf, "0xa.998p+0") == 0),
 	    "buf=%s", buf);
 	snprintf(buf, sizeof buf, "%a", (double)0.125);
 	ATF_CHECK_MSG((strcmp(buf, "0x1p-3") == 0 ||
 		strcmp(buf, "0x2p-4") == 0 ||
 		strcmp(buf, "0x4p-5") == 0 ||
 		strcmp(buf, "0x8p-6") == 0),
 	    "buf=%s", buf);
+}
 ATF_TC(snprintf_long_double_a);
 ATF_TC_HEAD(snprintf_long_double_a, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test printf La format");
+}
 ATF_TC_BODY(snprintf_long_double_a, tc)
+{
 	char buf[1000];
 	atf_tc_expect_fail("PR lib/56937:"
 	    " printf(3) long double %%a formatting is broken");
 	snprintf(buf, sizeof buf, "%.3La", 10.6L);
 	ATF_CHECK_MSG((strcmp(buf, "0x1.533p+3") == 0 ||
 		strcmp(buf, "0x2.a66p+2") == 0 ||
 		strcmp(buf, "0x5.4ccp+1") == 0 ||
 		strcmp(buf, "0xa.998p+0") == 0),
 	    "buf=%s", buf);
 	snprintf(buf, sizeof buf, "%La", 0.125L);
 	ATF_CHECK_MSG((strcmp(buf, "0x1p-3") == 0 ||
 		strcmp(buf, "0x2p-4") == 0 ||
 		strcmp(buf, "0x4p-5") == 0 ||
 		strcmp(buf, "0x8p-6") == 0),
 	    "buf=%s", buf);
+}
 /* is "long double" and "double" different? */
 #if (__LDBL_MANT_DIG__ != __DBL_MANT_DIG__) || \
     (__LDBL_MAX_EXP__ != __DBL_MAX_EXP__)
 #define WIDE_DOUBLE
 #endif
 #ifndef WIDE_DOUBLE
 ATF_TC(pr57250_fix);
 ATF_TC_HEAD(pr57250_fix, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test for PR57250");
 @@ -225,19 +266,20 @@ ATF_TC_BODY(pr57250_fix, tc)
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, snprintf_c99);
 	ATF_TP_ADD_TC(tp, snprintf_dotzero);
 	ATF_TP_ADD_TC(tp, snprintf_posarg);
 	ATF_TP_ADD_TC(tp, snprintf_posarg_width);
 	ATF_TP_ADD_TC(tp, snprintf_posarg_error);
 	ATF_TP_ADD_TC(tp, snprintf_float);
 	ATF_TP_ADD_TC(tp, sprintf_zeropad);
 	ATF_TP_ADD_TC(tp, snprintf_double_a);
 	ATF_TP_ADD_TC(tp, snprintf_long_double_a);
 #ifndef WIDE_DOUBLE
 	ATF_TP_ADD_TC(tp, pr57250_fix);
 #endif
 	return atf_no_error();
+}