mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 19:00:09 +00:00
stdio-common/tst-printf.c: Remove part under a non-free license [BZ #23363]
The license does not allow modification.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
(cherry picked from commit 5a35750665)
This commit is contained in:
Florian Weimer
parent
20dc7a909a
commit
b12bed3e06
@ -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-06-26 Florian Weimer <fweimer@redhat.com>
|
||||
|
||||
* libio/Makefile (tests-internal): Add tst-vtables,
|
||||
|
||||
9
LICENSES
9
LICENSES
@ -441,15 +441,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>
|
||||
|
||||
1
NEWS
1
NEWS
@ -146,6 +146,7 @@ The following bugs are resolved with this release:
|
||||
[23236] Harden function pointers in _IO_str_fields
|
||||
[23313] libio: Disable vtable validation in case of interposition
|
||||
[23349] Various glibc headers no longer compatible with <linux/time.h>
|
||||
[23363] stdio-common/tst-printf.c has non-free license
|
||||
|
||||
Version 2.26
|
||||
|
||||
|
||||
@ -69,75 +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);
|
||||
}
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
@ -235,8 +167,6 @@ I am ready for my first lesson today.";
|
||||
snprintf(buf2, sizeof(buf2), "%.999999u", 10));
|
||||
}
|
||||
|
||||
fp_test ();
|
||||
|
||||
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);
|
||||
|
||||
@ -103,27 +103,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)
|
||||
1.234568e+06 should be 1.234568e+06
|
||||
1234567.800000 should be 1234567.800000
|
||||
1.23457e+06 should be 1.23457e+06
|
||||
@ -219,27 +198,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)
|
||||
1.234568e+06 should be 1.234568e+06
|
||||
1234567.800000 should be 1234567.800000
|
||||
1.23457e+06 should be 1.23457e+06
|
||||
|
||||
Loading…
Reference in New Issue
Block a user