stdio-common: Reject integer prefixes in scanf [BZ #12701]

Reject invalid formatted scanf integer input data that is comprised of a
binary or hexadecimal prefix, optionally preceded by a sign, and with no
actual digits following.  Such data is a prefix of, but not a matching
input sequence and it is required by ISO C to cause a matching failure.

Currently a matching success is instead incorrectly produced along with
the conversion result of zero, with the prefix wholly consumed from
input.

Enable input data that causes test failures without this fix in place.

Reviewed-by: Joseph Myers <josmyers@redhat.com>

16 files changed, 960 insertions, 960 deletions

diff --git a/sysdeps/wordsize-32/tst-scanf-format-int-i.input b/sysdeps/wordsize-32/tst-scanf-format-int-i.input
index 212295beed..e71a976172 100644
--- a/sysdeps/wordsize-32/tst-scanf-format-int-i.input
+++ b/sysdeps/wordsize-32/tst-scanf-format-int-i.input
@@ -510,76 +510,76 @@
 %*2i:-0b0:0:2:
 %2i:0:1:1:0:
 %*2i:0:0:1:
-# BZ12701 %2i:0X0:0:-1:
-# BZ12701 %*2i:0X0:0:-1:
-# BZ12701 %2i:0x0:0:-1:
-# BZ12701 %*2i:0x0:0:-1:
+%2i:0X0:0:-1:
+%*2i:0X0:0:-1:
+%2i:0x0:0:-1:
+%*2i:0x0:0:-1:
 %2i:00:1:2:0:
 %*2i:00:0:2:
-# BZ12701 %2i:0B0:0:-1:
-# BZ12701 %*2i:0B0:0:-1:
-# BZ12701 %2i:0b0:0:-1:
-# BZ12701 %*2i:0b0:0:-1:
+%2i:0B0:0:-1:
+%*2i:0B0:0:-1:
+%2i:0b0:0:-1:
+%*2i:0b0:0:-1:
 %2i:1:1:1:1:
 %*2i:1:0:1:
-# BZ12701 %2i:0X1:0:-1:
-# BZ12701 %*2i:0X1:0:-1:
-# BZ12701 %2i:0x1:0:-1:
-# BZ12701 %*2i:0x1:0:-1:
+%2i:0X1:0:-1:
+%*2i:0X1:0:-1:
+%2i:0x1:0:-1:
+%*2i:0x1:0:-1:
 %2i:01:1:2:1:
 %*2i:01:0:2:
-# BZ12701 %2i:0B1:0:-1:
-# BZ12701 %*2i:0B1:0:-1:
-# BZ12701 %2i:0b1:0:-1:
-# BZ12701 %*2i:0b1:0:-1:
+%2i:0B1:0:-1:
+%*2i:0B1:0:-1:
+%2i:0b1:0:-1:
+%*2i:0b1:0:-1:
 %2i:42:1:2:42:
 %*2i:42:0:2:
-# BZ12701 %2i:0X2a:0:-1:
-# BZ12701 %*2i:0X2a:0:-1:
-# BZ12701 %2i:0x2A:0:-1:
-# BZ12701 %*2i:0x2A:0:-1:
+%2i:0X2a:0:-1:
+%*2i:0X2a:0:-1:
+%2i:0x2A:0:-1:
+%*2i:0x2A:0:-1:
 %2i:052:1:2:5:
 %*2i:052:0:2:
-# BZ12701 %2i:0B101010:0:-1:
-# BZ12701 %*2i:0B101010:0:-1:
-# BZ12701 %2i:0b101010:0:-1:
-# BZ12701 %*2i:0b101010:0:-1:
+%2i:0B101010:0:-1:
+%*2i:0B101010:0:-1:
+%2i:0b101010:0:-1:
+%*2i:0b101010:0:-1:
 %2i:2147483647:1:2:21:
 %*2i:2147483647:0:2:
-# BZ12701 %2i:0X7fffffff:0:-1:
-# BZ12701 %*2i:0X7fffffff:0:-1:
-# BZ12701 %2i:0x7FFFFFFF:0:-1:
-# BZ12701 %*2i:0x7FFFFFFF:0:-1:
+%2i:0X7fffffff:0:-1:
+%*2i:0X7fffffff:0:-1:
+%2i:0x7FFFFFFF:0:-1:
+%*2i:0x7FFFFFFF:0:-1:
 %2i:017777777777:1:2:1:
 %*2i:017777777777:0:2:
-# BZ12701 %2i:0B1111111111111111111111111111111:0:-1:
-# BZ12701 %*2i:0B1111111111111111111111111111111:0:-1:
-# BZ12701 %2i:0b1111111111111111111111111111111:0:-1:
-# BZ12701 %*2i:0b1111111111111111111111111111111:0:-1:
+%2i:0B1111111111111111111111111111111:0:-1:
+%*2i:0B1111111111111111111111111111111:0:-1:
+%2i:0b1111111111111111111111111111111:0:-1:
+%*2i:0b1111111111111111111111111111111:0:-1:
 %2i:2147483648:1:2:21:
 %*2i:2147483648:0:2:
-# BZ12701 %2i:0X80000000:0:-1:
-# BZ12701 %*2i:0X80000000:0:-1:
-# BZ12701 %2i:0x80000000:0:-1:
-# BZ12701 %*2i:0x80000000:0:-1:
+%2i:0X80000000:0:-1:
+%*2i:0X80000000:0:-1:
+%2i:0x80000000:0:-1:
+%*2i:0x80000000:0:-1:
 %2i:020000000000:1:2:2:
 %*2i:020000000000:0:2:
-# BZ12701 %2i:0B10000000000000000000000000000000:0:-1:
-# BZ12701 %*2i:0B10000000000000000000000000000000:0:-1:
-# BZ12701 %2i:0b10000000000000000000000000000000:0:-1:
-# BZ12701 %*2i:0b10000000000000000000000000000000:0:-1:
+%2i:0B10000000000000000000000000000000:0:-1:
+%*2i:0B10000000000000000000000000000000:0:-1:
+%2i:0b10000000000000000000000000000000:0:-1:
+%*2i:0b10000000000000000000000000000000:0:-1:
 %2i:2147487889:1:2:21:
 %*2i:2147487889:0:2:
-# BZ12701 %2i:0X80001091:0:-1:
-# BZ12701 %*2i:0X80001091:0:-1:
-# BZ12701 %2i:0x80001091:0:-1:
-# BZ12701 %*2i:0x80001091:0:-1:
+%2i:0X80001091:0:-1:
+%*2i:0X80001091:0:-1:
+%2i:0x80001091:0:-1:
+%*2i:0x80001091:0:-1:
 %2i:020000010221:1:2:2:
 %*2i:020000010221:0:2:
-# BZ12701 %2i:0B10000000000000000001000010010001:0:-1:
-# BZ12701 %*2i:0B10000000000000000001000010010001:0:-1:
-# BZ12701 %2i:0b10000000000000000001000010010001:0:-1:
-# BZ12701 %*2i:0b10000000000000000001000010010001:0:-1:
+%2i:0B10000000000000000001000010010001:0:-1:
+%*2i:0B10000000000000000001000010010001:0:-1:
+%2i:0b10000000000000000001000010010001:0:-1:
+%*2i:0b10000000000000000001000010010001:0:-1:
 %2i:+0:1:2:0:
 %*2i:+0:0:2:
 %2i:+0X0:1:2:0:
@@ -1164,76 +1164,76 @@
 %*2i: -0b0:0:3:
 %2i: 0:1:2:0:
 %*2i: 0:0:2:
-# BZ12701 %2i: 0X0:0:-1:
-# BZ12701 %*2i: 0X0:0:-1:
-# BZ12701 %2i: 0x0:0:-1:
-# BZ12701 %*2i: 0x0:0:-1:
+%2i: 0X0:0:-1:
+%*2i: 0X0:0:-1:
+%2i: 0x0:0:-1:
+%*2i: 0x0:0:-1:
 %2i: 00:1:3:0:
 %*2i: 00:0:3:
-# BZ12701 %2i: 0B0:0:-1:
-# BZ12701 %*2i: 0B0:0:-1:
-# BZ12701 %2i: 0b0:0:-1:
-# BZ12701 %*2i: 0b0:0:-1:
+%2i: 0B0:0:-1:
+%*2i: 0B0:0:-1:
+%2i: 0b0:0:-1:
+%*2i: 0b0:0:-1:
 %2i: 1:1:2:1:
 %*2i: 1:0:2:
-# BZ12701 %2i: 0X1:0:-1:
-# BZ12701 %*2i: 0X1:0:-1:
-# BZ12701 %2i: 0x1:0:-1:
-# BZ12701 %*2i: 0x1:0:-1:
+%2i: 0X1:0:-1:
+%*2i: 0X1:0:-1:
+%2i: 0x1:0:-1:
+%*2i: 0x1:0:-1:
 %2i: 01:1:3:1:
 %*2i: 01:0:3:
-# BZ12701 %2i: 0B1:0:-1:
-# BZ12701 %*2i: 0B1:0:-1:
-# BZ12701 %2i: 0b1:0:-1:
-# BZ12701 %*2i: 0b1:0:-1:
+%2i: 0B1:0:-1:
+%*2i: 0B1:0:-1:
+%2i: 0b1:0:-1:
+%*2i: 0b1:0:-1:
 %2i: 42:1:3:42:
 %*2i: 42:0:3:
-# BZ12701 %2i: 0X2a:0:-1:
-# BZ12701 %*2i: 0X2a:0:-1:
-# BZ12701 %2i: 0x2A:0:-1:
-# BZ12701 %*2i: 0x2A:0:-1:
+%2i: 0X2a:0:-1:
+%*2i: 0X2a:0:-1:
+%2i: 0x2A:0:-1:
+%*2i: 0x2A:0:-1:
 %2i: 052:1:3:5:
 %*2i: 052:0:3:
-# BZ12701 %2i: 0B101010:0:-1:
-# BZ12701 %*2i: 0B101010:0:-1:
-# BZ12701 %2i: 0b101010:0:-1:
-# BZ12701 %*2i: 0b101010:0:-1:
+%2i: 0B101010:0:-1:
+%*2i: 0B101010:0:-1:
+%2i: 0b101010:0:-1:
+%*2i: 0b101010:0:-1:
 %2i: 2147483647:1:3:21:
 %*2i: 2147483647:0:3:
-# BZ12701 %2i: 0X7fffffff:0:-1:
-# BZ12701 %*2i: 0X7fffffff:0:-1:
-# BZ12701 %2i: 0x7FFFFFFF:0:-1:
-# BZ12701 %*2i: 0x7FFFFFFF:0:-1:
+%2i: 0X7fffffff:0:-1:
+%*2i: 0X7fffffff:0:-1:
+%2i: 0x7FFFFFFF:0:-1:
+%*2i: 0x7FFFFFFF:0:-1:
 %2i: 017777777777:1:3:1:
 %*2i: 017777777777:0:3:
-# BZ12701 %2i: 0B1111111111111111111111111111111:0:-1:
-# BZ12701 %*2i: 0B1111111111111111111111111111111:0:-1:
-# BZ12701 %2i: 0b1111111111111111111111111111111:0:-1:
-# BZ12701 %*2i: 0b1111111111111111111111111111111:0:-1:
+%2i: 0B1111111111111111111111111111111:0:-1:
+%*2i: 0B1111111111111111111111111111111:0:-1:
+%2i: 0b1111111111111111111111111111111:0:-1:
+%*2i: 0b1111111111111111111111111111111:0:-1:
 %2i: 2147483648:1:3:21:
 %*2i: 2147483648:0:3:
-# BZ12701 %2i: 0X80000000:0:-1:
-# BZ12701 %*2i: 0X80000000:0:-1:
-# BZ12701 %2i: 0x80000000:0:-1:
-# BZ12701 %*2i: 0x80000000:0:-1:
+%2i: 0X80000000:0:-1:
+%*2i: 0X80000000:0:-1:
+%2i: 0x80000000:0:-1:
+%*2i: 0x80000000:0:-1:
 %2i: 020000000000:1:3:2:
 %*2i: 020000000000:0:3:
-# BZ12701 %2i: 0B10000000000000000000000000000000:0:-1:
-# BZ12701 %*2i: 0B10000000000000000000000000000000:0:-1:
-# BZ12701 %2i: 0b10000000000000000000000000000000:0:-1:
-# BZ12701 %*2i: 0b10000000000000000000000000000000:0:-1:
+%2i: 0B10000000000000000000000000000000:0:-1:
+%*2i: 0B10000000000000000000000000000000:0:-1:
+%2i: 0b10000000000000000000000000000000:0:-1:
+%*2i: 0b10000000000000000000000000000000:0:-1:
 %2i: 2147487889:1:3:21:
 %*2i: 2147487889:0:3:
-# BZ12701 %2i: 0X80001091:0:-1:
-# BZ12701 %*2i: 0X80001091:0:-1:
-# BZ12701 %2i: 0x80001091:0:-1:
-# BZ12701 %*2i: 0x80001091:0:-1:
+%2i: 0X80001091:0:-1:
+%*2i: 0X80001091:0:-1:
+%2i: 0x80001091:0:-1:
+%*2i: 0x80001091:0:-1:
 %2i: 020000010221:1:3:2:
 %*2i: 020000010221:0:3:
-# BZ12701 %2i: 0B10000000000000000001000010010001:0:-1:
-# BZ12701 %*2i: 0B10000000000000000001000010010001:0:-1:
-# BZ12701 %2i: 0b10000000000000000001000010010001:0:-1:
-# BZ12701 %*2i: 0b10000000000000000001000010010001:0:-1:
+%2i: 0B10000000000000000001000010010001:0:-1:
+%*2i: 0B10000000000000000001000010010001:0:-1:
+%2i: 0b10000000000000000001000010010001:0:-1:
+%*2i: 0b10000000000000000001000010010001:0:-1:
 %2i: +0:1:3:0:
 %*2i: +0:0:3:
 %2i: +0X0:1:3:0:
diff --git a/sysdeps/wordsize-32/tst-scanf-format-long-i.input b/sysdeps/wordsize-32/tst-scanf-format-long-i.input
index 37db25158a..ccca374152 100644
--- a/sysdeps/wordsize-32/tst-scanf-format-long-i.input
+++ b/sysdeps/wordsize-32/tst-scanf-format-long-i.input
@@ -510,76 +510,76 @@
 %*2li:-0b0:0:2:
 %2li:0:1:1:0:
 %*2li:0:0:1:
-# BZ12701 %2li:0X0:0:-1:
-# BZ12701 %*2li:0X0:0:-1:
-# BZ12701 %2li:0x0:0:-1:
-# BZ12701 %*2li:0x0:0:-1:
+%2li:0X0:0:-1:
+%*2li:0X0:0:-1:
+%2li:0x0:0:-1:
+%*2li:0x0:0:-1:
 %2li:00:1:2:0:
 %*2li:00:0:2:
-# BZ12701 %2li:0B0:0:-1:
-# BZ12701 %*2li:0B0:0:-1:
-# BZ12701 %2li:0b0:0:-1:
-# BZ12701 %*2li:0b0:0:-1:
+%2li:0B0:0:-1:
+%*2li:0B0:0:-1:
+%2li:0b0:0:-1:
+%*2li:0b0:0:-1:
 %2li:1:1:1:1:
 %*2li:1:0:1:
-# BZ12701 %2li:0X1:0:-1:
-# BZ12701 %*2li:0X1:0:-1:
-# BZ12701 %2li:0x1:0:-1:
-# BZ12701 %*2li:0x1:0:-1:
+%2li:0X1:0:-1:
+%*2li:0X1:0:-1:
+%2li:0x1:0:-1:
+%*2li:0x1:0:-1:
 %2li:01:1:2:1:
 %*2li:01:0:2:
-# BZ12701 %2li:0B1:0:-1:
-# BZ12701 %*2li:0B1:0:-1:
-# BZ12701 %2li:0b1:0:-1:
-# BZ12701 %*2li:0b1:0:-1:
+%2li:0B1:0:-1:
+%*2li:0B1:0:-1:
+%2li:0b1:0:-1:
+%*2li:0b1:0:-1:
 %2li:42:1:2:42:
 %*2li:42:0:2:
-# BZ12701 %2li:0X2a:0:-1:
-# BZ12701 %*2li:0X2a:0:-1:
-# BZ12701 %2li:0x2A:0:-1:
-# BZ12701 %*2li:0x2A:0:-1:
+%2li:0X2a:0:-1:
+%*2li:0X2a:0:-1:
+%2li:0x2A:0:-1:
+%*2li:0x2A:0:-1:
 %2li:052:1:2:5:
 %*2li:052:0:2:
-# BZ12701 %2li:0B101010:0:-1:
-# BZ12701 %*2li:0B101010:0:-1:
-# BZ12701 %2li:0b101010:0:-1:
-# BZ12701 %*2li:0b101010:0:-1:
+%2li:0B101010:0:-1:
+%*2li:0B101010:0:-1:
+%2li:0b101010:0:-1:
+%*2li:0b101010:0:-1:
 %2li:2147483647:1:2:21:
 %*2li:2147483647:0:2:
-# BZ12701 %2li:0X7fffffff:0:-1:
-# BZ12701 %*2li:0X7fffffff:0:-1:
-# BZ12701 %2li:0x7FFFFFFF:0:-1:
-# BZ12701 %*2li:0x7FFFFFFF:0:-1:
+%2li:0X7fffffff:0:-1:
+%*2li:0X7fffffff:0:-1:
+%2li:0x7FFFFFFF:0:-1:
+%*2li:0x7FFFFFFF:0:-1:
 %2li:017777777777:1:2:1:
 %*2li:017777777777:0:2:
-# BZ12701 %2li:0B1111111111111111111111111111111:0:-1:
-# BZ12701 %*2li:0B1111111111111111111111111111111:0:-1:
-# BZ12701 %2li:0b1111111111111111111111111111111:0:-1:
-# BZ12701 %*2li:0b1111111111111111111111111111111:0:-1:
+%2li:0B1111111111111111111111111111111:0:-1:
+%*2li:0B1111111111111111111111111111111:0:-1:
+%2li:0b1111111111111111111111111111111:0:-1:
+%*2li:0b1111111111111111111111111111111:0:-1:
 %2li:2147483648:1:2:21:
 %*2li:2147483648:0:2:
-# BZ12701 %2li:0X80000000:0:-1:
-# BZ12701 %*2li:0X80000000:0:-1:
-# BZ12701 %2li:0x80000000:0:-1:
-# BZ12701 %*2li:0x80000000:0:-1:
+%2li:0X80000000:0:-1:
+%*2li:0X80000000:0:-1:
+%2li:0x80000000:0:-1:
+%*2li:0x80000000:0:-1:
 %2li:020000000000:1:2:2:
 %*2li:020000000000:0:2:
-# BZ12701 %2li:0B10000000000000000000000000000000:0:-1:
-# BZ12701 %*2li:0B10000000000000000000000000000000:0:-1:
-# BZ12701 %2li:0b10000000000000000000000000000000:0:-1:
-# BZ12701 %*2li:0b10000000000000000000000000000000:0:-1:
+%2li:0B10000000000000000000000000000000:0:-1:
+%*2li:0B10000000000000000000000000000000:0:-1:
+%2li:0b10000000000000000000000000000000:0:-1:
+%*2li:0b10000000000000000000000000000000:0:-1:
 %2li:2147487889:1:2:21:
 %*2li:2147487889:0:2:
-# BZ12701 %2li:0X80001091:0:-1:
-# BZ12701 %*2li:0X80001091:0:-1:
-# BZ12701 %2li:0x80001091:0:-1:
-# BZ12701 %*2li:0x80001091:0:-1:
+%2li:0X80001091:0:-1:
+%*2li:0X80001091:0:-1:
+%2li:0x80001091:0:-1:
+%*2li:0x80001091:0:-1:
 %2li:020000010221:1:2:2:
 %*2li:020000010221:0:2:
-# BZ12701 %2li:0B10000000000000000001000010010001:0:-1:
-# BZ12701 %*2li:0B10000000000000000001000010010001:0:-1:
-# BZ12701 %2li:0b10000000000000000001000010010001:0:-1:
-# BZ12701 %*2li:0b10000000000000000001000010010001:0:-1:
+%2li:0B10000000000000000001000010010001:0:-1:
+%*2li:0B10000000000000000001000010010001:0:-1:
+%2li:0b10000000000000000001000010010001:0:-1:
+%*2li:0b10000000000000000001000010010001:0:-1:
 %2li:+0:1:2:0:
 %*2li:+0:0:2:
 %2li:+0X0:1:2:0:
@@ -1164,76 +1164,76 @@
 %*2li: -0b0:0:3:
 %2li: 0:1:2:0:
 %*2li: 0:0:2:
-# BZ12701 %2li: 0X0:0:-1:
-# BZ12701 %*2li: 0X0:0:-1:
-# BZ12701 %2li: 0x0:0:-1:
-# BZ12701 %*2li: 0x0:0:-1:
+%2li: 0X0:0:-1:
+%*2li: 0X0:0:-1:
+%2li: 0x0:0:-1:
+%*2li: 0x0:0:-1:
 %2li: 00:1:3:0:
 %*2li: 00:0:3:
-# BZ12701 %2li: 0B0:0:-1:
-# BZ12701 %*2li: 0B0:0:-1:
-# BZ12701 %2li: 0b0:0:-1:
-# BZ12701 %*2li: 0b0:0:-1:
+%2li: 0B0:0:-1:
+%*2li: 0B0:0:-1:
+%2li: 0b0:0:-1:
+%*2li: 0b0:0:-1:
 %2li: 1:1:2:1:
 %*2li: 1:0:2:
-# BZ12701 %2li: 0X1:0:-1:
-# BZ12701 %*2li: 0X1:0:-1:
-# BZ12701 %2li: 0x1:0:-1:
-# BZ12701 %*2li: 0x1:0:-1:
+%2li: 0X1:0:-1:
+%*2li: 0X1:0:-1:
+%2li: 0x1:0:-1:
+%*2li: 0x1:0:-1:
 %2li: 01:1:3:1:
 %*2li: 01:0:3:
-# BZ12701 %2li: 0B1:0:-1:
-# BZ12701 %*2li: 0B1:0:-1:
-# BZ12701 %2li: 0b1:0:-1:
-# BZ12701 %*2li: 0b1:0:-1:
+%2li: 0B1:0:-1:
+%*2li: 0B1:0:-1:
+%2li: 0b1:0:-1:
+%*2li: 0b1:0:-1:
 %2li: 42:1:3:42:
 %*2li: 42:0:3:
-# BZ12701 %2li: 0X2a:0:-1:
-# BZ12701 %*2li: 0X2a:0:-1:
-# BZ12701 %2li: 0x2A:0:-1:
-# BZ12701 %*2li: 0x2A:0:-1:
+%2li: 0X2a:0:-1:
+%*2li: 0X2a:0:-1:
+%2li: 0x2A:0:-1:
+%*2li: 0x2A:0:-1:
 %2li: 052:1:3:5:
 %*2li: 052:0:3:
-# BZ12701 %2li: 0B101010:0:-1:
-# BZ12701 %*2li: 0B101010:0:-1:
-# BZ12701 %2li: 0b101010:0:-1:
-# BZ12701 %*2li: 0b101010:0:-1:
+%2li: 0B101010:0:-1:
+%*2li: 0B101010:0:-1:
+%2li: 0b101010:0:-1:
+%*2li: 0b101010:0:-1:
 %2li: 2147483647:1:3:21:
 %*2li: 2147483647:0:3:
-# BZ12701 %2li: 0X7fffffff:0:-1:
-# BZ12701 %*2li: 0X7fffffff:0:-1:
-# BZ12701 %2li: 0x7FFFFFFF:0:-1:
-# BZ12701 %*2li: 0x7FFFFFFF:0:-1:
+%2li: 0X7fffffff:0:-1:
+%*2li: 0X7fffffff:0:-1:
+%2li: 0x7FFFFFFF:0:-1:
+%*2li: 0x7FFFFFFF:0:-1:
 %2li: 017777777777:1:3:1:
 %*2li: 017777777777:0:3:
-# BZ12701 %2li: 0B1111111111111111111111111111111:0:-1:
-# BZ12701 %*2li: 0B1111111111111111111111111111111:0:-1:
-# BZ12701 %2li: 0b1111111111111111111111111111111:0:-1:
-# BZ12701 %*2li: 0b1111111111111111111111111111111:0:-1:
+%2li: 0B1111111111111111111111111111111:0:-1:
+%*2li: 0B1111111111111111111111111111111:0:-1:
+%2li: 0b1111111111111111111111111111111:0:-1:
+%*2li: 0b1111111111111111111111111111111:0:-1:
 %2li: 2147483648:1:3:21:
 %*2li: 2147483648:0:3:
-# BZ12701 %2li: 0X80000000:0:-1:
-# BZ12701 %*2li: 0X80000000:0:-1:
-# BZ12701 %2li: 0x80000000:0:-1:
-# BZ12701 %*2li: 0x80000000:0:-1:
+%2li: 0X80000000:0:-1:
+%*2li: 0X80000000:0:-1:
+%2li: 0x80000000:0:-1:
+%*2li: 0x80000000:0:-1:
 %2li: 020000000000:1:3:2:
 %*2li: 020000000000:0:3:
-# BZ12701 %2li: 0B10000000000000000000000000000000:0:-1:
-# BZ12701 %*2li: 0B10000000000000000000000000000000:0:-1:
-# BZ12701 %2li: 0b10000000000000000000000000000000:0:-1:
-# BZ12701 %*2li: 0b10000000000000000000000000000000:0:-1:
+%2li: 0B10000000000000000000000000000000:0:-1:
+%*2li: 0B10000000000000000000000000000000:0:-1:
+%2li: 0b10000000000000000000000000000000:0:-1:
+%*2li: 0b10000000000000000000000000000000:0:-1:
 %2li: 2147487889:1:3:21:
 %*2li: 2147487889:0:3:
-# BZ12701 %2li: 0X80001091:0:-1:
-# BZ12701 %*2li: 0X80001091:0:-1:
-# BZ12701 %2li: 0x80001091:0:-1:
-# BZ12701 %*2li: 0x80001091:0:-1:
+%2li: 0X80001091:0:-1:
+%*2li: 0X80001091:0:-1:
+%2li: 0x80001091:0:-1:
+%*2li: 0x80001091:0:-1:
 %2li: 020000010221:1:3:2:
 %*2li: 020000010221:0:3:
-# BZ12701 %2li: 0B10000000000000000001000010010001:0:-1:
-# BZ12701 %*2li: 0B10000000000000000001000010010001:0:-1:
-# BZ12701 %2li: 0b10000000000000000001000010010001:0:-1:
-# BZ12701 %*2li: 0b10000000000000000001000010010001:0:-1:
+%2li: 0B10000000000000000001000010010001:0:-1:
+%*2li: 0B10000000000000000001000010010001:0:-1:
+%2li: 0b10000000000000000001000010010001:0:-1:
+%*2li: 0b10000000000000000001000010010001:0:-1:
 %2li: +0:1:3:0:
 %*2li: +0:0:3:
 %2li: +0X0:1:3:0:
diff --git a/sysdeps/wordsize-32/tst-scanf-format-uint-b.input b/sysdeps/wordsize-32/tst-scanf-format-uint-b.input
index 34aa451bfc..42958cfdbf 100644
--- a/sysdeps/wordsize-32/tst-scanf-format-uint-b.input
+++ b/sysdeps/wordsize-32/tst-scanf-format-uint-b.input
@@ -204,40 +204,40 @@
 %*2b:-0b0:0:2:
 %2b:0:1:1:0:
 %*2b:0:0:1:
-# BZ12701 %2b:0B0:0:-1:
-# BZ12701 %*2b:0B0:0:-1:
-# BZ12701 %2b:0b0:0:-1:
-# BZ12701 %*2b:0b0:0:-1:
+%2b:0B0:0:-1:
+%*2b:0B0:0:-1:
+%2b:0b0:0:-1:
+%*2b:0b0:0:-1:
 %2b:1:1:1:1:
 %*2b:1:0:1:
-# BZ12701 %2b:0B1:0:-1:
-# BZ12701 %*2b:0B1:0:-1:
-# BZ12701 %2b:0b1:0:-1:
-# BZ12701 %*2b:0b1:0:-1:
+%2b:0B1:0:-1:
+%*2b:0B1:0:-1:
+%2b:0b1:0:-1:
+%*2b:0b1:0:-1:
 %2b:101010:1:2:2:
 %*2b:101010:0:2:
-# BZ12701 %2b:0B101010:0:-1:
-# BZ12701 %*2b:0B101010:0:-1:
-# BZ12701 %2b:0b101010:0:-1:
-# BZ12701 %*2b:0b101010:0:-1:
+%2b:0B101010:0:-1:
+%*2b:0B101010:0:-1:
+%2b:0b101010:0:-1:
+%*2b:0b101010:0:-1:
 %2b:11111111111111111111111111111111:1:2:3:
 %*2b:11111111111111111111111111111111:0:2:
-# BZ12701 %2b:0B11111111111111111111111111111111:0:-1:
-# BZ12701 %*2b:0B11111111111111111111111111111111:0:-1:
-# BZ12701 %2b:0b11111111111111111111111111111111:0:-1:
-# BZ12701 %*2b:0b11111111111111111111111111111111:0:-1:
+%2b:0B11111111111111111111111111111111:0:-1:
+%*2b:0B11111111111111111111111111111111:0:-1:
+%2b:0b11111111111111111111111111111111:0:-1:
+%*2b:0b11111111111111111111111111111111:0:-1:
 %2b:100000000000000000000000000000000:1:2:2:
 %*2b:100000000000000000000000000000000:0:2:
-# BZ12701 %2b:0B100000000000000000000000000000000:0:-1:
-# BZ12701 %*2b:0B100000000000000000000000000000000:0:-1:
-# BZ12701 %2b:0b100000000000000000000000000000000:0:-1:
-# BZ12701 %*2b:0b100000000000000000000000000000000:0:-1:
+%2b:0B100000000000000000000000000000000:0:-1:
+%*2b:0B100000000000000000000000000000000:0:-1:
+%2b:0b100000000000000000000000000000000:0:-1:
+%*2b:0b100000000000000000000000000000000:0:-1:
 %2b:100000000000000000001000010010001:1:2:2:
 %*2b:100000000000000000001000010010001:0:2:
-# BZ12701 %2b:0B100000000000000000001000010010001:0:-1:
-# BZ12701 %*2b:0B100000000000000000001000010010001:0:-1:
-# BZ12701 %2b:0b100000000000000000001000010010001:0:-1:
-# BZ12701 %*2b:0b100000000000000000001000010010001:0:-1:
+%2b:0B100000000000000000001000010010001:0:-1:
+%*2b:0B100000000000000000001000010010001:0:-1:
+%2b:0b100000000000000000001000010010001:0:-1:
+%*2b:0b100000000000000000001000010010001:0:-1:
 %2b:+0:1:2:0:
 %*2b:+0:0:2:
 %2b:+0B0:1:2:0:
@@ -480,40 +480,40 @@
 %*2b: -0b0:0:3:
 %2b: 0:1:2:0:
 %*2b: 0:0:2:
-# BZ12701 %2b: 0B0:0:-1:
-# BZ12701 %*2b: 0B0:0:-1:
-# BZ12701 %2b: 0b0:0:-1:
-# BZ12701 %*2b: 0b0:0:-1:
+%2b: 0B0:0:-1:
+%*2b: 0B0:0:-1:
+%2b: 0b0:0:-1:
+%*2b: 0b0:0:-1:
 %2b: 1:1:2:1:
 %*2b: 1:0:2:
-# BZ12701 %2b: 0B1:0:-1:
-# BZ12701 %*2b: 0B1:0:-1:
-# BZ12701 %2b: 0b1:0:-1:
-# BZ12701 %*2b: 0b1:0:-1:
+%2b: 0B1:0:-1:
+%*2b: 0B1:0:-1:
+%2b: 0b1:0:-1:
+%*2b: 0b1:0:-1:
 %2b: 101010:1