309548bec3
C2X adds a printf %b format (see <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2630.pdf>, accepted for C2X), for outputting integers in binary. It also has recommended practice for a corresponding %B format (like %b, but %#B starts the output with 0B instead of 0b). Add support for these formats to glibc. One existing test uses %b as an example of an unknown format, to test how glibc printf handles unknown formats; change that to %v. Use of %b and %B as user-registered format specifiers continues to work (and we already have a test that covers that, tst-printfsz.c). Note that C2X also has scanf %b support, plus support for binary constants starting 0b in strtol (base 0 and 2) and scanf %i (strtol base 0 and scanf %i coming from a previous paper that added binary integer literals). I intend to implement those features in a separate patch or patches; as discussed in the thread starting at <https://sourceware.org/pipermail/libc-alpha/2020-December/120414.html>, they will be more complicated because they involve adding extra public symbols to ensure compatibility with existing code that might not expect 0b constants to be handled by strtol base 0 and 2 and scanf %i, whereas simply adding a new format specifier poses no such compatibility concerns. Note that the actual conversion from integer to string uses existing code in _itoa.c. That code has special cases for bases 8, 10 and 16, probably so that the compiler can optimize division by an integer constant in the code for those bases. If desired such special cases could easily be added for base 2 as well, but that would be an optimization, not actually needed for these printf formats to work. Tested for x86_64 and x86. Also tested with build-many-glibcs.py for aarch64-linux-gnu with GCC mainline to make sure that the test does indeed build with GCC 12 (where format checking warnings are enabled for most of the test).
391 lines
12 KiB
C
391 lines
12 KiB
C
/* Copyright (C) 1991-2021 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Lesser General Public
|
||
License as published by the Free Software Foundation; either
|
||
version 2.1 of the License, or (at your option) any later version.
|
||
|
||
The GNU C Library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with the GNU C Library; if not, see
|
||
<https://www.gnu.org/licenses/>. */
|
||
|
||
#ifdef BSD
|
||
#include </usr/include/stdio.h>
|
||
#define EXIT_SUCCESS 0
|
||
#else
|
||
#include <limits.h>
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#endif
|
||
|
||
#include <float.h>
|
||
#include <libc-diag.h>
|
||
|
||
/* This whole file is picayune tests of corner cases of printf format strings.
|
||
The compiler warnings are not useful here. */
|
||
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
|
||
|
||
#if __GNUC_PREREQ (7, 0)
|
||
/* Compiler warnings about snprintf output truncation should also be
|
||
ignored. */
|
||
DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation");
|
||
#endif
|
||
|
||
static void rfg1 (void);
|
||
static void rfg2 (void);
|
||
static void rfg3 (void);
|
||
|
||
|
||
static void
|
||
fmtchk (const char *fmt)
|
||
{
|
||
(void) fputs(fmt, stdout);
|
||
(void) printf(":\t`");
|
||
(void) printf(fmt, 0x12);
|
||
(void) printf("'\n");
|
||
}
|
||
|
||
static void
|
||
fmtst1chk (const char *fmt)
|
||
{
|
||
(void) fputs(fmt, stdout);
|
||
(void) printf(":\t`");
|
||
(void) printf(fmt, 4, 0x12);
|
||
(void) printf("'\n");
|
||
}
|
||
|
||
static void
|
||
fmtst2chk (const char *fmt)
|
||
{
|
||
(void) fputs(fmt, stdout);
|
||
(void) printf(":\t`");
|
||
(void) printf(fmt, 4, 4, 0x12);
|
||
(void) printf("'\n");
|
||
}
|
||
|
||
static int
|
||
do_test (void)
|
||
{
|
||
static char shortstr[] = "Hi, Z.";
|
||
static char longstr[] = "Good morning, Doctor Chandra. This is Hal. \
|
||
I am ready for my first lesson today.";
|
||
int result = 0;
|
||
|
||
fmtchk("%.4x");
|
||
fmtchk("%04x");
|
||
fmtchk("%4.4x");
|
||
fmtchk("%04.4x");
|
||
fmtchk("%4.3x");
|
||
fmtchk("%04.3x");
|
||
|
||
fmtst1chk("%.*x");
|
||
fmtst1chk("%0*x");
|
||
fmtst2chk("%*.*x");
|
||
fmtst2chk("%0*.*x");
|
||
|
||
#ifndef BSD
|
||
printf("bad format:\t\"%v\"\n");
|
||
printf("nil pointer (padded):\t\"%10p\"\n", (void *) NULL);
|
||
#endif
|
||
|
||
printf("decimal negative:\t\"%d\"\n", -2345);
|
||
printf("octal negative:\t\"%o\"\n", -2345);
|
||
printf("hex negative:\t\"%x\"\n", -2345);
|
||
printf("long decimal number:\t\"%ld\"\n", -123456L);
|
||
printf("long octal negative:\t\"%lo\"\n", -2345L);
|
||
printf("long unsigned decimal number:\t\"%lu\"\n", -123456L);
|
||
printf("zero-padded LDN:\t\"%010ld\"\n", -123456L);
|
||
printf("left-adjusted ZLDN:\t\"%-010ld\"\n", -123456L);
|
||
printf("space-padded LDN:\t\"%10ld\"\n", -123456L);
|
||
printf("left-adjusted SLDN:\t\"%-10ld\"\n", -123456L);
|
||
|
||
printf("zero-padded string:\t\"%010s\"\n", shortstr);
|
||
printf("left-adjusted Z string:\t\"%-010s\"\n", shortstr);
|
||
printf("space-padded string:\t\"%10s\"\n", shortstr);
|
||
printf("left-adjusted S string:\t\"%-10s\"\n", shortstr);
|
||
/* GCC 9 warns about the NULL format argument; this is deliberately
|
||
tested here. */
|
||
DIAG_PUSH_NEEDS_COMMENT;
|
||
#if __GNUC_PREREQ (7, 0)
|
||
DIAG_IGNORE_NEEDS_COMMENT (9, "-Wformat-overflow=");
|
||
#endif
|
||
printf("null string:\t\"%s\"\n", (char *)NULL);
|
||
DIAG_POP_NEEDS_COMMENT;
|
||
printf("limited string:\t\"%.22s\"\n", longstr);
|
||
|
||
printf("a-style max:\t\"%a\"\n", DBL_MAX);
|
||
printf("a-style -max:\t\"%a\"\n", -DBL_MAX);
|
||
printf("e-style >= 1:\t\"%e\"\n", 12.34);
|
||
printf("e-style >= .1:\t\"%e\"\n", 0.1234);
|
||
printf("e-style < .1:\t\"%e\"\n", 0.001234);
|
||
printf("e-style big:\t\"%.60e\"\n", 1e20);
|
||
printf ("e-style == .1:\t\"%e\"\n", 0.1);
|
||
printf("f-style == 0:\t\"%f\"\n", 0.0);
|
||
printf("f-style >= 1:\t\"%f\"\n", 12.34);
|
||
printf("f-style >= .1:\t\"%f\"\n", 0.1234);
|
||
printf("f-style < .1:\t\"%f\"\n", 0.001234);
|
||
printf("g-style == 0:\t\"%g\"\n", 0.0);
|
||
printf("g-style >= 1:\t\"%g\"\n", 12.34);
|
||
printf("g-style >= .1:\t\"%g\"\n", 0.1234);
|
||
printf("g-style < .1:\t\"%g\"\n", 0.001234);
|
||
printf("g-style big:\t\"%.60g\"\n", 1e20);
|
||
|
||
printf("Lf-style == 0:\t\"%Lf\"\n", (long double) 0.0);
|
||
printf("Lf-style >= 1:\t\"%Lf\"\n", (long double) 12.34);
|
||
printf("Lf-style >= .1:\t\"%Lf\"\n", (long double) 0.1234);
|
||
printf("Lf-style < .1:\t\"%Lf\"\n", (long double) 0.001234);
|
||
printf("Lg-style == 0:\t\"%Lg\"\n", (long double) 0.0);
|
||
printf("Lg-style >= 1:\t\"%Lg\"\n", (long double) 12.34);
|
||
printf("Lg-style >= .1:\t\"%Lg\"\n", (long double) 0.1234);
|
||
printf("Lg-style < .1:\t\"%Lg\"\n", (long double) 0.001234);
|
||
printf("Lg-style big:\t\"%.60Lg\"\n", (long double) 1e20);
|
||
|
||
printf (" %6.5f\n", .099999999860301614);
|
||
printf (" %6.5f\n", .1);
|
||
printf ("x%5.4fx\n", .5);
|
||
|
||
printf (" %6.5Lf\n", (long double) .099999999860301614);
|
||
printf (" %6.5Lf\n", (long double) .1);
|
||
printf ("x%5.4Lfx\n", (long double) .5);
|
||
|
||
printf ("%#03x\n", 1);
|
||
|
||
printf ("something really insane: %.10000f\n", 1.0);
|
||
printf ("something really insane (long double): %.10000Lf\n",
|
||
(long double) 1.0);
|
||
|
||
{
|
||
double d = FLT_MIN;
|
||
int niter = 17;
|
||
|
||
while (niter-- != 0)
|
||
printf ("%.17e\n", d / 2);
|
||
fflush (stdout);
|
||
}
|
||
|
||
printf ("%15.5e\n", 4.9406564584124654e-324);
|
||
|
||
#define FORMAT "|%12.4f|%12.4e|%12.4g|%12.4Lf|%12.4Lg|\n"
|
||
printf (FORMAT, 0.0, 0.0, 0.0,
|
||
(long double) 0.0, (long double) 0.0);
|
||
printf (FORMAT, 1.0, 1.0, 1.0,
|
||
(long double) 1.0, (long double) 1.0);
|
||
printf (FORMAT, -1.0, -1.0, -1.0,
|
||
(long double) -1.0, (long double) -1.0);
|
||
printf (FORMAT, 100.0, 100.0, 100.0,
|
||
(long double) 100.0, (long double) 100.0);
|
||
printf (FORMAT, 1000.0, 1000.0, 1000.0,
|
||
(long double) 1000.0, (long double) 1000.0);
|
||
printf (FORMAT, 10000.0, 10000.0, 10000.0,
|
||
(long double) 10000.0, (long double) 10000.0);
|
||
printf (FORMAT, 12345.0, 12345.0, 12345.0,
|
||
(long double) 12345.0, (long double) 12345.0);
|
||
printf (FORMAT, 100000.0, 100000.0, 100000.0,
|
||
(long double) 100000.0, (long double) 100000.0);
|
||
printf (FORMAT, 123456.0, 123456.0, 123456.0,
|
||
(long double) 123456.0, (long double) 123456.0);
|
||
#undef FORMAT
|
||
|
||
{
|
||
char buf[20];
|
||
char buf2[512];
|
||
printf ("snprintf (\"%%30s\", \"foo\") == %d, \"%.*s\"\n",
|
||
snprintf (buf, sizeof (buf), "%30s", "foo"), (int) sizeof (buf),
|
||
buf);
|
||
printf ("snprintf (\"%%.999999u\", 10) == %d\n",
|
||
snprintf (buf2, sizeof (buf2), "%.999999u", 10));
|
||
}
|
||
|
||
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);
|
||
printf ("%g should be 123.456\n", 123.456);
|
||
printf ("%g should be 1e+06\n", 1000000.0);
|
||
printf ("%g should be 10\n", 10.0);
|
||
printf ("%g should be 0.02\n", 0.02);
|
||
|
||
#if 0
|
||
/* This test rather checks the way the compiler handles constant
|
||
folding. gcc behavior wrt to this changed in 3.2 so it is not a
|
||
portable test. */
|
||
{
|
||
double x=1.0;
|
||
printf("%.17f\n",(1.0/x/10.0+1.0)*x-x);
|
||
}
|
||
#endif
|
||
|
||
{
|
||
char buf[200];
|
||
|
||
sprintf(buf,"%*s%*s%*s",-1,"one",-20,"two",-30,"three");
|
||
|
||
result |= strcmp (buf,
|
||
"onetwo three ");
|
||
|
||
puts (result != 0 ? "Test failed!" : "Test ok.");
|
||
}
|
||
|
||
{
|
||
char buf[200];
|
||
|
||
sprintf (buf, "%07Lo", 040000000000ll);
|
||
printf ("sprintf (buf, \"%%07Lo\", 040000000000ll) = %s", buf);
|
||
|
||
if (strcmp (buf, "40000000000") != 0)
|
||
{
|
||
result = 1;
|
||
fputs ("\tFAILED", stdout);
|
||
}
|
||
puts ("");
|
||
}
|
||
|
||
printf ("printf (\"%%hhu\", %u) = %hhu\n", UCHAR_MAX + 2, UCHAR_MAX + 2);
|
||
printf ("printf (\"%%hu\", %u) = %hu\n", USHRT_MAX + 2, USHRT_MAX + 2);
|
||
printf ("printf (\"%%hhi\", %i) = %hhi\n", UCHAR_MAX + 2, UCHAR_MAX + 2);
|
||
printf ("printf (\"%%hi\", %i) = %hi\n", USHRT_MAX + 2, USHRT_MAX + 2);
|
||
|
||
printf ("printf (\"%%1$hhu\", %2$u) = %1$hhu\n",
|
||
UCHAR_MAX + 2, UCHAR_MAX + 2);
|
||
printf ("printf (\"%%1$hu\", %2$u) = %1$hu\n", USHRT_MAX + 2, USHRT_MAX + 2);
|
||
printf ("printf (\"%%1$hhi\", %2$i) = %1$hhi\n",
|
||
UCHAR_MAX + 2, UCHAR_MAX + 2);
|
||
printf ("printf (\"%%1$hi\", %2$i) = %1$hi\n", USHRT_MAX + 2, USHRT_MAX + 2);
|
||
|
||
puts ("--- Should be no further output. ---");
|
||
rfg1 ();
|
||
rfg2 ();
|
||
rfg3 ();
|
||
|
||
{
|
||
char bytes[7];
|
||
char buf[20];
|
||
|
||
memset (bytes, '\xff', sizeof bytes);
|
||
sprintf (buf, "foo%hhn\n", &bytes[3]);
|
||
if (bytes[0] != '\xff' || bytes[1] != '\xff' || bytes[2] != '\xff'
|
||
|| bytes[4] != '\xff' || bytes[5] != '\xff' || bytes[6] != '\xff')
|
||
{
|
||
puts ("%hhn overwrite more bytes");
|
||
result = 1;
|
||
}
|
||
if (bytes[3] != 3)
|
||
{
|
||
puts ("%hhn wrote incorrect value");
|
||
result = 1;
|
||
}
|
||
}
|
||
|
||
return result != 0;
|
||
}
|
||
|
||
static void
|
||
rfg1 (void)
|
||
{
|
||
char buf[100];
|
||
|
||
sprintf (buf, "%5.s", "xyz");
|
||
if (strcmp (buf, " ") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " ");
|
||
sprintf (buf, "%5.f", 33.3);
|
||
if (strcmp (buf, " 33") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 33");
|
||
sprintf (buf, "%5.Lf", (long double) 33.3);
|
||
if (strcmp (buf, " 33") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 33");
|
||
sprintf (buf, "%8.e", 33.3e7);
|
||
if (strcmp (buf, " 3e+08") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 3e+08");
|
||
sprintf (buf, "%8.E", 33.3e7);
|
||
if (strcmp (buf, " 3E+08") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 3E+08");
|
||
sprintf (buf, "%.g", 33.3);
|
||
if (strcmp (buf, "3e+01") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3e+01");
|
||
sprintf (buf, "%.Lg", (long double) 33.3);
|
||
if (strcmp (buf, "3e+01") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3e+01");
|
||
sprintf (buf, "%.G", 33.3);
|
||
if (strcmp (buf, "3E+01") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3E+01");
|
||
}
|
||
|
||
static void
|
||
rfg2 (void)
|
||
{
|
||
int prec;
|
||
char buf[100];
|
||
|
||
prec = 0;
|
||
sprintf (buf, "%.*g", prec, 3.3);
|
||
if (strcmp (buf, "3") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3");
|
||
prec = 0;
|
||
sprintf (buf, "%.*G", prec, 3.3);
|
||
if (strcmp (buf, "3") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3");
|
||
prec = 0;
|
||
sprintf (buf, "%7.*G", prec, 3.33);
|
||
if (strcmp (buf, " 3") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 3");
|
||
prec = 0;
|
||
sprintf (buf, "%.*Lg", prec, (long double) 3.3);
|
||
if (strcmp (buf, "3") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3");
|
||
prec = 0;
|
||
sprintf (buf, "%.*LG", prec, (long double) 3.3);
|
||
if (strcmp (buf, "3") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, "3");
|
||
prec = 0;
|
||
sprintf (buf, "%7.*LG", prec, (long double) 3.33);
|
||
if (strcmp (buf, " 3") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 3");
|
||
prec = 3;
|
||
sprintf (buf, "%04.*o", prec, 33);
|
||
if (strcmp (buf, " 041") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 041");
|
||
prec = 7;
|
||
sprintf (buf, "%09.*u", prec, 33);
|
||
if (strcmp (buf, " 0000033") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 0000033");
|
||
prec = 3;
|
||
sprintf (buf, "%04.*x", prec, 33);
|
||
if (strcmp (buf, " 021") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 021");
|
||
prec = 3;
|
||
sprintf (buf, "%04.*X", prec, 33);
|
||
if (strcmp (buf, " 021") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf, " 021");
|
||
}
|
||
|
||
static void
|
||
rfg3 (void)
|
||
{
|
||
char buf[100];
|
||
double g = 5.0000001;
|
||
unsigned long l = 1234567890;
|
||
double d = 321.7654321;
|
||
const char s[] = "test-string";
|
||
int i = 12345;
|
||
int h = 1234;
|
||
|
||
sprintf (buf,
|
||
"%1$*5$d %2$*6$hi %3$*7$lo %4$*8$f %9$*12$e %10$*13$g %11$*14$s",
|
||
i, h, l, d, 8, 5, 14, 14, d, g, s, 14, 3, 14);
|
||
if (strcmp (buf,
|
||
" 12345 1234 11145401322 321.765432 3.217654e+02 5 test-string") != 0)
|
||
printf ("got: '%s', expected: '%s'\n", buf,
|
||
" 12345 1234 11145401322 321.765432 3.217654e+02 5 test-string");
|
||
}
|
||
|
||
#define TEST_FUNCTION do_test ()
|
||
#include "../test-skeleton.c"
|