summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--LICENSES9
-rw-r--r--stdio-common/tst-printf.c74
-rw-r--r--stdio-common/tst-printf.sh42
4 files changed, 9 insertions, 123 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d74043838..25b90b0589 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-03 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #23363]
+ * stdio-common/tst-printf.c (DEC, INT, UNS, fp_test): Remove.
+ * stdio-common/tst-printf.sh: Adjust expected output.
+ * LICENSES: Update.
+
2018-07-03 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/mach/hurd/i386/libc.abilist [GLIBC_2.28] (fcntl): Remove
diff --git a/LICENSES b/LICENSES
index b29efe0108..0e3a9fe39b 100644
--- a/LICENSES
+++ b/LICENSES
@@ -372,15 +372,6 @@ Permission to use, copy, modify, and distribute this
software is freely granted, provided that this notice
is preserved.
-Part of stdio-common/tst-printf.c is copyright C E Chew:
-
-(C) Copyright C E Chew
-
-Feel free to copy, use and distribute this software provided:
-
- 1. you do not pretend that you wrote it
- 2. you leave this copyright notice intact.
-
Various long double libm functions are copyright Stephen L. Moshier:
Copyright 2001 by Stephen L. Moshier <moshier@na-net.ornl.gov>
diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c
index d73f0cc34e..70d9e584b3 100644
--- a/stdio-common/tst-printf.c
+++ b/stdio-common/tst-printf.c
@@ -69,77 +69,7 @@ fmtst2chk (const char *fmt)
(void) printf(fmt, 4, 4, 0x12);
(void) printf("'\n");
}
-
-/* This page is covered by the following copyright: */
-
-/* (C) Copyright C E Chew
- *
- * Feel free to copy, use and distribute this software provided:
- *
- * 1. you do not pretend that you wrote it
- * 2. you leave this copyright notice intact.
- */
-
-/*
- * Extracted from exercise.c for glibc-1.05 bug report by Bruce Evans.
- */
-
-#define DEC -123
-#define INT 255
-#define UNS (~0)
-/* Formatted Output Test
- *
- * This exercises the output formatting code.
- */
-
-static void
-fp_test (void)
-{
- int i, j, k, l;
- char buf[7];
- char *prefix = buf;
- char tp[20];
-
- puts("\nFormatted output test");
- printf("prefix 6d 6o 6x 6X 6u\n");
- strcpy(prefix, "%");
- for (i = 0; i < 2; i++) {
- for (j = 0; j < 2; j++) {
- for (k = 0; k < 2; k++) {
- for (l = 0; l < 2; l++) {
- strcpy(prefix, "%");
- if (i == 0) strcat(prefix, "-");
- if (j == 0) strcat(prefix, "+");
- if (k == 0) strcat(prefix, "#");
- if (l == 0) strcat(prefix, "0");
- printf("%5s |", prefix);
- strcpy(tp, prefix);
- strcat(tp, "6d |");
- printf(tp, DEC);
- strcpy(tp, prefix);
- strcat(tp, "6o |");
- printf(tp, INT);
- strcpy(tp, prefix);
- strcat(tp, "6x |");
- printf(tp, INT);
- strcpy(tp, prefix);
- strcat(tp, "6X |");
- printf(tp, INT);
- strcpy(tp, prefix);
- strcat(tp, "6u |");
- printf(tp, UNS);
- printf("\n");
- }
- }
- }
- }
- printf("%10s\n", (char *) NULL);
- printf("%-10s\n", (char *) NULL);
- printf("%.8f\n", DBL_MAX);
- printf("%.8f\n", -DBL_MAX);
-}
-
static int
do_test (void)
{
@@ -239,8 +169,8 @@ I am ready for my first lesson today.";
snprintf(buf2, sizeof(buf2), "%.999999u", 10));
}
- fp_test ();
-
+ printf("%.8f\n", DBL_MAX);
+ printf("%.8f\n", -DBL_MAX);
printf ("%e should be 1.234568e+06\n", 1234567.8);
printf ("%f should be 1234567.800000\n", 1234567.8);
printf ("%g should be 1.23457e+06\n", 1234567.8);
diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index 93bfe03c6f..b543cc646c 100644
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -105,27 +105,6 @@ something really insane: 1.00000000000000000000000000000000000000000000000000000
| 123456.0000| 1.2346e+05| 1.235e+05|
snprintf ("%30s", "foo") == 30, " "
snprintf ("%.999999u", 10) == 999999
-
-Formatted output test
-prefix 6d 6o 6x 6X 6u
-%-+#0 |-123 |0377 |0xff |0XFF |4294967295 |
- %-+# |-123 |0377 |0xff |0XFF |4294967295 |
- %-+0 |-123 |377 |ff |FF |4294967295 |
- %-+ |-123 |377 |ff |FF |4294967295 |
- %-#0 |-123 |0377 |0xff |0XFF |4294967295 |
- %-# |-123 |0377 |0xff |0XFF |4294967295 |
- %-0 |-123 |377 |ff |FF |4294967295 |
- %- |-123 |377 |ff |FF |4294967295 |
- %+#0 |-00123 |000377 |0x00ff |0X00FF |4294967295 |
- %+# | -123 | 0377 | 0xff | 0XFF |4294967295 |
- %+0 |-00123 |000377 |0000ff |0000FF |4294967295 |
- %+ | -123 | 377 | ff | FF |4294967295 |
- %#0 |-00123 |000377 |0x00ff |0X00FF |4294967295 |
- %# | -123 | 0377 | 0xff | 0XFF |4294967295 |
- %0 |-00123 |000377 |0000ff |0000FF |4294967295 |
- % | -123 | 377 | ff | FF |4294967295 |
- (null)
-(null)
179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.00000000
-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.00000000
1.234568e+06 should be 1.234568e+06
@@ -225,27 +204,6 @@ something really insane: 1.00000000000000000000000000000000000000000000000000000
| 123456.0000| 1.2346e+05| 1.235e+05|
snprintf ("%30s", "foo") == 30, " "
snprintf ("%.999999u", 10) == 999999
-
-Formatted output test
-prefix 6d 6o 6x 6X 6u
-%-+#0 |-123 |0377 |0xff |0XFF |4294967295 |
- %-+# |-123 |0377 |0xff |0XFF |4294967295 |
- %-+0 |-123 |377 |ff |FF |4294967295 |
- %-+ |-123 |377 |ff |FF |4294967295 |
- %-#0 |-123 |0377 |0xff |0XFF |4294967295 |
- %-# |-123 |0377 |0xff |0XFF |4294967295 |
- %-0 |-123 |377 |ff |FF |4294967295 |
- %- |-123 |377 |ff |FF |4294967295 |
- %+#0 |-00123 |000377 |0x00ff |0X00FF |4294967295 |
- %+# | -123 | 0377 | 0xff | 0XFF |4294967295 |
- %+0 |-00123 |000377 |0000ff |0000FF |4294967295 |
- %+ | -123 | 377 | ff | FF |4294967295 |
- %#0 |-00123 |000377 |0x00ff |0X00FF |4294967295 |
- %# | -123 | 0377 | 0xff | 0XFF |4294967295 |
- %0 |-00123 |000377 |0000ff |0000FF |4294967295 |
- % | -123 | 377 | ff | FF |4294967295 |
- (null)
-(null)
179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.00000000
-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.00000000
1.234568e+06 should be 1.234568e+06