diff options
Diffstat (limited to 'stdio-common')
92 files changed, 3802 insertions, 946 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 9cf037e..3709222 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -52,7 +52,7 @@ nonfmt-xprintf-stems := \ xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems)) # List of markers for scanf family function tests. -xscanf-funcs := s +xscanf-funcs := s f ss v vf vs # List of data types and formats for individual per-conversion scanf tests. # Further conversions are provided by sysdeps. @@ -378,7 +378,9 @@ endif endif tests-container += \ - tst-popen3 + tst-popen3 \ + tst-setvbuf2 \ + tst-setvbuf2-ind # tests-container generated += \ @@ -390,6 +392,8 @@ generated += \ tests-internal = \ tst-grouping_iterator \ + tst-setvbuf2 \ + tst-setvbuf2-ind \ # tests-internal test-srcs = \ @@ -762,6 +766,11 @@ $(objpfx)tst-setvbuf1-cmp.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1.out cmp $^ > $@; \ $(evaluate-test) +CFLAGS-tst-setvbuf2.c += -DIND_PROC=\"$(objpfx)tst-setvbuf2-ind\" +$(objpfx)tst-setvbuf2-ind : $(objpfx)tst-setvbuf2-ind.o $(shared-thread-library) +$(objpfx)tst-setvbuf2.out: $(objpfx)tst-setvbuf2-ind +$(objpfx)tst-setvbuf2 : $(shared-thread-library) + $(objpfx)tst-printf-round: $(libm) $(objpfx)tst-scanf-round: $(libm) diff --git a/stdio-common/tst-scanf-format-char-i.input b/stdio-common/tst-scanf-format-char-i.input index 31f7ff05..0855f50 100644 --- a/stdio-common/tst-scanf-format-char-i.input +++ b/stdio-common/tst-scanf-format-char-i.input @@ -510,76 +510,76 @@ %*2hhi:-0b0:0:2: %2hhi:0:1:1:0: %*2hhi:0:0:1: -# BZ12701 %2hhi:0X0:0:-1: -# BZ12701 %*2hhi:0X0:0:-1: -# BZ12701 %2hhi:0x0:0:-1: -# BZ12701 %*2hhi:0x0:0:-1: +%2hhi:0X0:0:-1: +%*2hhi:0X0:0:-1: +%2hhi:0x0:0:-1: +%*2hhi:0x0:0:-1: %2hhi:00:1:2:0: %*2hhi:00:0:2: -# BZ12701 %2hhi:0B0:0:-1: -# BZ12701 %*2hhi:0B0:0:-1: -# BZ12701 %2hhi:0b0:0:-1: -# BZ12701 %*2hhi:0b0:0:-1: +%2hhi:0B0:0:-1: +%*2hhi:0B0:0:-1: +%2hhi:0b0:0:-1: +%*2hhi:0b0:0:-1: %2hhi:1:1:1:1: %*2hhi:1:0:1: -# BZ12701 %2hhi:0X1:0:-1: -# BZ12701 %*2hhi:0X1:0:-1: -# BZ12701 %2hhi:0x1:0:-1: -# BZ12701 %*2hhi:0x1:0:-1: +%2hhi:0X1:0:-1: +%*2hhi:0X1:0:-1: +%2hhi:0x1:0:-1: +%*2hhi:0x1:0:-1: %2hhi:01:1:2:1: %*2hhi:01:0:2: -# BZ12701 %2hhi:0B1:0:-1: -# BZ12701 %*2hhi:0B1:0:-1: -# BZ12701 %2hhi:0b1:0:-1: -# BZ12701 %*2hhi:0b1:0:-1: +%2hhi:0B1:0:-1: +%*2hhi:0B1:0:-1: +%2hhi:0b1:0:-1: +%*2hhi:0b1:0:-1: %2hhi:42:1:2:42: %*2hhi:42:0:2: -# BZ12701 %2hhi:0X2a:0:-1: -# BZ12701 %*2hhi:0X2a:0:-1: -# BZ12701 %2hhi:0x2A:0:-1: -# BZ12701 %*2hhi:0x2A:0:-1: +%2hhi:0X2a:0:-1: +%*2hhi:0X2a:0:-1: +%2hhi:0x2A:0:-1: +%*2hhi:0x2A:0:-1: %2hhi:052:1:2:5: %*2hhi:052:0:2: -# BZ12701 %2hhi:0B101010:0:-1: -# BZ12701 %*2hhi:0B101010:0:-1: -# BZ12701 %2hhi:0b101010:0:-1: -# BZ12701 %*2hhi:0b101010:0:-1: +%2hhi:0B101010:0:-1: +%*2hhi:0B101010:0:-1: +%2hhi:0b101010:0:-1: +%*2hhi:0b101010:0:-1: %2hhi:127:1:2:12: %*2hhi:127:0:2: -# BZ12701 %2hhi:0X7f:0:-1: -# BZ12701 %*2hhi:0X7f:0:-1: -# BZ12701 %2hhi:0x7F:0:-1: -# BZ12701 %*2hhi:0x7F:0:-1: +%2hhi:0X7f:0:-1: +%*2hhi:0X7f:0:-1: +%2hhi:0x7F:0:-1: +%*2hhi:0x7F:0:-1: %2hhi:0177:1:2:1: %*2hhi:0177:0:2: -# BZ12701 %2hhi:0B1111111:0:-1: -# BZ12701 %*2hhi:0B1111111:0:-1: -# BZ12701 %2hhi:0b1111111:0:-1: -# BZ12701 %*2hhi:0b1111111:0:-1: +%2hhi:0B1111111:0:-1: +%*2hhi:0B1111111:0:-1: +%2hhi:0b1111111:0:-1: +%*2hhi:0b1111111:0:-1: %2hhi:128:1:2:12: %*2hhi:128:0:2: -# BZ12701 %2hhi:0X80:0:-1: -# BZ12701 %*2hhi:0X80:0:-1: -# BZ12701 %2hhi:0x80:0:-1: -# BZ12701 %*2hhi:0x80:0:-1: +%2hhi:0X80:0:-1: +%*2hhi:0X80:0:-1: +%2hhi:0x80:0:-1: +%*2hhi:0x80:0:-1: %2hhi:0200:1:2:2: %*2hhi:0200:0:2: -# BZ12701 %2hhi:0B10000000:0:-1: -# BZ12701 %*2hhi:0B10000000:0:-1: -# BZ12701 %2hhi:0b10000000:0:-1: -# BZ12701 %*2hhi:0b10000000:0:-1: +%2hhi:0B10000000:0:-1: +%*2hhi:0B10000000:0:-1: +%2hhi:0b10000000:0:-1: +%*2hhi:0b10000000:0:-1: %2hhi:169:1:2:16: %*2hhi:169:0:2: -# BZ12701 %2hhi:0Xa9:0:-1: -# BZ12701 %*2hhi:0Xa9:0:-1: -# BZ12701 %2hhi:0xA9:0:-1: -# BZ12701 %*2hhi:0xA9:0:-1: +%2hhi:0Xa9:0:-1: +%*2hhi:0Xa9:0:-1: +%2hhi:0xA9:0:-1: +%*2hhi:0xA9:0:-1: %2hhi:0251:1:2:2: %*2hhi:0251:0:2: -# BZ12701 %2hhi:0B10101001:0:-1: -# BZ12701 %*2hhi:0B10101001:0:-1: -# BZ12701 %2hhi:0b10101001:0:-1: -# BZ12701 %*2hhi:0b10101001:0:-1: +%2hhi:0B10101001:0:-1: +%*2hhi:0B10101001:0:-1: +%2hhi:0b10101001:0:-1: +%*2hhi:0b10101001:0:-1: %2hhi:+0:1:2:0: %*2hhi:+0:0:2: %2hhi:+0X0:1:2:0: @@ -656,76 +656,76 @@ %*3hhi::0:-1: %3hhi:-251:1:3:-25: %*3hhi:-251:0:3: -# BZ12701 %3hhi:-0Xfb:0:-1: -# BZ12701 %*3hhi:-0Xfb:0:-1: -# BZ12701 %3hhi:-0xFB:0:-1: -# BZ12701 %*3hhi:-0xFB:0:-1: +%3hhi:-0Xfb:0:-1: +%*3hhi:-0Xfb:0:-1: +%3hhi:-0xFB:0:-1: +%*3hhi:-0xFB:0:-1: %3hhi:-0373:1:3:-3: %*3hhi:-0373:0:3: -# BZ12701 %3hhi:-0B11111011:0:-1: -# BZ12701 %*3hhi:-0B11111011:0:-1: -# BZ12701 %3hhi:-0b11111011:0:-1: -# BZ12701 %*3hhi:-0b11111011:0:-1: +%3hhi:-0B11111011:0:-1: +%*3hhi:-0B11111011:0:-1: +%3hhi:-0b11111011:0:-1: +%*3hhi:-0b11111011:0:-1: %3hhi:-129:1:3:-12: %*3hhi:-129:0:3: -# BZ12701 %3hhi:-0X81:0:-1: -# BZ12701 %*3hhi:-0X81:0:-1: -# BZ12701 %3hhi:-0x81:0:-1: -# BZ12701 %*3hhi:-0x81:0:-1: +%3hhi:-0X81:0:-1: +%*3hhi:-0X81:0:-1: +%3hhi:-0x81:0:-1: +%*3hhi:-0x81:0:-1: %3hhi:-0201:1:3:-2: %*3hhi:-0201:0:3: -# BZ12701 %3hhi:-0B10000001:0:-1: -# BZ12701 %*3hhi:-0B10000001:0:-1: -# BZ12701 %3hhi:-0b10000001:0:-1: -# BZ12701 %*3hhi:-0b10000001:0:-1: +%3hhi:-0B10000001:0:-1: +%*3hhi:-0B10000001:0:-1: +%3hhi:-0b10000001:0:-1: +%*3hhi:-0b10000001:0:-1: %3hhi:-128:1:3:-12: %*3hhi:-128:0:3: -# BZ12701 %3hhi:-0X80:0:-1: -# BZ12701 %*3hhi:-0X80:0:-1: -# BZ12701 %3hhi:-0x80:0:-1: -# BZ12701 %*3hhi:-0x80:0:-1: +%3hhi:-0X80:0:-1: +%*3hhi:-0X80:0:-1: +%3hhi:-0x80:0:-1: +%*3hhi:-0x80:0:-1: %3hhi:-0200:1:3:-2: %*3hhi:-0200:0:3: -# BZ12701 %3hhi:-0B10000000:0:-1: -# BZ12701 %*3hhi:-0B10000000:0:-1: -# BZ12701 %3hhi:-0b10000000:0:-1: -# BZ12701 %*3hhi:-0b10000000:0:-1: +%3hhi:-0B10000000:0:-1: +%*3hhi:-0B10000000:0:-1: +%3hhi:-0b10000000:0:-1: +%*3hhi:-0b10000000:0:-1: %3hhi:-123:1:3:-12: %*3hhi:-123:0:3: -# BZ12701 %3hhi:-0X7b:0:-1: -# BZ12701 %*3hhi:-0X7b:0:-1: -# BZ12701 %3hhi:-0x7B:0:-1: -# BZ12701 %*3hhi:-0x7B:0:-1: +%3hhi:-0X7b:0:-1: +%*3hhi:-0X7b:0:-1: +%3hhi:-0x7B:0:-1: +%*3hhi:-0x7B:0:-1: %3hhi:-0173:1:3:-1: %*3hhi:-0173:0:3: -# BZ12701 %3hhi:-0B1111011:0:-1: -# BZ12701 %*3hhi:-0B1111011:0:-1: -# BZ12701 %3hhi:-0b1111011:0:-1: -# BZ12701 %*3hhi:-0b1111011:0:-1: +%3hhi:-0B1111011:0:-1: +%*3hhi:-0B1111011:0:-1: +%3hhi:-0b1111011:0:-1: +%*3hhi:-0b1111011:0:-1: %3hhi:-1:1:2:-1: %*3hhi:-1:0:2: -# BZ12701 %3hhi:-0X1:0:-1: -# BZ12701 %*3hhi:-0X1:0:-1: -# BZ12701 %3hhi:-0x1:0:-1: -# BZ12701 %*3hhi:-0x1:0:-1: +%3hhi:-0X1:0:-1: +%*3hhi:-0X1:0:-1: +%3hhi:-0x1:0:-1: +%*3hhi:-0x1:0:-1: %3hhi:-01:1:3:-1: %*3hhi:-01:0:3: -# BZ12701 %3hhi:-0B1:0:-1: -# BZ12701 %*3hhi:-0B1:0:-1: -# BZ12701 %3hhi:-0b1:0:-1: -# BZ12701 %*3hhi:-0b1:0:-1: +%3hhi:-0B1:0:-1: +%*3hhi:-0B1:0:-1: +%3hhi:-0b1:0:-1: +%*3hhi:-0b1:0:-1: %3hhi:-0:1:2:0: %*3hhi:-0:0:2: -# BZ12701 %3hhi:-0X0:0:-1: -# BZ12701 %*3hhi:-0X0:0:-1: -# BZ12701 %3hhi:-0x0:0:-1: -# BZ12701 %*3hhi:-0x0:0:-1: +%3hhi:-0X0:0:-1: +%*3hhi:-0X0:0:-1: +%3hhi:-0x0:0:-1: +%*3hhi:-0x0:0:-1: %3hhi:-00:1:3:0: %*3hhi:-00:0:3: -# BZ12701 %3hhi:-0B0:0:-1: -# BZ12701 %*3hhi:-0B0:0:-1: -# BZ12701 %3hhi:-0b0:0:-1: -# BZ12701 %*3hhi:-0b0:0:-1: +%3hhi:-0B0:0:-1: +%*3hhi:-0B0:0:-1: +%3hhi:-0b0:0:-1: +%*3hhi:-0b0:0:-1: %3hhi:0:1:1:0: %*3hhi:0:0:1: %3hhi:0X0:1:3:0: @@ -800,76 +800,76 @@ %*3hhi:0b10101001:0:3: %3hhi:+0:1:2:0: %*3hhi:+0:0:2: -# BZ12701 %3hhi:+0X0:0:-1: -# BZ12701 %*3hhi:+0X0:0:-1: -# BZ12701 %3hhi:+0x0:0:-1: -# BZ12701 %*3hhi:+0x0:0:-1: +%3hhi:+0X0:0:-1: +%*3hhi:+0X0:0:-1: +%3hhi:+0x0:0:-1: +%*3hhi:+0x0:0:-1: %3hhi:+00:1:3:0: %*3hhi:+00:0:3: -# BZ12701 %3hhi:+0B0:0:-1: -# BZ12701 %*3hhi:+0B0:0:-1: -# BZ12701 %3hhi:+0b0:0:-1: -# BZ12701 %*3hhi:+0b0:0:-1: +%3hhi:+0B0:0:-1: +%*3hhi:+0B0:0:-1: +%3hhi:+0b0:0:-1: +%*3hhi:+0b0:0:-1: %3hhi:+1:1:2:1: %*3hhi:+1:0:2: -# BZ12701 %3hhi:+0X1:0:-1: -# BZ12701 %*3hhi:+0X1:0:-1: -# BZ12701 %3hhi:+0x1:0:-1: -# BZ12701 %*3hhi:+0x1:0:-1: +%3hhi:+0X1:0:-1: +%*3hhi:+0X1:0:-1: +%3hhi:+0x1:0:-1: +%*3hhi:+0x1:0:-1: %3hhi:+01:1:3:1: %*3hhi:+01:0:3: -# BZ12701 %3hhi:+0B1:0:-1: -# BZ12701 %*3hhi:+0B1:0:-1: -# BZ12701 %3hhi:+0b1:0:-1: -# BZ12701 %*3hhi:+0b1:0:-1: +%3hhi:+0B1:0:-1: +%*3hhi:+0B1:0:-1: +%3hhi:+0b1:0:-1: +%*3hhi:+0b1:0:-1: %3hhi:+42:1:3:42: %*3hhi:+42:0:3: -# BZ12701 %3hhi:+0X2a:0:-1: -# BZ12701 %*3hhi:+0X2a:0:-1: -# BZ12701 %3hhi:+0x2A:0:-1: -# BZ12701 %*3hhi:+0x2A:0:-1: +%3hhi:+0X2a:0:-1: +%*3hhi:+0X2a:0:-1: +%3hhi:+0x2A:0:-1: +%*3hhi:+0x2A:0:-1: %3hhi:+052:1:3:5: %*3hhi:+052:0:3: -# BZ12701 %3hhi:+0B101010:0:-1: -# BZ12701 %*3hhi:+0B101010:0:-1: -# BZ12701 %3hhi:+0b101010:0:-1: -# BZ12701 %*3hhi:+0b101010:0:-1: +%3hhi:+0B101010:0:-1: +%*3hhi:+0B101010:0:-1: +%3hhi:+0b101010:0:-1: +%*3hhi:+0b101010:0:-1: %3hhi:+127:1:3:12: %*3hhi:+127:0:3: -# BZ12701 %3hhi:+0X7f:0:-1: -# BZ12701 %*3hhi:+0X7f:0:-1: -# BZ12701 %3hhi:+0x7F:0:-1: -# BZ12701 %*3hhi:+0x7F:0:-1: +%3hhi:+0X7f:0:-1: +%*3hhi:+0X7f:0:-1: +%3hhi:+0x7F:0:-1: +%*3hhi:+0x7F:0:-1: %3hhi:+0177:1:3:1: %*3hhi:+0177:0:3: -# BZ12701 %3hhi:+0B1111111:0:-1: -# BZ12701 %*3hhi:+0B1111111:0:-1: -# BZ12701 %3hhi:+0b1111111:0:-1: -# BZ12701 %*3hhi:+0b1111111:0:-1: +%3hhi:+0B1111111:0:-1: +%*3hhi:+0B1111111:0:-1: +%3hhi:+0b1111111:0:-1: +%*3hhi:+0b1111111:0:-1: %3hhi:+128:1:3:12: %*3hhi:+128:0:3: -# BZ12701 %3hhi:+0X80:0:-1: -# BZ12701 %*3hhi:+0X80:0:-1: -# BZ12701 %3hhi:+0x80:0:-1: -# BZ12701 %*3hhi:+0x80:0:-1: +%3hhi:+0X80:0:-1: +%*3hhi:+0X80:0:-1: +%3hhi:+0x80:0:-1: +%*3hhi:+0x80:0:-1: %3hhi:+0200:1:3:2: %*3hhi:+0200:0:3: -# BZ12701 %3hhi:+0B10000000:0:-1: -# BZ12701 %*3hhi:+0B10000000:0:-1: -# BZ12701 %3hhi:+0b10000000:0:-1: -# BZ12701 %*3hhi:+0b10000000:0:-1: +%3hhi:+0B10000000:0:-1: +%*3hhi:+0B10000000:0:-1: +%3hhi:+0b10000000:0:-1: +%*3hhi:+0b10000000:0:-1: %3hhi:+169:1:3:16: %*3hhi:+169:0:3: -# BZ12701 %3hhi:+0Xa9:0:-1: -# BZ12701 %*3hhi:+0Xa9:0:-1: -# BZ12701 %3hhi:+0xA9:0:-1: -# BZ12701 %*3hhi:+0xA9:0:-1: +%3hhi:+0Xa9:0:-1: +%*3hhi:+0Xa9:0:-1: +%3hhi:+0xA9:0:-1: +%*3hhi:+0xA9:0:-1: %3hhi:+0251:1:3:2: %*3hhi:+0251:0:3: -# BZ12701 %3hhi:+0B10101001:0:-1: -# BZ12701 %*3hhi:+0B10101001:0:-1: -# BZ12701 %3hhi:+0b10101001:0:-1: -# BZ12701 %*3hhi:+0b10101001:0:-1: +%3hhi:+0B10101001:0:-1: +%*3hhi:+0B10101001:0:-1: +%3hhi:+0b10101001:0:-1: +%*3hhi:+0b10101001:0:-1: %5hhi::0:-1: %*5hhi::0:-1: %5hhi:-251:1:4:5: @@ -1164,76 +1164,76 @@ %*2hhi: -0b0:0:3: %2hhi: 0:1:2:0: %*2hhi: 0:0:2: -# BZ12701 %2hhi: 0X0:0:-1: -# BZ12701 %*2hhi: 0X0:0:-1: -# BZ12701 %2hhi: 0x0:0:-1: -# BZ12701 %*2hhi: 0x0:0:-1: +%2hhi: 0X0:0:-1: +%*2hhi: 0X0:0:-1: +%2hhi: 0x0:0:-1: +%*2hhi: 0x0:0:-1: %2hhi: 00:1:3:0: %*2hhi: 00:0:3: -# BZ12701 %2hhi: 0B0:0:-1: -# BZ12701 %*2hhi: 0B0:0:-1: -# BZ12701 %2hhi: 0b0:0:-1: -# BZ12701 %*2hhi: 0b0:0:-1: +%2hhi: 0B0:0:-1: +%*2hhi: 0B0:0:-1: +%2hhi: 0b0:0:-1: +%*2hhi: 0b0:0:-1: %2hhi: 1:1:2:1: %*2hhi: 1:0:2: -# BZ12701 %2hhi: 0X1:0:-1: -# BZ12701 %*2hhi: 0X1:0:-1: -# BZ12701 %2hhi: 0x1:0:-1: -# BZ12701 %*2hhi: 0x1:0:-1: +%2hhi: 0X1:0:-1: +%*2hhi: 0X1:0:-1: +%2hhi: 0x1:0:-1: +%*2hhi: 0x1:0:-1: %2hhi: 01:1:3:1: %*2hhi: 01:0:3: -# BZ12701 %2hhi: 0B1:0:-1: -# BZ12701 %*2hhi: 0B1:0:-1: -# BZ12701 %2hhi: 0b1:0:-1: -# BZ12701 %*2hhi: 0b1:0:-1: +%2hhi: 0B1:0:-1: +%*2hhi: 0B1:0:-1: +%2hhi: 0b1:0:-1: +%*2hhi: 0b1:0:-1: %2hhi: 42:1:3:42: %*2hhi: 42:0:3: -# BZ12701 %2hhi: 0X2a:0:-1: -# BZ12701 %*2hhi: 0X2a:0:-1: -# BZ12701 %2hhi: 0x2A:0:-1: -# BZ12701 %*2hhi: 0x2A:0:-1: +%2hhi: 0X2a:0:-1: +%*2hhi: 0X2a:0:-1: +%2hhi: 0x2A:0:-1: +%*2hhi: 0x2A:0:-1: %2hhi: 052:1:3:5: %*2hhi: 052:0:3: -# BZ12701 %2hhi: 0B101010:0:-1: -# BZ12701 %*2hhi: 0B101010:0:-1: -# BZ12701 %2hhi: 0b101010:0:-1: -# BZ12701 %*2hhi: 0b101010:0:-1: +%2hhi: 0B101010:0:-1: +%*2hhi: 0B101010:0:-1: +%2hhi: 0b101010:0:-1: +%*2hhi: 0b101010:0:-1: %2hhi: 127:1:3:12: %*2hhi: 127:0:3: -# BZ12701 %2hhi: 0X7f:0:-1: -# BZ12701 %*2hhi: 0X7f:0:-1: -# BZ12701 %2hhi: 0x7F:0:-1: -# BZ12701 %*2hhi: 0x7F:0:-1: +%2hhi: 0X7f:0:-1: +%*2hhi: 0X7f:0:-1: +%2hhi: 0x7F:0:-1: +%*2hhi: 0x7F:0:-1: %2hhi: 0177:1:3:1: %*2hhi: 0177:0:3: -# BZ12701 %2hhi: 0B1111111:0:-1: -# BZ12701 %*2hhi: 0B1111111:0:-1: -# BZ12701 %2hhi: 0b1111111:0:-1: -# BZ12701 %*2hhi: 0b1111111:0:-1: +%2hhi: 0B1111111:0:-1: +%*2hhi: 0B1111111:0:-1: +%2hhi: 0b1111111:0:-1: +%*2hhi: 0b1111111:0:-1: %2hhi: 128:1:3:12: %*2hhi: 128:0:3: -# BZ12701 %2hhi: 0X80:0:-1: -# BZ12701 %*2hhi: 0X80:0:-1: -# BZ12701 %2hhi: 0x80:0:-1: -# BZ12701 %*2hhi: 0x80:0:-1: +%2hhi: 0X80:0:-1: +%*2hhi: 0X80:0:-1: +%2hhi: 0x80:0:-1: +%*2hhi: 0x80:0:-1: %2hhi: 0200:1:3:2: %*2hhi: 0200:0:3: -# BZ12701 %2hhi: 0B10000000:0:-1: -# BZ12701 %*2hhi: 0B10000000:0:-1: -# BZ12701 %2hhi: 0b10000000:0:-1: -# BZ12701 %*2hhi: 0b10000000:0:-1: +%2hhi: 0B10000000:0:-1: +%*2hhi: 0B10000000:0:-1: +%2hhi: 0b10000000:0:-1: +%*2hhi: 0b10000000:0:-1: %2hhi: 169:1:3:16: %*2hhi: 169:0:3: -# BZ12701 %2hhi: 0Xa9:0:-1: -# BZ12701 %*2hhi: 0Xa9:0:-1: -# BZ12701 %2hhi: 0xA9:0:-1: -# BZ12701 %*2hhi: 0xA9:0:-1: +%2hhi: 0Xa9:0:-1: +%*2hhi: 0Xa9:0:-1: +%2hhi: 0xA9:0:-1: +%*2hhi: 0xA9:0:-1: %2hhi: 0251:1:3:2: %*2hhi: 0251:0:3: -# BZ12701 %2hhi: 0B10101001:0:-1: -# BZ12701 %*2hhi: 0B10101001:0:-1: -# BZ12701 %2hhi: 0b10101001:0:-1: -# BZ12701 %*2hhi: 0b10101001:0:-1: +%2hhi: 0B10101001:0:-1: +%*2hhi: 0B10101001:0:-1: +%2hhi: 0b10101001:0:-1: +%*2hhi: 0b10101001:0:-1: %2hhi: +0:1:3:0: %*2hhi: +0:0:3: %2hhi: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-f-c.c b/stdio-common/tst-scanf-format-f-c.c new file mode 100644 index 0000000..75ce3cd --- /dev/null +++ b/stdio-common/tst-scanf-format-f-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for the character conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" diff --git a/stdio-common/tst-scanf-format-f-char.c b/stdio-common/tst-scanf-format-f-char.c new file mode 100644 index 0000000..ee5fbe9 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for signed char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" diff --git a/stdio-common/tst-scanf-format-f-double.c b/stdio-common/tst-scanf-format-f-double.c new file mode 100644 index 0000000..1fb25b5 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" diff --git a/stdio-common/tst-scanf-format-f-float.c b/stdio-common/tst-scanf-format-f-float.c new file mode 100644 index 0000000..b5a6ae4 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for float conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" diff --git a/stdio-common/tst-scanf-format-f-int.c b/stdio-common/tst-scanf-format-f-int.c new file mode 100644 index 0000000..961d66b --- /dev/null +++ b/stdio-common/tst-scanf-format-f-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" diff --git a/stdio-common/tst-scanf-format-f-ldouble.c b/stdio-common/tst-scanf-format-f-ldouble.c new file mode 100644 index 0000000..6198d35 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for long double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" diff --git a/stdio-common/tst-scanf-format-f-llong.c b/stdio-common/tst-scanf-format-f-llong.c new file mode 100644 index 0000000..1af672f --- /dev/null +++ b/stdio-common/tst-scanf-format-f-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for long long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" diff --git a/stdio-common/tst-scanf-format-f-long.c b/stdio-common/tst-scanf-format-f-long.c new file mode 100644 index 0000000..fc90811 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" diff --git a/stdio-common/tst-scanf-format-f-short.c b/stdio-common/tst-scanf-format-f-short.c new file mode 100644 index 0000000..61697e2 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" diff --git a/stdio-common/tst-scanf-format-f-uchar.c b/stdio-common/tst-scanf-format-f-uchar.c new file mode 100644 index 0000000..b4b8af3 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for unsigned char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" diff --git a/stdio-common/tst-scanf-format-f-uint.c b/stdio-common/tst-scanf-format-f-uint.c new file mode 100644 index 0000000..af226b0 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for unsigned int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" diff --git a/stdio-common/tst-scanf-format-f-ullong.c b/stdio-common/tst-scanf-format-f-ullong.c new file mode 100644 index 0000000..50ea812 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for unsigned long long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" diff --git a/stdio-common/tst-scanf-format-f-ulong.c b/stdio-common/tst-scanf-format-f-ulong.c new file mode 100644 index 0000000..673e770 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for unsigned long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" diff --git a/stdio-common/tst-scanf-format-f-ushort.c b/stdio-common/tst-scanf-format-f-ushort.c new file mode 100644 index 0000000..413ba67 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' input for unsigned short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" diff --git a/stdio-common/tst-scanf-format-f.h b/stdio-common/tst-scanf-format-f.h new file mode 100644 index 0000000..9a4caee --- /dev/null +++ b/stdio-common/tst-scanf-format-f.h @@ -0,0 +1,29 @@ +/* Test feature wrapper for formatted 'fscanf' input. + Copyright (C) 2025 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/>. */ + +#include <stdio.h> + +#define scanf_under_test(...) \ +({ \ + int result = fscanf (stdin, __VA_ARGS__); \ + if (ferror (stdin)) \ + result = INPUT_ERROR; \ + else if (result == EOF) \ + result = INPUT_EOF; \ + result; \ +}) diff --git a/stdio-common/tst-scanf-format-llong-i.input b/stdio-common/tst-scanf-format-llong-i.input index f63e35d..b8b3774 100644 --- a/stdio-common/tst-scanf-format-llong-i.input +++ b/stdio-common/tst-scanf-format-llong-i.input @@ -510,76 +510,76 @@ %*2lli:-0b0:0:2: %2lli:0:1:1:0: %*2lli:0:0:1: -# BZ12701 %2lli:0X0:0:-1: -# BZ12701 %*2lli:0X0:0:-1: -# BZ12701 %2lli:0x0:0:-1: -# BZ12701 %*2lli:0x0:0:-1: +%2lli:0X0:0:-1: +%*2lli:0X0:0:-1: +%2lli:0x0:0:-1: +%*2lli:0x0:0:-1: %2lli:00:1:2:0: %*2lli:00:0:2: -# BZ12701 %2lli:0B0:0:-1: -# BZ12701 %*2lli:0B0:0:-1: -# BZ12701 %2lli:0b0:0:-1: -# BZ12701 %*2lli:0b0:0:-1: +%2lli:0B0:0:-1: +%*2lli:0B0:0:-1: +%2lli:0b0:0:-1: +%*2lli:0b0:0:-1: %2lli:1:1:1:1: %*2lli:1:0:1: -# BZ12701 %2lli:0X1:0:-1: -# BZ12701 %*2lli:0X1:0:-1: -# BZ12701 %2lli:0x1:0:-1: -# BZ12701 %*2lli:0x1:0:-1: +%2lli:0X1:0:-1: +%*2lli:0X1:0:-1: +%2lli:0x1:0:-1: +%*2lli:0x1:0:-1: %2lli:01:1:2:1: %*2lli:01:0:2: -# BZ12701 %2lli:0B1:0:-1: -# BZ12701 %*2lli:0B1:0:-1: -# BZ12701 %2lli:0b1:0:-1: -# BZ12701 %*2lli:0b1:0:-1: +%2lli:0B1:0:-1: +%*2lli:0B1:0:-1: +%2lli:0b1:0:-1: +%*2lli:0b1:0:-1: %2lli:42:1:2:42: %*2lli:42:0:2: -# BZ12701 %2lli:0X2a:0:-1: -# BZ12701 %*2lli:0X2a:0:-1: -# BZ12701 %2lli:0x2A:0:-1: -# BZ12701 %*2lli:0x2A:0:-1: +%2lli:0X2a:0:-1: +%*2lli:0X2a:0:-1: +%2lli:0x2A:0:-1: +%*2lli:0x2A:0:-1: %2lli:052:1:2:5: %*2lli:052:0:2: -# BZ12701 %2lli:0B101010:0:-1: -# BZ12701 %*2lli:0B101010:0:-1: -# BZ12701 %2lli:0b101010:0:-1: -# BZ12701 %*2lli:0b101010:0:-1: +%2lli:0B101010:0:-1: +%*2lli:0B101010:0:-1: +%2lli:0b101010:0:-1: +%*2lli:0b101010:0:-1: %2lli:9223372036854775807:1:2:92: %*2lli:9223372036854775807:0:2: -# BZ12701 %2lli:0X7fffffffffffffff:0:-1: -# BZ12701 %*2lli:0X7fffffffffffffff:0:-1: -# BZ12701 %2lli:0x7FFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2lli:0x7FFFFFFFFFFFFFFF:0:-1: +%2lli:0X7fffffffffffffff:0:-1: +%*2lli:0X7fffffffffffffff:0:-1: +%2lli:0x7FFFFFFFFFFFFFFF:0:-1: +%*2lli:0x7FFFFFFFFFFFFFFF:0:-1: %2lli:0777777777777777777777:1:2:7: %*2lli:0777777777777777777777:0:2: -# BZ12701 %2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2lli:0B111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2lli:0b111111111111111111111111111111111111111111111111111111111111111:0:-1: %2lli:9223372036854775808:1:2:92: %*2lli:9223372036854775808:0:2: -# BZ12701 %2lli:0X8000000000000000:0:-1: -# BZ12701 %*2lli:0X8000000000000000:0:-1: -# BZ12701 %2lli:0x8000000000000000:0:-1: -# BZ12701 %*2lli:0x8000000000000000:0:-1: +%2lli:0X8000000000000000:0:-1: +%*2lli:0X8000000000000000:0:-1: +%2lli:0x8000000000000000:0:-1: +%*2lli:0x8000000000000000:0:-1: %2lli:01000000000000000000000:1:2:1: %*2lli:01000000000000000000000:0:2: -# BZ12701 %2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2lli:0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2lli:0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: %2lli:9223372036897200049:1:2:92: %*2lli:9223372036897200049:0:2: -# BZ12701 %2lli:0X80000000028757b1:0:-1: -# BZ12701 %*2lli:0X80000000028757b1:0:-1: -# BZ12701 %2lli:0x80000000028757B1:0:-1: -# BZ12701 %*2lli:0x80000000028757B1:0:-1: +%2lli:0X80000000028757b1:0:-1: +%*2lli:0X80000000028757b1:0:-1: +%2lli:0x80000000028757B1:0:-1: +%*2lli:0x80000000028757B1:0:-1: %2lli:01000000000000241653661:1:2:1: %*2lli:01000000000000241653661:0:2: -# BZ12701 %2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2lli:0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2lli:0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: %2lli:+0:1:2:0: %*2lli:+0:0:2: %2lli:+0X0:1:2:0: @@ -1164,76 +1164,76 @@ %*2lli: -0b0:0:3: %2lli: 0:1:2:0: %*2lli: 0:0:2: -# BZ12701 %2lli: 0X0:0:-1: -# BZ12701 %*2lli: 0X0:0:-1: -# BZ12701 %2lli: 0x0:0:-1: -# BZ12701 %*2lli: 0x0:0:-1: +%2lli: 0X0:0:-1: +%*2lli: 0X0:0:-1: +%2lli: 0x0:0:-1: +%*2lli: 0x0:0:-1: %2lli: 00:1:3:0: %*2lli: 00:0:3: -# BZ12701 %2lli: 0B0:0:-1: -# BZ12701 %*2lli: 0B0:0:-1: -# BZ12701 %2lli: 0b0:0:-1: -# BZ12701 %*2lli: 0b0:0:-1: +%2lli: 0B0:0:-1: +%*2lli: 0B0:0:-1: +%2lli: 0b0:0:-1: +%*2lli: 0b0:0:-1: %2lli: 1:1:2:1: %*2lli: 1:0:2: -# BZ12701 %2lli: 0X1:0:-1: -# BZ12701 %*2lli: 0X1:0:-1: -# BZ12701 %2lli: 0x1:0:-1: -# BZ12701 %*2lli: 0x1:0:-1: +%2lli: 0X1:0:-1: +%*2lli: 0X1:0:-1: +%2lli: 0x1:0:-1: +%*2lli: 0x1:0:-1: %2lli: 01:1:3:1: %*2lli: 01:0:3: -# BZ12701 %2lli: 0B1:0:-1: -# BZ12701 %*2lli: 0B1:0:-1: -# BZ12701 %2lli: 0b1:0:-1: -# BZ12701 %*2lli: 0b1:0:-1: +%2lli: 0B1:0:-1: +%*2lli: 0B1:0:-1: +%2lli: 0b1:0:-1: +%*2lli: 0b1:0:-1: %2lli: 42:1:3:42: %*2lli: 42:0:3: -# BZ12701 %2lli: 0X2a:0:-1: -# BZ12701 %*2lli: 0X2a:0:-1: -# BZ12701 %2lli: 0x2A:0:-1: -# BZ12701 %*2lli: 0x2A:0:-1: +%2lli: 0X2a:0:-1: +%*2lli: 0X2a:0:-1: +%2lli: 0x2A:0:-1: +%*2lli: 0x2A:0:-1: %2lli: 052:1:3:5: %*2lli: 052:0:3: -# BZ12701 %2lli: 0B101010:0:-1: -# BZ12701 %*2lli: 0B101010:0:-1: -# BZ12701 %2lli: 0b101010:0:-1: -# BZ12701 %*2lli: 0b101010:0:-1: +%2lli: 0B101010:0:-1: +%*2lli: 0B101010:0:-1: +%2lli: 0b101010:0:-1: +%*2lli: 0b101010:0:-1: %2lli: 9223372036854775807:1:3:92: %*2lli: 9223372036854775807:0:3: -# BZ12701 %2lli: 0X7fffffffffffffff:0:-1: -# BZ12701 %*2lli: 0X7fffffffffffffff:0:-1: -# BZ12701 %2lli: 0x7FFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2lli: 0x7FFFFFFFFFFFFFFF:0:-1: +%2lli: 0X7fffffffffffffff:0:-1: +%*2lli: 0X7fffffffffffffff:0:-1: +%2lli: 0x7FFFFFFFFFFFFFFF:0:-1: +%*2lli: 0x7FFFFFFFFFFFFFFF:0:-1: %2lli: 0777777777777777777777:1:3:7: %*2lli: 0777777777777777777777:0:3: -# BZ12701 %2lli: 0B111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2lli: 0B111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %2lli: 0b111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2lli: 0b111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2lli: 0B111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2lli: 0B111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2lli: 0b111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2lli: 0b111111111111111111111111111111111111111111111111111111111111111:0:-1: %2lli: 9223372036854775808:1:3:92: %*2lli: 9223372036854775808:0:3: -# BZ12701 %2lli: 0X8000000000000000:0:-1: -# BZ12701 %*2lli: 0X8000000000000000:0:-1: -# BZ12701 %2lli: 0x8000000000000000:0:-1: -# BZ12701 %*2lli: 0x8000000000000000:0:-1: +%2lli: 0X8000000000000000:0:-1: +%*2lli: 0X8000000000000000:0:-1: +%2lli: 0x8000000000000000:0:-1: +%*2lli: 0x8000000000000000:0:-1: %2lli: 01000000000000000000000:1:3:1: %*2lli: 01000000000000000000000:0:3: -# BZ12701 %2lli: 0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2lli: 0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %2lli: 0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2lli: 0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2lli: 0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2lli: 0B1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2lli: 0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2lli: 0b1000000000000000000000000000000000000000000000000000000000000000:0:-1: %2lli: 9223372036897200049:1:3:92: %*2lli: 9223372036897200049:0:3: -# BZ12701 %2lli: 0X80000000028757b1:0:-1: -# BZ12701 %*2lli: 0X80000000028757b1:0:-1: -# BZ12701 %2lli: 0x80000000028757B1:0:-1: -# BZ12701 %*2lli: 0x80000000028757B1:0:-1: +%2lli: 0X80000000028757b1:0:-1: +%*2lli: 0X80000000028757b1:0:-1: +%2lli: 0x80000000028757B1:0:-1: +%*2lli: 0x80000000028757B1:0:-1: %2lli: 01000000000000241653661:1:3:1: %*2lli: 01000000000000241653661:0:3: -# BZ12701 %2lli: 0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2lli: 0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %2lli: 0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2lli: 0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2lli: 0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2lli: 0B1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2lli: 0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2lli: 0b1000000000000000000000000000000000000010100001110101011110110001:0:-1: %2lli: +0:1:3:0: %*2lli: +0:0:3: %2lli: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-short-i.input b/stdio-common/tst-scanf-format-short-i.input index 5beae7b..d88122e 100644 --- a/stdio-common/tst-scanf-format-short-i.input +++ b/stdio-common/tst-scanf-format-short-i.input @@ -510,76 +510,76 @@ %*2hi:-0b0:0:2: %2hi:0:1:1:0: %*2hi:0:0:1: -# BZ12701 %2hi:0X0:0:-1: -# BZ12701 %*2hi:0X0:0:-1: -# BZ12701 %2hi:0x0:0:-1: -# BZ12701 %*2hi:0x0:0:-1: +%2hi:0X0:0:-1: +%*2hi:0X0:0:-1: +%2hi:0x0:0:-1: +%*2hi:0x0:0:-1: %2hi:00:1:2:0: %*2hi:00:0:2: -# BZ12701 %2hi:0B0:0:-1: -# BZ12701 %*2hi:0B0:0:-1: -# BZ12701 %2hi:0b0:0:-1: -# BZ12701 %*2hi:0b0:0:-1: +%2hi:0B0:0:-1: +%*2hi:0B0:0:-1: +%2hi:0b0:0:-1: +%*2hi:0b0:0:-1: %2hi:1:1:1:1: %*2hi:1:0:1: -# BZ12701 %2hi:0X1:0:-1: -# BZ12701 %*2hi:0X1:0:-1: -# BZ12701 %2hi:0x1:0:-1: -# BZ12701 %*2hi:0x1:0:-1: +%2hi:0X1:0:-1: +%*2hi:0X1:0:-1: +%2hi:0x1:0:-1: +%*2hi:0x1:0:-1: %2hi:01:1:2:1: %*2hi:01:0:2: -# BZ12701 %2hi:0B1:0:-1: -# BZ12701 %*2hi:0B1:0:-1: -# BZ12701 %2hi:0b1:0:-1: -# BZ12701 %*2hi:0b1:0:-1: +%2hi:0B1:0:-1: +%*2hi:0B1:0:-1: +%2hi:0b1:0:-1: +%*2hi:0b1:0:-1: %2hi:42:1:2:42: %*2hi:42:0:2: -# BZ12701 %2hi:0X2a:0:-1: -# BZ12701 %*2hi:0X2a:0:-1: -# BZ12701 %2hi:0x2A:0:-1: -# BZ12701 %*2hi:0x2A:0:-1: +%2hi:0X2a:0:-1: +%*2hi:0X2a:0:-1: +%2hi:0x2A:0:-1: +%*2hi:0x2A:0:-1: %2hi:052:1:2:5: %*2hi:052:0:2: -# BZ12701 %2hi:0B101010:0:-1: -# BZ12701 %*2hi:0B101010:0:-1: -# BZ12701 %2hi:0b101010:0:-1: -# BZ12701 %*2hi:0b101010:0:-1: +%2hi:0B101010:0:-1: +%*2hi:0B101010:0:-1: +%2hi:0b101010:0:-1: +%*2hi:0b101010:0:-1: %2hi:32767:1:2:32: %*2hi:32767:0:2: -# BZ12701 %2hi:0X7fff:0:-1: -# BZ12701 %*2hi:0X7fff:0:-1: -# BZ12701 %2hi:0x7FFF:0:-1: -# BZ12701 %*2hi:0x7FFF:0:-1: +%2hi:0X7fff:0:-1: +%*2hi:0X7fff:0:-1: +%2hi:0x7FFF:0:-1: +%*2hi:0x7FFF:0:-1: %2hi:077777:1:2:7: %*2hi:077777:0:2: -# BZ12701 %2hi:0B111111111111111:0:-1: -# BZ12701 %*2hi:0B111111111111111:0:-1: -# BZ12701 %2hi:0b111111111111111:0:-1: -# BZ12701 %*2hi:0b111111111111111:0:-1: +%2hi:0B111111111111111:0:-1: +%*2hi:0B111111111111111:0:-1: +%2hi:0b111111111111111:0:-1: +%*2hi:0b111111111111111:0:-1: %2hi:32768:1:2:32: %*2hi:32768:0:2: -# BZ12701 %2hi:0X8000:0:-1: -# BZ12701 %*2hi:0X8000:0:-1: -# BZ12701 %2hi:0x8000:0:-1: -# BZ12701 %*2hi:0x8000:0:-1: +%2hi:0X8000:0:-1: +%*2hi:0X8000:0:-1: +%2hi:0x8000:0:-1: +%*2hi:0x8000:0:-1: %2hi:0100000:1:2:1: %*2hi:0100000:0:2: -# BZ12701 %2hi:0B1000000000000000:0:-1: -# BZ12701 %*2hi:0B1000000000000000:0:-1: -# BZ12701 %2hi:0b1000000000000000:0:-1: -# BZ12701 %*2hi:0b1000000000000000:0:-1: +%2hi:0B1000000000000000:0:-1: +%*2hi:0B1000000000000000:0:-1: +%2hi:0b1000000000000000:0:-1: +%*2hi:0b1000000000000000:0:-1: %2hi:32809:1:2:32: %*2hi:32809:0:2: -# BZ12701 %2hi:0X8029:0:-1: -# BZ12701 %*2hi:0X8029:0:-1: -# BZ12701 %2hi:0x8029:0:-1: -# BZ12701 %*2hi:0x8029:0:-1: +%2hi:0X8029:0:-1: +%*2hi:0X8029:0:-1: +%2hi:0x8029:0:-1: +%*2hi:0x8029:0:-1: %2hi:0100051:1:2:1: %*2hi:0100051:0:2: -# BZ12701 %2hi:0B1000000000101001:0:-1: -# BZ12701 %*2hi:0B1000000000101001:0:-1: -# BZ12701 %2hi:0b1000000000101001:0:-1: -# BZ12701 %*2hi:0b1000000000101001:0:-1: +%2hi:0B1000000000101001:0:-1: +%*2hi:0B1000000000101001:0:-1: +%2hi:0b1000000000101001:0:-1: +%*2hi:0b1000000000101001:0:-1: %2hi:+0:1:2:0: %*2hi:+0:0:2: %2hi:+0X0:1:2:0: @@ -1164,76 +1164,76 @@ %*2hi: -0b0:0:3: %2hi: 0:1:2:0: %*2hi: 0:0:2: -# BZ12701 %2hi: 0X0:0:-1: -# BZ12701 %*2hi: 0X0:0:-1: -# BZ12701 %2hi: 0x0:0:-1: -# BZ12701 %*2hi: 0x0:0:-1: +%2hi: 0X0:0:-1: +%*2hi: 0X0:0:-1: +%2hi: 0x0:0:-1: +%*2hi: 0x0:0:-1: %2hi: 00:1:3:0: %*2hi: 00:0:3: -# BZ12701 %2hi: 0B0:0:-1: -# BZ12701 %*2hi: 0B0:0:-1: -# BZ12701 %2hi: 0b0:0:-1: -# BZ12701 %*2hi: 0b0:0:-1: +%2hi: 0B0:0:-1: +%*2hi: 0B0:0:-1: +%2hi: 0b0:0:-1: +%*2hi: 0b0:0:-1: %2hi: 1:1:2:1: %*2hi: 1:0:2: -# BZ12701 %2hi: 0X1:0:-1: -# BZ12701 %*2hi: 0X1:0:-1: -# BZ12701 %2hi: 0x1:0:-1: -# BZ12701 %*2hi: 0x1:0:-1: +%2hi: 0X1:0:-1: +%*2hi: 0X1:0:-1: +%2hi: 0x1:0:-1: +%*2hi: 0x1:0:-1: %2hi: 01:1:3:1: %*2hi: 01:0:3: -# BZ12701 %2hi: 0B1:0:-1: -# BZ12701 %*2hi: 0B1:0:-1: -# BZ12701 %2hi: 0b1:0:-1: -# BZ12701 %*2hi: 0b1:0:-1: +%2hi: 0B1:0:-1: +%*2hi: 0B1:0:-1: +%2hi: 0b1:0:-1: +%*2hi: 0b1:0:-1: %2hi: 42:1:3:42: %*2hi: 42:0:3: -# BZ12701 %2hi: 0X2a:0:-1: -# BZ12701 %*2hi: 0X2a:0:-1: -# BZ12701 %2hi: 0x2A:0:-1: -# BZ12701 %*2hi: 0x2A:0:-1: +%2hi: 0X2a:0:-1: +%*2hi: 0X2a:0:-1: +%2hi: 0x2A:0:-1: +%*2hi: 0x2A:0:-1: %2hi: 052:1:3:5: %*2hi: 052:0:3: -# BZ12701 %2hi: 0B101010:0:-1: -# BZ12701 %*2hi: 0B101010:0:-1: -# BZ12701 %2hi: 0b101010:0:-1: -# BZ12701 %*2hi: 0b101010:0:-1: +%2hi: 0B101010:0:-1: +%*2hi: 0B101010:0:-1: +%2hi: 0b101010:0:-1: +%*2hi: 0b101010:0:-1: %2hi: 32767:1:3:32: %*2hi: 32767:0:3: -# BZ12701 %2hi: 0X7fff:0:-1: -# BZ12701 %*2hi: 0X7fff:0:-1: -# BZ12701 %2hi: 0x7FFF:0:-1: -# BZ12701 %*2hi: 0x7FFF:0:-1: +%2hi: 0X7fff:0:-1: +%*2hi: 0X7fff:0:-1: +%2hi: 0x7FFF:0:-1: +%*2hi: 0x7FFF:0:-1: %2hi: 077777:1:3:7: %*2hi: 077777:0:3: -# BZ12701 %2hi: 0B111111111111111:0:-1: -# BZ12701 %*2hi: 0B111111111111111:0:-1: -# BZ12701 %2hi: 0b111111111111111:0:-1: -# BZ12701 %*2hi: 0b111111111111111:0:-1: +%2hi: 0B111111111111111:0:-1: +%*2hi: 0B111111111111111:0:-1: +%2hi: 0b111111111111111:0:-1: +%*2hi: 0b111111111111111:0:-1: %2hi: 32768:1:3:32: %*2hi: 32768:0:3: -# BZ12701 %2hi: 0X8000:0:-1: -# BZ12701 %*2hi: 0X8000:0:-1: -# BZ12701 %2hi: 0x8000:0:-1: -# BZ12701 %*2hi: 0x8000:0:-1: +%2hi: 0X8000:0:-1: +%*2hi: 0X8000:0:-1: +%2hi: 0x8000:0:-1: +%*2hi: 0x8000:0:-1: %2hi: 0100000:1:3:1: %*2hi: 0100000:0:3: -# BZ12701 %2hi: 0B1000000000000000:0:-1: -# BZ12701 %*2hi: 0B1000000000000000:0:-1: -# BZ12701 %2hi: 0b1000000000000000:0:-1: -# BZ12701 %*2hi: 0b1000000000000000:0:-1: +%2hi: 0B1000000000000000:0:-1: +%*2hi: 0B1000000000000000:0:-1: +%2hi: 0b1000000000000000:0:-1: +%*2hi: 0b1000000000000000:0:-1: %2hi: 32809:1:3:32: %*2hi: 32809:0:3: -# BZ12701 %2hi: 0X8029:0:-1: -# BZ12701 %*2hi: 0X8029:0:-1: -# BZ12701 %2hi: 0x8029:0:-1: -# BZ12701 %*2hi: 0x8029:0:-1: +%2hi: 0X8029:0:-1: +%*2hi: 0X8029:0:-1: +%2hi: 0x8029:0:-1: +%*2hi: 0x8029:0:-1: %2hi: 0100051:1:3:1: %*2hi: 0100051:0:3: -# BZ12701 %2hi: 0B1000000000101001:0:-1: -# BZ12701 %*2hi: 0B1000000000101001:0:-1: -# BZ12701 %2hi: 0b1000000000101001:0:-1: -# BZ12701 %*2hi: 0b1000000000101001:0:-1: +%2hi: 0B1000000000101001:0:-1: +%*2hi: 0B1000000000101001:0:-1: +%2hi: 0b1000000000101001:0:-1: +%*2hi: 0b1000000000101001:0:-1: %2hi: +0:1:3:0: %*2hi: +0:0:3: %2hi: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ss-c.c b/stdio-common/tst-scanf-format-ss-c.c new file mode 100644 index 0000000..58a7ce8 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for the character conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" diff --git a/stdio-common/tst-scanf-format-ss-char.c b/stdio-common/tst-scanf-format-ss-char.c new file mode 100644 index 0000000..66eb04c --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for signed char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" diff --git a/stdio-common/tst-scanf-format-ss-double.c b/stdio-common/tst-scanf-format-ss-double.c new file mode 100644 index 0000000..2a9fd8a --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" diff --git a/stdio-common/tst-scanf-format-ss-float.c b/stdio-common/tst-scanf-format-ss-float.c new file mode 100644 index 0000000..640e35d --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for float conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" diff --git a/stdio-common/tst-scanf-format-ss-int.c b/stdio-common/tst-scanf-format-ss-int.c new file mode 100644 index 0000000..c01a0a3 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" diff --git a/stdio-common/tst-scanf-format-ss-ldouble.c b/stdio-common/tst-scanf-format-ss-ldouble.c new file mode 100644 index 0000000..3e57ab5 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for long double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" diff --git a/stdio-common/tst-scanf-format-ss-llong.c b/stdio-common/tst-scanf-format-ss-llong.c new file mode 100644 index 0000000..9c1603c --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for long long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" diff --git a/stdio-common/tst-scanf-format-ss-long.c b/stdio-common/tst-scanf-format-ss-long.c new file mode 100644 index 0000000..003cfac --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" diff --git a/stdio-common/tst-scanf-format-ss-short.c b/stdio-common/tst-scanf-format-ss-short.c new file mode 100644 index 0000000..ba1a582 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" diff --git a/stdio-common/tst-scanf-format-ss-uchar.c b/stdio-common/tst-scanf-format-ss-uchar.c new file mode 100644 index 0000000..1db1424 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for unsigned char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" diff --git a/stdio-common/tst-scanf-format-ss-uint.c b/stdio-common/tst-scanf-format-ss-uint.c new file mode 100644 index 0000000..a296fb4 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for unsigned int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" diff --git a/stdio-common/tst-scanf-format-ss-ullong.c b/stdio-common/tst-scanf-format-ss-ullong.c new file mode 100644 index 0000000..885d570 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for unsigned long long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" diff --git a/stdio-common/tst-scanf-format-ss-ulong.c b/stdio-common/tst-scanf-format-ss-ulong.c new file mode 100644 index 0000000..8a2f24d --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for unsigned long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" diff --git a/stdio-common/tst-scanf-format-ss-ushort.c b/stdio-common/tst-scanf-format-ss-ushort.c new file mode 100644 index 0000000..4061888 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'sscanf' input for unsigned short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-ss.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" diff --git a/stdio-common/tst-scanf-format-ss.h b/stdio-common/tst-scanf-format-ss.h new file mode 100644 index 0000000..2fb1ca2 --- /dev/null +++ b/stdio-common/tst-scanf-format-ss.h @@ -0,0 +1,73 @@ +/* Test feature wrapper for formatted 'scanf' input. + Copyright (C) 2025 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/>. */ + +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> + +#include <support/support.h> + +static char *sscanf_buf; +static size_t sscanf_buf_size; + +static void __attribute__ ((destructor)) +scanf_under_test_fini (void) +{ + free (sscanf_buf); +} + +#define scanf_under_test(...) \ +({ \ + __label__ out; \ + size_t i = 0; \ + int result; \ + int ch; \ + \ + do \ + { \ + ch = read_input (); \ + if (ch < 0) \ + { \ + result = ch; \ + goto out; \ + } \ + if (i == sscanf_buf_size) \ + { \ + sscanf_buf_size += SIZE_CHUNK; \ + /* Add an extra byte for the terminating null character. */ \ + sscanf_buf = xrealloc (sscanf_buf, sscanf_buf_size + 1); \ + } \ + sscanf_buf[i++] = ch; \ + } \ + while (ch != ':'); \ + sscanf_buf[i++] = '\0'; \ + \ + ch = ungetc (ch, stdin); \ + if (ch == EOF) \ + { \ + result = INPUT_ERROR; \ + goto out; \ + } \ + \ + result = sscanf (sscanf_buf, __VA_ARGS__); \ + if (result == EOF) \ + result = INPUT_EOF; \ + \ +out: \ + result; \ +}) diff --git a/stdio-common/tst-scanf-format-uchar-b.input b/stdio-common/tst-scanf-format-uchar-b.input index e407442..3287215 100644 --- a/stdio-common/tst-scanf-format-uchar-b.input +++ b/stdio-common/tst-scanf-format-uchar-b.input @@ -204,40 +204,40 @@ %*2hhb:-0b0:0:2: %2hhb:0:1:1:0: %*2hhb:0:0:1: -# BZ12701 %2hhb:0B0:0:-1: -# BZ12701 %*2hhb:0B0:0:-1: -# BZ12701 %2hhb:0b0:0:-1: -# BZ12701 %*2hhb:0b0:0:-1: +%2hhb:0B0:0:-1: +%*2hhb:0B0:0:-1: +%2hhb:0b0:0:-1: +%*2hhb:0b0:0:-1: %2hhb:1:1:1:1: %*2hhb:1:0:1: -# BZ12701 %2hhb:0B1:0:-1: -# BZ12701 %*2hhb:0B1:0:-1: -# BZ12701 %2hhb:0b1:0:-1: -# BZ12701 %*2hhb:0b1:0:-1: +%2hhb:0B1:0:-1: +%*2hhb:0B1:0:-1: +%2hhb:0b1:0:-1: +%*2hhb:0b1:0:-1: %2hhb:101010:1:2:2: %*2hhb:101010:0:2: -# BZ12701 %2hhb:0B101010:0:-1: -# BZ12701 %*2hhb:0B101010:0:-1: -# BZ12701 %2hhb:0b101010:0:-1: -# BZ12701 %*2hhb:0b101010:0:-1: +%2hhb:0B101010:0:-1: +%*2hhb:0B101010:0:-1: +%2hhb:0b101010:0:-1: +%*2hhb:0b101010:0:-1: %2hhb:11111111:1:2:3: %*2hhb:11111111:0:2: -# BZ12701 %2hhb:0B11111111:0:-1: -# BZ12701 %*2hhb:0B11111111:0:-1: -# BZ12701 %2hhb:0b11111111:0:-1: -# BZ12701 %*2hhb:0b11111111:0:-1: +%2hhb:0B11111111:0:-1: +%*2hhb:0B11111111:0:-1: +%2hhb:0b11111111:0:-1: +%*2hhb:0b11111111:0:-1: %2hhb:100000000:1:2:2: %*2hhb:100000000:0:2: -# BZ12701 %2hhb:0B100000000:0:-1: -# BZ12701 %*2hhb:0B100000000:0:-1: -# BZ12701 %2hhb:0b100000000:0:-1: -# BZ12701 %*2hhb:0b100000000:0:-1: +%2hhb:0B100000000:0:-1: +%*2hhb:0B100000000:0:-1: +%2hhb:0b100000000:0:-1: +%*2hhb:0b100000000:0:-1: %2hhb:100101001:1:2:2: %*2hhb:100101001:0:2: -# BZ12701 %2hhb:0B100101001:0:-1: -# BZ12701 %*2hhb:0B100101001:0:-1: -# BZ12701 %2hhb:0b100101001:0:-1: -# BZ12701 %*2hhb:0b100101001:0:-1: +%2hhb:0B100101001:0:-1: +%*2hhb:0B100101001:0:-1: +%2hhb:0b100101001:0:-1: +%*2hhb:0b100101001:0:-1: %2hhb:+0:1:2:0: %*2hhb:+0:0:2: %2hhb:+0B0:1:2:0: @@ -278,22 +278,22 @@ %*3hhb::0:-1: %3hhb:-1111011:1:3:253: %*3hhb:-1111011:0:3: -# BZ12701 %3hhb:-0B1111011:0:-1: -# BZ12701 %*3hhb:-0B1111011:0:-1: -# BZ12701 %3hhb:-0b1111011:0:-1: -# BZ12701 %*3hhb:-0b1111011:0:-1: +%3hhb:-0B1111011:0:-1: +%*3hhb:-0B1111011:0:-1: +%3hhb:-0b1111011:0:-1: +%*3hhb:-0b1111011:0:-1: %3hhb:-1:1:2:255: %*3hhb:-1:0:2: -# BZ12701 %3hhb:-0B1:0:-1: -# BZ12701 %*3hhb:-0B1:0:-1: -# BZ12701 %3hhb:-0b1:0:-1: -# BZ12701 %*3hhb:-0b1:0:-1: +%3hhb:-0B1:0:-1: +%*3hhb:-0B1:0:-1: +%3hhb:-0b1:0:-1: +%*3hhb:-0b1:0:-1: %3hhb:-0:1:2:0: %*3hhb:-0:0:2: -# BZ12701 %3hhb:-0B0:0:-1: -# BZ12701 %*3hhb:-0B0:0:-1: -# BZ12701 %3hhb:-0b0:0:-1: -# BZ12701 %*3hhb:-0b0:0:-1: +%3hhb:-0B0:0:-1: +%*3hhb:-0B0:0:-1: +%3hhb:-0b0:0:-1: +%*3hhb:-0b0:0:-1: %3hhb:0:1:1:0: %*3hhb:0:0:1: %3hhb:0B0:1:3:0: @@ -332,40 +332,40 @@ %*3hhb:0b100101001:0:3: %3hhb:+0:1:2:0: %*3hhb:+0:0:2: -# BZ12701 %3hhb:+0B0:0:-1: -# BZ12701 %*3hhb:+0B0:0:-1: -# BZ12701 %3hhb:+0b0:0:-1: -# BZ12701 %*3hhb:+0b0:0:-1: +%3hhb:+0B0:0:-1: +%*3hhb:+0B0:0:-1: +%3hhb:+0b0:0:-1: +%*3hhb:+0b0:0:-1: %3hhb:+1:1:2:1: %*3hhb:+1:0:2: -# BZ12701 %3hhb:+0B1:0:-1: -# BZ12701 %*3hhb:+0B1:0:-1: -# BZ12701 %3hhb:+0b1:0:-1: -# BZ12701 %*3hhb:+0b1:0:-1: +%3hhb:+0B1:0:-1: +%*3hhb:+0B1:0:-1: +%3hhb:+0b1:0:-1: +%*3hhb:+0b1:0:-1: %3hhb:+101010:1:3:2: %*3hhb:+101010:0:3: -# BZ12701 %3hhb:+0B101010:0:-1: -# BZ12701 %*3hhb:+0B101010:0:-1: -# BZ12701 %3hhb:+0b101010:0:-1: -# BZ12701 %*3hhb:+0b101010:0:-1: +%3hhb:+0B101010:0:-1: +%*3hhb:+0B101010:0:-1: +%3hhb:+0b101010:0:-1: +%*3hhb:+0b101010:0:-1: %3hhb:+11111111:1:3:3: %*3hhb:+11111111:0:3: -# BZ12701 %3hhb:+0B11111111:0:-1: -# BZ12701 %*3hhb:+0B11111111:0:-1: -# BZ12701 %3hhb:+0b11111111:0:-1: -# BZ12701 %*3hhb:+0b11111111:0:-1: +%3hhb:+0B11111111:0:-1: +%*3hhb:+0B11111111:0:-1: +%3hhb:+0b11111111:0:-1: +%*3hhb:+0b11111111:0:-1: %3hhb:+100000000:1:3:2: %*3hhb:+100000000:0:3: -# BZ12701 %3hhb:+0B100000000:0:-1: -# BZ12701 %*3hhb:+0B100000000:0:-1: -# BZ12701 %3hhb:+0b100000000:0:-1: -# BZ12701 %*3hhb:+0b100000000:0:-1: +%3hhb:+0B100000000:0:-1: +%*3hhb:+0B100000000:0:-1: +%3hhb:+0b100000000:0:-1: +%*3hhb:+0b100000000:0:-1: %3hhb:+100101001:1:3:2: %*3hhb:+100101001:0:3: -# BZ12701 %3hhb:+0B100101001:0:-1: -# BZ12701 %*3hhb:+0B100101001:0:-1: -# BZ12701 %3hhb:+0b100101001:0:-1: -# BZ12701 %*3hhb:+0b100101001:0:-1: +%3hhb:+0B100101001:0:-1: +%*3hhb:+0B100101001:0:-1: +%3hhb:+0b100101001:0:-1: +%*3hhb:+0b100101001:0:-1: %5hhb::0:-1: %*5hhb::0:-1: %5hhb:-1111011:1:5:241: @@ -480,40 +480,40 @@ %*2hhb: -0b0:0:3: %2hhb: 0:1:2:0: %*2hhb: 0:0:2: -# BZ12701 %2hhb: 0B0:0:-1: -# BZ12701 %*2hhb: 0B0:0:-1: -# BZ12701 %2hhb: 0b0:0:-1: -# BZ12701 %*2hhb: 0b0:0:-1: +%2hhb: 0B0:0:-1: +%*2hhb: 0B0:0:-1: +%2hhb: 0b0:0:-1: +%*2hhb: 0b0:0:-1: %2hhb: 1:1:2:1: %*2hhb: 1:0:2: -# BZ12701 %2hhb: 0B1:0:-1: -# BZ12701 %*2hhb: 0B1:0:-1: -# BZ12701 %2hhb: 0b1:0:-1: -# BZ12701 %*2hhb: 0b1:0:-1: +%2hhb: 0B1:0:-1: +%*2hhb: 0B1:0:-1: +%2hhb: 0b1:0:-1: +%*2hhb: 0b1:0:-1: %2hhb: 101010:1:3:2: %*2hhb: 101010:0:3: -# BZ12701 %2hhb: 0B101010:0:-1: -# BZ12701 %*2hhb: 0B101010:0:-1: -# BZ12701 %2hhb: 0b101010:0:-1: -# BZ12701 %*2hhb: 0b101010:0:-1: +%2hhb: 0B101010:0:-1: +%*2hhb: 0B101010:0:-1: +%2hhb: 0b101010:0:-1: +%*2hhb: 0b101010:0:-1: %2hhb: 11111111:1:3:3: %*2hhb: 11111111:0:3: -# BZ12701 %2hhb: 0B11111111:0:-1: -# BZ12701 %*2hhb: 0B11111111:0:-1: -# BZ12701 %2hhb: 0b11111111:0:-1: -# BZ12701 %*2hhb: 0b11111111:0:-1: +%2hhb: 0B11111111:0:-1: +%*2hhb: 0B11111111:0:-1: +%2hhb: 0b11111111:0:-1: +%*2hhb: 0b11111111:0:-1: %2hhb: 100000000:1:3:2: %*2hhb: 100000000:0:3: -# BZ12701 %2hhb: 0B100000000:0:-1: -# BZ12701 %*2hhb: 0B100000000:0:-1: -# BZ12701 %2hhb: 0b100000000:0:-1: -# BZ12701 %*2hhb: 0b100000000:0:-1: +%2hhb: 0B100000000:0:-1: +%*2hhb: 0B100000000:0:-1: +%2hhb: 0b100000000:0:-1: +%*2hhb: 0b100000000:0:-1: %2hhb: 100101001:1:3:2: %*2hhb: 100101001:0:3: -# BZ12701 %2hhb: 0B100101001:0:-1: -# BZ12701 %*2hhb: 0B100101001:0:-1: -# BZ12701 %2hhb: 0b100101001:0:-1: -# BZ12701 %*2hhb: 0b100101001:0:-1: +%2hhb: 0B100101001:0:-1: +%*2hhb: 0B100101001:0:-1: +%2hhb: 0b100101001:0:-1: +%*2hhb: 0b100101001:0:-1: %2hhb: +0:1:3:0: %*2hhb: +0:0:3: %2hhb: +0B0:1:3:0: diff --git a/stdio-common/tst-scanf-format-uchar-x.input b/stdio-common/tst-scanf-format-uchar-x.input index d4e637c..a1fd9a9 100644 --- a/stdio-common/tst-scanf-format-uchar-x.input +++ b/stdio-common/tst-scanf-format-uchar-x.input @@ -222,44 +222,44 @@ %*2hhx:-0x0:0:2: %2hhx:0:1:1:0: %*2hhx:0:0:1: -# BZ12701 %2hhx:0X0:0:-1: -# BZ12701 %*2hhx:0X0:0:-1: -# BZ12701 %2hhx:0x0:0:-1: -# BZ12701 %*2hhx:0x0:0:-1: +%2hhx:0X0:0:-1: +%*2hhx:0X0:0:-1: +%2hhx:0x0:0:-1: +%*2hhx:0x0:0:-1: %2hhx:1:1:1:1: %*2hhx:1:0:1: -# BZ12701 %2hhx:0X1:0:-1: -# BZ12701 %*2hhx:0X1:0:-1: -# BZ12701 %2hhx:0x1:0:-1: -# BZ12701 %*2hhx:0x1:0:-1: +%2hhx:0X1:0:-1: +%*2hhx:0X1:0:-1: +%2hhx:0x1:0:-1: +%*2hhx:0x1:0:-1: %2hhx:2a:1:2:42: %*2hhx:2a:0:2: %2hhx:2A:1:2:42: %*2hhx:2A:0:2: -# BZ12701 %2hhx:0X2a:0:-1: -# BZ12701 %*2hhx:0X2a:0:-1: -# BZ12701 %2hhx:0x2A:0:-1: -# BZ12701 %*2hhx:0x2A:0:-1: +%2hhx:0X2a:0:-1: +%*2hhx:0X2a:0:-1: +%2hhx:0x2A:0:-1: +%*2hhx:0x2A:0:-1: %2hhx:ff:1:2:255: %*2hhx:ff:0:2: %2hhx:FF:1:2:255: %*2hhx:FF:0:2: -# BZ12701 %2hhx:0Xff:0:-1: -# BZ12701 %*2hhx:0Xff:0:-1: -# BZ12701 %2hhx:0xFF:0:-1: -# BZ12701 %*2hhx:0xFF:0:-1: +%2hhx:0Xff:0:-1: +%*2hhx:0Xff:0:-1: +%2hhx:0xFF:0:-1: +%*2hhx:0xFF:0:-1: %2hhx:100:1:2:16: %*2hhx:100:0:2: -# BZ12701 %2hhx:0X100:0:-1: -# BZ12701 %*2hhx:0X100:0:-1: -# BZ12701 %2hhx:0x100:0:-1: -# BZ12701 %*2hhx:0x100:0:-1: +%2hhx:0X100:0:-1: +%*2hhx:0X100:0:-1: +%2hhx:0x100:0:-1: +%*2hhx:0x100:0:-1: %2hhx:129:1:2:18: %*2hhx:129:0:2: -# BZ12701 %2hhx:0X129:0:-1: -# BZ12701 %*2hhx:0X129:0:-1: -# BZ12701 %2hhx:0x129:0:-1: -# BZ12701 %*2hhx:0x129:0:-1: +%2hhx:0X129:0:-1: +%*2hhx:0X129:0:-1: +%2hhx:0x129:0:-1: +%*2hhx:0x129:0:-1: %2hhx:+0:1:2:0: %*2hhx:+0:0:2: %2hhx:+0X0:1:2:0: @@ -306,22 +306,22 @@ %*3hhx:-7b:0:3: %3hhx:-7B:1:3:133: %*3hhx:-7B:0:3: -# BZ12701 %3hhx:-0X7b:0:-1: -# BZ12701 %*3hhx:-0X7b:0:-1: -# BZ12701 %3hhx:-0x7B:0:-1: -# BZ12701 %*3hhx:-0x7B:0:-1: +%3hhx:-0X7b:0:-1: +%*3hhx:-0X7b:0:-1: +%3hhx:-0x7B:0:-1: +%*3hhx:-0x7B:0:-1: %3hhx:-1:1:2:255: %*3hhx:-1:0:2: -# BZ12701 %3hhx:-0X1:0:-1: -# BZ12701 %*3hhx:-0X1:0:-1: -# BZ12701 %3hhx:-0x1:0:-1: -# BZ12701 %*3hhx:-0x1:0:-1: +%3hhx:-0X1:0:-1: +%*3hhx:-0X1:0:-1: +%3hhx:-0x1:0:-1: +%*3hhx:-0x1:0:-1: %3hhx:-0:1:2:0: %*3hhx:-0:0:2: -# BZ12701 %3hhx:-0X0:0:-1: -# BZ12701 %*3hhx:-0X0:0:-1: -# BZ12701 %3hhx:-0x0:0:-1: -# BZ12701 %*3hhx:-0x0:0:-1: +%3hhx:-0X0:0:-1: +%*3hhx:-0X0:0:-1: +%3hhx:-0x0:0:-1: +%*3hhx:-0x0:0:-1: %3hhx:0:1:1:0: %*3hhx:0:0:1: %3hhx:0X0:1:3:0: @@ -364,44 +364,44 @@ %*3hhx:0x129:0:3: %3hhx:+0:1:2:0: %*3hhx:+0:0:2: -# BZ12701 %3hhx:+0X0:0:-1: -# BZ12701 %*3hhx:+0X0:0:-1: -# BZ12701 %3hhx:+0x0:0:-1: -# BZ12701 %*3hhx:+0x0:0:-1: +%3hhx:+0X0:0:-1: +%*3hhx:+0X0:0:-1: +%3hhx:+0x0:0:-1: +%*3hhx:+0x0:0:-1: %3hhx:+1:1:2:1: %*3hhx:+1:0:2: -# BZ12701 %3hhx:+0X1:0:-1: -# BZ12701 %*3hhx:+0X1:0:-1: -# BZ12701 %3hhx:+0x1:0:-1: -# BZ12701 %*3hhx:+0x1:0:-1: +%3hhx:+0X1:0:-1: +%*3hhx:+0X1:0:-1: +%3hhx:+0x1:0:-1: +%*3hhx:+0x1:0:-1: %3hhx:+2a:1:3:42: %*3hhx:+2a:0:3: %3hhx:+2A:1:3:42: %*3hhx:+2A:0:3: -# BZ12701 %3hhx:+0X2a:0:-1: -# BZ12701 %*3hhx:+0X2a:0:-1: -# BZ12701 %3hhx:+0x2A:0:-1: -# BZ12701 %*3hhx:+0x2A:0:-1: +%3hhx:+0X2a:0:-1: +%*3hhx:+0X2a:0:-1: +%3hhx:+0x2A:0:-1: +%*3hhx:+0x2A:0:-1: %3hhx:+ff:1:3:255: %*3hhx:+ff:0:3: %3hhx:+FF:1:3:255: %*3hhx:+FF:0:3: -# BZ12701 %3hhx:+0Xff:0:-1: -# BZ12701 %*3hhx:+0Xff:0:-1: -# BZ12701 %3hhx:+0xFF:0:-1: -# BZ12701 %*3hhx:+0xFF:0:-1: +%3hhx:+0Xff:0:-1: +%*3hhx:+0Xff:0:-1: +%3hhx:+0xFF:0:-1: +%*3hhx:+0xFF:0:-1: %3hhx:+100:1:3:16: %*3hhx:+100:0:3: -# BZ12701 %3hhx:+0X100:0:-1: -# BZ12701 %*3hhx:+0X100:0:-1: -# BZ12701 %3hhx:+0x100:0:-1: -# BZ12701 %*3hhx:+0x100:0:-1: +%3hhx:+0X100:0:-1: +%*3hhx:+0X100:0:-1: +%3hhx:+0x100:0:-1: +%*3hhx:+0x100:0:-1: %3hhx:+129:1:3:18: %*3hhx:+129:0:3: -# BZ12701 %3hhx:+0X129:0:-1: -# BZ12701 %*3hhx:+0X129:0:-1: -# BZ12701 %3hhx:+0x129:0:-1: -# BZ12701 %*3hhx:+0x129:0:-1: +%3hhx:+0X129:0:-1: +%*3hhx:+0X129:0:-1: +%3hhx:+0x129:0:-1: +%*3hhx:+0x129:0:-1: %5hhx::0:-1: %*5hhx::0:-1: %5hhx:-7b:1:3:133: @@ -528,44 +528,44 @@ %*2hhx: -0x0:0:3: %2hhx: 0:1:2:0: %*2hhx: 0:0:2: -# BZ12701 %2hhx: 0X0:0:-1: -# BZ12701 %*2hhx: 0X0:0:-1: -# BZ12701 %2hhx: 0x0:0:-1: -# BZ12701 %*2hhx: 0x0:0:-1: +%2hhx: 0X0:0:-1: +%*2hhx: 0X0:0:-1: +%2hhx: 0x0:0:-1: +%*2hhx: 0x0:0:-1: %2hhx: 1:1:2:1: %*2hhx: 1:0:2: -# BZ12701 %2hhx: 0X1:0:-1: -# BZ12701 %*2hhx: 0X1:0:-1: -# BZ12701 %2hhx: 0x1:0:-1: -# BZ12701 %*2hhx: 0x1:0:-1: +%2hhx: 0X1:0:-1: +%*2hhx: 0X1:0:-1: +%2hhx: 0x1:0:-1: +%*2hhx: 0x1:0:-1: %2hhx: 2a:1:3:42: %*2hhx: 2a:0:3: %2hhx: 2A:1:3:42: %*2hhx: 2A:0:3: -# BZ12701 %2hhx: 0X2a:0:-1: -# BZ12701 %*2hhx: 0X2a:0:-1: -# BZ12701 %2hhx: 0x2A:0:-1: -# BZ12701 %*2hhx: 0x2A:0:-1: +%2hhx: 0X2a:0:-1: +%*2hhx: 0X2a:0:-1: +%2hhx: 0x2A:0:-1: +%*2hhx: 0x2A:0:-1: %2hhx: ff:1:3:255: %*2hhx: ff:0:3: %2hhx: FF:1:3:255: %*2hhx: FF:0:3: -# BZ12701 %2hhx: 0Xff:0:-1: -# BZ12701 %*2hhx: 0Xff:0:-1: -# BZ12701 %2hhx: 0xFF:0:-1: -# BZ12701 %*2hhx: 0xFF:0:-1: +%2hhx: 0Xff:0:-1: +%*2hhx: 0Xff:0:-1: +%2hhx: 0xFF:0:-1: +%*2hhx: 0xFF:0:-1: %2hhx: 100:1:3:16: %*2hhx: 100:0:3: -# BZ12701 %2hhx: 0X100:0:-1: -# BZ12701 %*2hhx: 0X100:0:-1: -# BZ12701 %2hhx: 0x100:0:-1: -# BZ12701 %*2hhx: 0x100:0:-1: +%2hhx: 0X100:0:-1: +%*2hhx: 0X100:0:-1: +%2hhx: 0x100:0:-1: +%*2hhx: 0x100:0:-1: %2hhx: 129:1:3:18: %*2hhx: 129:0:3: -# BZ12701 %2hhx: 0X129:0:-1: -# BZ12701 %*2hhx: 0X129:0:-1: -# BZ12701 %2hhx: 0x129:0:-1: -# BZ12701 %*2hhx: 0x129:0:-1: +%2hhx: 0X129:0:-1: +%*2hhx: 0X129:0:-1: +%2hhx: 0x129:0:-1: +%*2hhx: 0x129:0:-1: %2hhx: +0:1:3:0: %*2hhx: +0:0:3: %2hhx: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-uchar-xx.input b/stdio-common/tst-scanf-format-uchar-xx.input index 3e3af63..6fe86c2 100644 --- a/stdio-common/tst-scanf-format-uchar-xx.input +++ b/stdio-common/tst-scanf-format-uchar-xx.input @@ -222,44 +222,44 @@ %*2hhX:-0x0:0:2: %2hhX:0:1:1:0: %*2hhX:0:0:1: -# BZ12701 %2hhX:0X0:0:-1: -# BZ12701 %*2hhX:0X0:0:-1: -# BZ12701 %2hhX:0x0:0:-1: -# BZ12701 %*2hhX:0x0:0:-1: +%2hhX:0X0:0:-1: +%*2hhX:0X0:0:-1: +%2hhX:0x0:0:-1: +%*2hhX:0x0:0:-1: %2hhX:1:1:1:1: %*2hhX:1:0:1: -# BZ12701 %2hhX:0X1:0:-1: -# BZ12701 %*2hhX:0X1:0:-1: -# BZ12701 %2hhX:0x1:0:-1: -# BZ12701 %*2hhX:0x1:0:-1: +%2hhX:0X1:0:-1: +%*2hhX:0X1:0:-1: +%2hhX:0x1:0:-1: +%*2hhX:0x1:0:-1: %2hhX:2a:1:2:42: %*2hhX:2a:0:2: %2hhX:2A:1:2:42: %*2hhX:2A:0:2: -# BZ12701 %2hhX:0X2a:0:-1: -# BZ12701 %*2hhX:0X2a:0:-1: -# BZ12701 %2hhX:0x2A:0:-1: -# BZ12701 %*2hhX:0x2A:0:-1: +%2hhX:0X2a:0:-1: +%*2hhX:0X2a:0:-1: +%2hhX:0x2A:0:-1: +%*2hhX:0x2A:0:-1: %2hhX:ff:1:2:255: %*2hhX:ff:0:2: %2hhX:FF:1:2:255: %*2hhX:FF:0:2: -# BZ12701 %2hhX:0Xff:0:-1: -# BZ12701 %*2hhX:0Xff:0:-1: -# BZ12701 %2hhX:0xFF:0:-1: -# BZ12701 %*2hhX:0xFF:0:-1: +%2hhX:0Xff:0:-1: +%*2hhX:0Xff:0:-1: +%2hhX:0xFF:0:-1: +%*2hhX:0xFF:0:-1: %2hhX:100:1:2:16: %*2hhX:100:0:2: -# BZ12701 %2hhX:0X100:0:-1: -# BZ12701 %*2hhX:0X100:0:-1: -# BZ12701 %2hhX:0x100:0:-1: -# BZ12701 %*2hhX:0x100:0:-1: +%2hhX:0X100:0:-1: +%*2hhX:0X100:0:-1: +%2hhX:0x100:0:-1: +%*2hhX:0x100:0:-1: %2hhX:129:1:2:18: %*2hhX:129:0:2: -# BZ12701 %2hhX:0X129:0:-1: -# BZ12701 %*2hhX:0X129:0:-1: -# BZ12701 %2hhX:0x129:0:-1: -# BZ12701 %*2hhX:0x129:0:-1: +%2hhX:0X129:0:-1: +%*2hhX:0X129:0:-1: +%2hhX:0x129:0:-1: +%*2hhX:0x129:0:-1: %2hhX:+0:1:2:0: %*2hhX:+0:0:2: %2hhX:+0X0:1:2:0: @@ -306,22 +306,22 @@ %*3hhX:-7b:0:3: %3hhX:-7B:1:3:133: %*3hhX:-7B:0:3: -# BZ12701 %3hhX:-0X7b:0:-1: -# BZ12701 %*3hhX:-0X7b:0:-1: -# BZ12701 %3hhX:-0x7B:0:-1: -# BZ12701 %*3hhX:-0x7B:0:-1: +%3hhX:-0X7b:0:-1: +%*3hhX:-0X7b:0:-1: +%3hhX:-0x7B:0:-1: +%*3hhX:-0x7B:0:-1: %3hhX:-1:1:2:255: %*3hhX:-1:0:2: -# BZ12701 %3hhX:-0X1:0:-1: -# BZ12701 %*3hhX:-0X1:0:-1: -# BZ12701 %3hhX:-0x1:0:-1: -# BZ12701 %*3hhX:-0x1:0:-1: +%3hhX:-0X1:0:-1: +%*3hhX:-0X1:0:-1: +%3hhX:-0x1:0:-1: +%*3hhX:-0x1:0:-1: %3hhX:-0:1:2:0: %*3hhX:-0:0:2: -# BZ12701 %3hhX:-0X0:0:-1: -# BZ12701 %*3hhX:-0X0:0:-1: -# BZ12701 %3hhX:-0x0:0:-1: -# BZ12701 %*3hhX:-0x0:0:-1: +%3hhX:-0X0:0:-1: +%*3hhX:-0X0:0:-1: +%3hhX:-0x0:0:-1: +%*3hhX:-0x0:0:-1: %3hhX:0:1:1:0: %*3hhX:0:0:1: %3hhX:0X0:1:3:0: @@ -364,44 +364,44 @@ %*3hhX:0x129:0:3: %3hhX:+0:1:2:0: %*3hhX:+0:0:2: -# BZ12701 %3hhX:+0X0:0:-1: -# BZ12701 %*3hhX:+0X0:0:-1: -# BZ12701 %3hhX:+0x0:0:-1: -# BZ12701 %*3hhX:+0x0:0:-1: +%3hhX:+0X0:0:-1: +%*3hhX:+0X0:0:-1: +%3hhX:+0x0:0:-1: +%*3hhX:+0x0:0:-1: %3hhX:+1:1:2:1: %*3hhX:+1:0:2: -# BZ12701 %3hhX:+0X1:0:-1: -# BZ12701 %*3hhX:+0X1:0:-1: -# BZ12701 %3hhX:+0x1:0:-1: -# BZ12701 %*3hhX:+0x1:0:-1: +%3hhX:+0X1:0:-1: +%*3hhX:+0X1:0:-1: +%3hhX:+0x1:0:-1: +%*3hhX:+0x1:0:-1: %3hhX:+2a:1:3:42: %*3hhX:+2a:0:3: %3hhX:+2A:1:3:42: %*3hhX:+2A:0:3: -# BZ12701 %3hhX:+0X2a:0:-1: -# BZ12701 %*3hhX:+0X2a:0:-1: -# BZ12701 %3hhX:+0x2A:0:-1: -# BZ12701 %*3hhX:+0x2A:0:-1: +%3hhX:+0X2a:0:-1: +%*3hhX:+0X2a:0:-1: +%3hhX:+0x2A:0:-1: +%*3hhX:+0x2A:0:-1: %3hhX:+ff:1:3:255: %*3hhX:+ff:0:3: %3hhX:+FF:1:3:255: %*3hhX:+FF:0:3: -# BZ12701 %3hhX:+0Xff:0:-1: -# BZ12701 %*3hhX:+0Xff:0:-1: -# BZ12701 %3hhX:+0xFF:0:-1: -# BZ12701 %*3hhX:+0xFF:0:-1: +%3hhX:+0Xff:0:-1: +%*3hhX:+0Xff:0:-1: +%3hhX:+0xFF:0:-1: +%*3hhX:+0xFF:0:-1: %3hhX:+100:1:3:16: %*3hhX:+100:0:3: -# BZ12701 %3hhX:+0X100:0:-1: -# BZ12701 %*3hhX:+0X100:0:-1: -# BZ12701 %3hhX:+0x100:0:-1: -# BZ12701 %*3hhX:+0x100:0:-1: +%3hhX:+0X100:0:-1: +%*3hhX:+0X100:0:-1: +%3hhX:+0x100:0:-1: +%*3hhX:+0x100:0:-1: %3hhX:+129:1:3:18: %*3hhX:+129:0:3: -# BZ12701 %3hhX:+0X129:0:-1: -# BZ12701 %*3hhX:+0X129:0:-1: -# BZ12701 %3hhX:+0x129:0:-1: -# BZ12701 %*3hhX:+0x129:0:-1: +%3hhX:+0X129:0:-1: +%*3hhX:+0X129:0:-1: +%3hhX:+0x129:0:-1: +%*3hhX:+0x129:0:-1: %5hhX::0:-1: %*5hhX::0:-1: %5hhX:-7b:1:3:133: @@ -528,44 +528,44 @@ %*2hhX: -0x0:0:3: %2hhX: 0:1:2:0: %*2hhX: 0:0:2: -# BZ12701 %2hhX: 0X0:0:-1: -# BZ12701 %*2hhX: 0X0:0:-1: -# BZ12701 %2hhX: 0x0:0:-1: -# BZ12701 %*2hhX: 0x0:0:-1: +%2hhX: 0X0:0:-1: +%*2hhX: 0X0:0:-1: +%2hhX: 0x0:0:-1: +%*2hhX: 0x0:0:-1: %2hhX: 1:1:2:1: %*2hhX: 1:0:2: -# BZ12701 %2hhX: 0X1:0:-1: -# BZ12701 %*2hhX: 0X1:0:-1: -# BZ12701 %2hhX: 0x1:0:-1: -# BZ12701 %*2hhX: 0x1:0:-1: +%2hhX: 0X1:0:-1: +%*2hhX: 0X1:0:-1: +%2hhX: 0x1:0:-1: +%*2hhX: 0x1:0:-1: %2hhX: 2a:1:3:42: %*2hhX: 2a:0:3: %2hhX: 2A:1:3:42: %*2hhX: 2A:0:3: -# BZ12701 %2hhX: 0X2a:0:-1: -# BZ12701 %*2hhX: 0X2a:0:-1: -# BZ12701 %2hhX: 0x2A:0:-1: -# BZ12701 %*2hhX: 0x2A:0:-1: +%2hhX: 0X2a:0:-1: +%*2hhX: 0X2a:0:-1: +%2hhX: 0x2A:0:-1: +%*2hhX: 0x2A:0:-1: %2hhX: ff:1:3:255: %*2hhX: ff:0:3: %2hhX: FF:1:3:255: %*2hhX: FF:0:3: -# BZ12701 %2hhX: 0Xff:0:-1: -# BZ12701 %*2hhX: 0Xff:0:-1: -# BZ12701 %2hhX: 0xFF:0:-1: -# BZ12701 %*2hhX: 0xFF:0:-1: +%2hhX: 0Xff:0:-1: +%*2hhX: 0Xff:0:-1: +%2hhX: 0xFF:0:-1: +%*2hhX: 0xFF:0:-1: %2hhX: 100:1:3:16: %*2hhX: 100:0:3: -# BZ12701 %2hhX: 0X100:0:-1: -# BZ12701 %*2hhX: 0X100:0:-1: -# BZ12701 %2hhX: 0x100:0:-1: -# BZ12701 %*2hhX: 0x100:0:-1: +%2hhX: 0X100:0:-1: +%*2hhX: 0X100:0:-1: +%2hhX: 0x100:0:-1: +%*2hhX: 0x100:0:-1: %2hhX: 129:1:3:18: %*2hhX: 129:0:3: -# BZ12701 %2hhX: 0X129:0:-1: -# BZ12701 %*2hhX: 0X129:0:-1: -# BZ12701 %2hhX: 0x129:0:-1: -# BZ12701 %*2hhX: 0x129:0:-1: +%2hhX: 0X129:0:-1: +%*2hhX: 0X129:0:-1: +%2hhX: 0x129:0:-1: +%*2hhX: 0x129:0:-1: %2hhX: +0:1:3:0: %*2hhX: +0:0:3: %2hhX: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ullong-b.input b/stdio-common/tst-scanf-format-ullong-b.input index 57b83f0..b010d51 100644 --- a/stdio-common/tst-scanf-format-ullong-b.input +++ b/stdio-common/tst-scanf-format-ullong-b.input @@ -204,40 +204,40 @@ %*2llb:-0b0:0:2: %2llb:0:1:1:0: %*2llb:0:0:1: -# BZ12701 %2llb:0B0:0:-1: -# BZ12701 %*2llb:0B0:0:-1: -# BZ12701 %2llb:0b0:0:-1: -# BZ12701 %*2llb:0b0:0:-1: +%2llb:0B0:0:-1: +%*2llb:0B0:0:-1: +%2llb:0b0:0:-1: +%*2llb:0b0:0:-1: %2llb:1:1:1:1: %*2llb:1:0:1: -# BZ12701 %2llb:0B1:0:-1: -# BZ12701 %*2llb:0B1:0:-1: -# BZ12701 %2llb:0b1:0:-1: -# BZ12701 %*2llb:0b1:0:-1: +%2llb:0B1:0:-1: +%*2llb:0B1:0:-1: +%2llb:0b1:0:-1: +%*2llb:0b1:0:-1: %2llb:101010:1:2:2: %*2llb:101010:0:2: -# BZ12701 %2llb:0B101010:0:-1: -# BZ12701 %*2llb:0B101010:0:-1: -# BZ12701 %2llb:0b101010:0:-1: -# BZ12701 %*2llb:0b101010:0:-1: +%2llb:0B101010:0:-1: +%*2llb:0B101010:0:-1: +%2llb:0b101010:0:-1: +%*2llb:0b101010:0:-1: %2llb:1111111111111111111111111111111111111111111111111111111111111111:1:2:3: %*2llb:1111111111111111111111111111111111111111111111111111111111111111:0:2: -# BZ12701 %2llb:0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2llb:0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %2llb:0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2llb:0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2llb:0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2llb:0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2llb:0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2llb:0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: %2llb:10000000000000000000000000000000000000000000000000000000000000000:1:2:2: %*2llb:10000000000000000000000000000000000000000000000000000000000000000:0:2: -# BZ12701 %2llb:0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2llb:0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %2llb:0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2llb:0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2llb:0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2llb:0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2llb:0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2llb:0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: %2llb:10000000000000000000000000000000000000010100001110101011110110001:1:2:2: %*2llb:10000000000000000000000000000000000000010100001110101011110110001:0:2: -# BZ12701 %2llb:0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2llb:0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %2llb:0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2llb:0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2llb:0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2llb:0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2llb:0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2llb:0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: %2llb:+0:1:2:0: %*2llb:+0:0:2: %2llb:+0B0:1:2:0: @@ -480,40 +480,40 @@ %*2llb: -0b0:0:3: %2llb: 0:1:2:0: %*2llb: 0:0:2: -# BZ12701 %2llb: 0B0:0:-1: -# BZ12701 %*2llb: 0B0:0:-1: -# BZ12701 %2llb: 0b0:0:-1: -# BZ12701 %*2llb: 0b0:0:-1: +%2llb: 0B0:0:-1: +%*2llb: 0B0:0:-1: +%2llb: 0b0:0:-1: +%*2llb: 0b0:0:-1: %2llb: 1:1:2:1: %*2llb: 1:0:2: -# BZ12701 %2llb: 0B1:0:-1: -# BZ12701 %*2llb: 0B1:0:-1: -# BZ12701 %2llb: 0b1:0:-1: -# BZ12701 %*2llb: 0b1:0:-1: +%2llb: 0B1:0:-1: +%*2llb: 0B1:0:-1: +%2llb: 0b1:0:-1: +%*2llb: 0b1:0:-1: %2llb: 101010:1:3:2: %*2llb: 101010:0:3: -# BZ12701 %2llb: 0B101010:0:-1: -# BZ12701 %*2llb: 0B101010:0:-1: -# BZ12701 %2llb: 0b101010:0:-1: -# BZ12701 %*2llb: 0b101010:0:-1: +%2llb: 0B101010:0:-1: +%*2llb: 0B101010:0:-1: +%2llb: 0b101010:0:-1: +%*2llb: 0b101010:0:-1: %2llb: 1111111111111111111111111111111111111111111111111111111111111111:1:3:3: %*2llb: 1111111111111111111111111111111111111111111111111111111111111111:0:3: -# BZ12701 %2llb: 0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2llb: 0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %2llb: 0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: -# BZ12701 %*2llb: 0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2llb: 0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2llb: 0B1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%2llb: 0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: +%*2llb: 0b1111111111111111111111111111111111111111111111111111111111111111:0:-1: %2llb: 10000000000000000000000000000000000000000000000000000000000000000:1:3:2: %*2llb: 10000000000000000000000000000000000000000000000000000000000000000:0:3: -# BZ12701 %2llb: 0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2llb: 0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %2llb: 0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: -# BZ12701 %*2llb: 0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2llb: 0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2llb: 0B10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%2llb: 0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: +%*2llb: 0b10000000000000000000000000000000000000000000000000000000000000000:0:-1: %2llb: 10000000000000000000000000000000000000010100001110101011110110001:1:3:2: %*2llb: 10000000000000000000000000000000000000010100001110101011110110001:0:3: -# BZ12701 %2llb: 0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2llb: 0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %2llb: 0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: -# BZ12701 %*2llb: 0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2llb: 0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2llb: 0B10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%2llb: 0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: +%*2llb: 0b10000000000000000000000000000000000000010100001110101011110110001:0:-1: %2llb: +0:1:3:0: %*2llb: +0:0:3: %2llb: +0B0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ullong-x.input b/stdio-common/tst-scanf-format-ullong-x.input index 5376bb8..1833713 100644 --- a/stdio-common/tst-scanf-format-ullong-x.input +++ b/stdio-common/tst-scanf-format-ullong-x.input @@ -234,46 +234,46 @@ %*2llx:-0x0:0:2: %2llx:0:1:1:0: %*2llx:0:0:1: -# BZ12701 %2llx:0X0:0:-1: -# BZ12701 %*2llx:0X0:0:-1: -# BZ12701 %2llx:0x0:0:-1: -# BZ12701 %*2llx:0x0:0:-1: +%2llx:0X0:0:-1: +%*2llx:0X0:0:-1: +%2llx:0x0:0:-1: +%*2llx:0x0:0:-1: %2llx:1:1:1:1: %*2llx:1:0:1: -# BZ12701 %2llx:0X1:0:-1: -# BZ12701 %*2llx:0X1:0:-1: -# BZ12701 %2llx:0x1:0:-1: -# BZ12701 %*2llx:0x1:0:-1: +%2llx:0X1:0:-1: +%*2llx:0X1:0:-1: +%2llx:0x1:0:-1: +%*2llx:0x1:0:-1: %2llx:2a:1:2:42: %*2llx:2a:0:2: %2llx:2A:1:2:42: %*2llx:2A:0:2: -# BZ12701 %2llx:0X2a:0:-1: -# BZ12701 %*2llx:0X2a:0:-1: -# BZ12701 %2llx:0x2A:0:-1: -# BZ12701 %*2llx:0x2A:0:-1: +%2llx:0X2a:0:-1: +%*2llx:0X2a:0:-1: +%2llx:0x2A:0:-1: +%*2llx:0x2A:0:-1: %2llx:ffffffffffffffff:1:2:255: %*2llx:ffffffffffffffff:0:2: %2llx:FFFFFFFFFFFFFFFF:1:2:255: %*2llx:FFFFFFFFFFFFFFFF:0:2: -# BZ12701 %2llx:0Xffffffffffffffff:0:-1: -# BZ12701 %*2llx:0Xffffffffffffffff:0:-1: -# BZ12701 %2llx:0xFFFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2llx:0xFFFFFFFFFFFFFFFF:0:-1: +%2llx:0Xffffffffffffffff:0:-1: +%*2llx:0Xffffffffffffffff:0:-1: +%2llx:0xFFFFFFFFFFFFFFFF:0:-1: +%*2llx:0xFFFFFFFFFFFFFFFF:0:-1: %2llx:10000000000000000:1:2:16: %*2llx:10000000000000000:0:2: -# BZ12701 %2llx:0X10000000000000000:0:-1: -# BZ12701 %*2llx:0X10000000000000000:0:-1: -# BZ12701 %2llx:0x10000000000000000:0:-1: -# BZ12701 %*2llx:0x10000000000000000:0:-1: +%2llx:0X10000000000000000:0:-1: +%*2llx:0X10000000000000000:0:-1: +%2llx:0x10000000000000000:0:-1: +%*2llx:0x10000000000000000:0:-1: %2llx:100000000028757b1:1:2:16: %*2llx:100000000028757b1:0:2: %2llx:100000000028757B1:1:2:16: %*2llx:100000000028757B1:0:2: -# BZ12701 %2llx:0X100000000028757b1:0:-1: -# BZ12701 %*2llx:0X100000000028757b1:0:-1: -# BZ12701 %2llx:0x100000000028757B1:0:-1: -# BZ12701 %*2llx:0x100000000028757B1:0:-1: +%2llx:0X100000000028757b1:0:-1: +%*2llx:0X100000000028757b1:0:-1: +%2llx:0x100000000028757B1:0:-1: +%*2llx:0x100000000028757B1:0:-1: %2llx:+0:1:2:0: %*2llx:+0:0:2: %2llx:+0X0:1:2:0: @@ -552,46 +552,46 @@ %*2llx: -0x0:0:3: %2llx: 0:1:2:0: %*2llx: 0:0:2: -# BZ12701 %2llx: 0X0:0:-1: -# BZ12701 %*2llx: 0X0:0:-1: -# BZ12701 %2llx: 0x0:0:-1: -# BZ12701 %*2llx: 0x0:0:-1: +%2llx: 0X0:0:-1: +%*2llx: 0X0:0:-1: +%2llx: 0x0:0:-1: +%*2llx: 0x0:0:-1: %2llx: 1:1:2:1: %*2llx: 1:0:2: -# BZ12701 %2llx: 0X1:0:-1: -# BZ12701 %*2llx: 0X1:0:-1: -# BZ12701 %2llx: 0x1:0:-1: -# BZ12701 %*2llx: 0x1:0:-1: +%2llx: 0X1:0:-1: +%*2llx: 0X1:0:-1: +%2llx: 0x1:0:-1: +%*2llx: 0x1:0:-1: %2llx: 2a:1:3:42: %*2llx: 2a:0:3: %2llx: 2A:1:3:42: %*2llx: 2A:0:3: -# BZ12701 %2llx: 0X2a:0:-1: -# BZ12701 %*2llx: 0X2a:0:-1: -# BZ12701 %2llx: 0x2A:0:-1: -# BZ12701 %*2llx: 0x2A:0:-1: +%2llx: 0X2a:0:-1: +%*2llx: 0X2a:0:-1: +%2llx: 0x2A:0:-1: +%*2llx: 0x2A:0:-1: %2llx: ffffffffffffffff:1:3:255: %*2llx: ffffffffffffffff:0:3: %2llx: FFFFFFFFFFFFFFFF:1:3:255: %*2llx: FFFFFFFFFFFFFFFF:0:3: -# BZ12701 %2llx: 0Xffffffffffffffff:0:-1: -# BZ12701 %*2llx: 0Xffffffffffffffff:0:-1: -# BZ12701 %2llx: 0xFFFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2llx: 0xFFFFFFFFFFFFFFFF:0:-1: +%2llx: 0Xffffffffffffffff:0:-1: +%*2llx: 0Xffffffffffffffff:0:-1: +%2llx: 0xFFFFFFFFFFFFFFFF:0:-1: +%*2llx: 0xFFFFFFFFFFFFFFFF:0:-1: %2llx: 10000000000000000:1:3:16: %*2llx: 10000000000000000:0:3: -# BZ12701 %2llx: 0X10000000000000000:0:-1: -# BZ12701 %*2llx: 0X10000000000000000:0:-1: -# BZ12701 %2llx: 0x10000000000000000:0:-1: -# BZ12701 %*2llx: 0x10000000000000000:0:-1: +%2llx: 0X10000000000000000:0:-1: +%*2llx: 0X10000000000000000:0:-1: +%2llx: 0x10000000000000000:0:-1: +%*2llx: 0x10000000000000000:0:-1: %2llx: 100000000028757b1:1:3:16: %*2llx: 100000000028757b1:0:3: %2llx: 100000000028757B1:1:3:16: %*2llx: 100000000028757B1:0:3: -# BZ12701 %2llx: 0X100000000028757b1:0:-1: -# BZ12701 %*2llx: 0X100000000028757b1:0:-1: -# BZ12701 %2llx: 0x100000000028757B1:0:-1: -# BZ12701 %*2llx: 0x100000000028757B1:0:-1: +%2llx: 0X100000000028757b1:0:-1: +%*2llx: 0X100000000028757b1:0:-1: +%2llx: 0x100000000028757B1:0:-1: +%*2llx: 0x100000000028757B1:0:-1: %2llx: +0:1:3:0: %*2llx: +0:0:3: %2llx: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ullong-xx.input b/stdio-common/tst-scanf-format-ullong-xx.input index 0964651..df1ca93 100644 --- a/stdio-common/tst-scanf-format-ullong-xx.input +++ b/stdio-common/tst-scanf-format-ullong-xx.input @@ -234,46 +234,46 @@ %*2llX:-0x0:0:2: %2llX:0:1:1:0: %*2llX:0:0:1: -# BZ12701 %2llX:0X0:0:-1: -# BZ12701 %*2llX:0X0:0:-1: -# BZ12701 %2llX:0x0:0:-1: -# BZ12701 %*2llX:0x0:0:-1: +%2llX:0X0:0:-1: +%*2llX:0X0:0:-1: +%2llX:0x0:0:-1: +%*2llX:0x0:0:-1: %2llX:1:1:1:1: %*2llX:1:0:1: -# BZ12701 %2llX:0X1:0:-1: -# BZ12701 %*2llX:0X1:0:-1: -# BZ12701 %2llX:0x1:0:-1: -# BZ12701 %*2llX:0x1:0:-1: +%2llX:0X1:0:-1: +%*2llX:0X1:0:-1: +%2llX:0x1:0:-1: +%*2llX:0x1:0:-1: %2llX:2a:1:2:42: %*2llX:2a:0:2: %2llX:2A:1:2:42: %*2llX:2A:0:2: -# BZ12701 %2llX:0X2a:0:-1: -# BZ12701 %*2llX:0X2a:0:-1: -# BZ12701 %2llX:0x2A:0:-1: -# BZ12701 %*2llX:0x2A:0:-1: +%2llX:0X2a:0:-1: +%*2llX:0X2a:0:-1: +%2llX:0x2A:0:-1: +%*2llX:0x2A:0:-1: %2llX:ffffffffffffffff:1:2:255: %*2llX:ffffffffffffffff:0:2: %2llX:FFFFFFFFFFFFFFFF:1:2:255: %*2llX:FFFFFFFFFFFFFFFF:0:2: -# BZ12701 %2llX:0Xffffffffffffffff:0:-1: -# BZ12701 %*2llX:0Xffffffffffffffff:0:-1: -# BZ12701 %2llX:0xFFFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2llX:0xFFFFFFFFFFFFFFFF:0:-1: +%2llX:0Xffffffffffffffff:0:-1: +%*2llX:0Xffffffffffffffff:0:-1: +%2llX:0xFFFFFFFFFFFFFFFF:0:-1: +%*2llX:0xFFFFFFFFFFFFFFFF:0:-1: %2llX:10000000000000000:1:2:16: %*2llX:10000000000000000:0:2: -# BZ12701 %2llX:0X10000000000000000:0:-1: -# BZ12701 %*2llX:0X10000000000000000:0:-1: -# BZ12701 %2llX:0x10000000000000000:0:-1: -# BZ12701 %*2llX:0x10000000000000000:0:-1: +%2llX:0X10000000000000000:0:-1: +%*2llX:0X10000000000000000:0:-1: +%2llX:0x10000000000000000:0:-1: +%*2llX:0x10000000000000000:0:-1: %2llX:100000000028757b1:1:2:16: %*2llX:100000000028757b1:0:2: %2llX:100000000028757B1:1:2:16: %*2llX:100000000028757B1:0:2: -# BZ12701 %2llX:0X100000000028757b1:0:-1: -# BZ12701 %*2llX:0X100000000028757b1:0:-1: -# BZ12701 %2llX:0x100000000028757B1:0:-1: -# BZ12701 %*2llX:0x100000000028757B1:0:-1: +%2llX:0X100000000028757b1:0:-1: +%*2llX:0X100000000028757b1:0:-1: +%2llX:0x100000000028757B1:0:-1: +%*2llX:0x100000000028757B1:0:-1: %2llX:+0:1:2:0: %*2llX:+0:0:2: %2llX:+0X0:1:2:0: @@ -552,46 +552,46 @@ %*2llX: -0x0:0:3: %2llX: 0:1:2:0: %*2llX: 0:0:2: -# BZ12701 %2llX: 0X0:0:-1: -# BZ12701 %*2llX: 0X0:0:-1: -# BZ12701 %2llX: 0x0:0:-1: -# BZ12701 %*2llX: 0x0:0:-1: +%2llX: 0X0:0:-1: +%*2llX: 0X0:0:-1: +%2llX: 0x0:0:-1: +%*2llX: 0x0:0:-1: %2llX: 1:1:2:1: %*2llX: 1:0:2: -# BZ12701 %2llX: 0X1:0:-1: -# BZ12701 %*2llX: 0X1:0:-1: -# BZ12701 %2llX: 0x1:0:-1: -# BZ12701 %*2llX: 0x1:0:-1: +%2llX: 0X1:0:-1: +%*2llX: 0X1:0:-1: +%2llX: 0x1:0:-1: +%*2llX: 0x1:0:-1: %2llX: 2a:1:3:42: %*2llX: 2a:0:3: %2llX: 2A:1:3:42: %*2llX: 2A:0:3: -# BZ12701 %2llX: 0X2a:0:-1: -# BZ12701 %*2llX: 0X2a:0:-1: -# BZ12701 %2llX: 0x2A:0:-1: -# BZ12701 %*2llX: 0x2A:0:-1: +%2llX: 0X2a:0:-1: +%*2llX: 0X2a:0:-1: +%2llX: 0x2A:0:-1: +%*2llX: 0x2A:0:-1: %2llX: ffffffffffffffff:1:3:255: %*2llX: ffffffffffffffff:0:3: %2llX: FFFFFFFFFFFFFFFF:1:3:255: %*2llX: FFFFFFFFFFFFFFFF:0:3: -# BZ12701 %2llX: 0Xffffffffffffffff:0:-1: -# BZ12701 %*2llX: 0Xffffffffffffffff:0:-1: -# BZ12701 %2llX: 0xFFFFFFFFFFFFFFFF:0:-1: -# BZ12701 %*2llX: 0xFFFFFFFFFFFFFFFF:0:-1: +%2llX: 0Xffffffffffffffff:0:-1: +%*2llX: 0Xffffffffffffffff:0:-1: +%2llX: 0xFFFFFFFFFFFFFFFF:0:-1: +%*2llX: 0xFFFFFFFFFFFFFFFF:0:-1: %2llX: 10000000000000000:1:3:16: %*2llX: 10000000000000000:0:3: -# BZ12701 %2llX: 0X10000000000000000:0:-1: -# BZ12701 %*2llX: 0X10000000000000000:0:-1: -# BZ12701 %2llX: 0x10000000000000000:0:-1: -# BZ12701 %*2llX: 0x10000000000000000:0:-1: +%2llX: 0X10000000000000000:0:-1: +%*2llX: 0X10000000000000000:0:-1: +%2llX: 0x10000000000000000:0:-1: +%*2llX: 0x10000000000000000:0:-1: %2llX: 100000000028757b1:1:3:16: %*2llX: 100000000028757b1:0:3: %2llX: 100000000028757B1:1:3:16: %*2llX: 100000000028757B1:0:3: -# BZ12701 %2llX: 0X100000000028757b1:0:-1: -# BZ12701 %*2llX: 0X100000000028757b1:0:-1: -# BZ12701 %2llX: 0x100000000028757B1:0:-1: -# BZ12701 %*2llX: 0x100000000028757B1:0:-1: +%2llX: 0X100000000028757b1:0:-1: +%*2llX: 0X100000000028757b1:0:-1: +%2llX: 0x100000000028757B1:0:-1: +%*2llX: 0x100000000028757B1:0:-1: %2llX: +0:1:3:0: %*2llX: +0:0:3: %2llX: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ushort-b.input b/stdio-common/tst-scanf-format-ushort-b.input index b41a667..ed1168d 100644 --- a/stdio-common/tst-scanf-format-ushort-b.input +++ b/stdio-common/tst-scanf-format-ushort-b.input @@ -204,40 +204,40 @@ %*2hb:-0b0:0:2: %2hb:0:1:1:0: %*2hb:0:0:1: -# BZ12701 %2hb:0B0:0:-1: -# BZ12701 %*2hb:0B0:0:-1: -# BZ12701 %2hb:0b0:0:-1: -# BZ12701 %*2hb:0b0:0:-1: +%2hb:0B0:0:-1: +%*2hb:0B0:0:-1: +%2hb:0b0:0:-1: +%*2hb:0b0:0:-1: %2hb:1:1:1:1: %*2hb:1:0:1: -# BZ12701 %2hb:0B1:0:-1: -# BZ12701 %*2hb:0B1:0:-1: -# BZ12701 %2hb:0b1:0:-1: -# BZ12701 %*2hb:0b1:0:-1: +%2hb:0B1:0:-1: +%*2hb:0B1:0:-1: +%2hb:0b1:0:-1: +%*2hb:0b1:0:-1: %2hb:101010:1:2:2: %*2hb:101010:0:2: -# BZ12701 %2hb:0B101010:0:-1: -# BZ12701 %*2hb:0B101010:0:-1: -# BZ12701 %2hb:0b101010:0:-1: -# BZ12701 %*2hb:0b101010:0:-1: +%2hb:0B101010:0:-1: +%*2hb:0B101010:0:-1: +%2hb:0b101010:0:-1: +%*2hb:0b101010:0:-1: %2hb:1111111111111111:1:2:3: %*2hb:1111111111111111:0:2: -# BZ12701 %2hb:0B1111111111111111:0:-1: -# BZ12701 %*2hb:0B1111111111111111:0:-1: -# BZ12701 %2hb:0b1111111111111111:0:-1: -# BZ12701 %*2hb:0b1111111111111111:0:-1: +%2hb:0B1111111111111111:0:-1: +%*2hb:0B1111111111111111:0:-1: +%2hb:0b1111111111111111:0:-1: +%*2hb:0b1111111111111111:0:-1: %2hb:10000000000000000:1:2:2: %*2hb:10000000000000000:0:2: -# BZ12701 %2hb:0B10000000000000000:0:-1: -# BZ12701 %*2hb:0B10000000000000000:0:-1: -# BZ12701 %2hb:0b10000000000000000:0:-1: -# BZ12701 %*2hb:0b10000000000000000:0:-1: +%2hb:0B10000000000000000:0:-1: +%*2hb:0B10000000000000000:0:-1: +%2hb:0b10000000000000000:0:-1: +%*2hb:0b10000000000000000:0:-1: %2hb:10000000000101001:1:2:2: %*2hb:10000000000101001:0:2: -# BZ12701 %2hb:0B10000000000101001:0:-1: -# BZ12701 %*2hb:0B10000000000101001:0:-1: -# BZ12701 %2hb:0b10000000000101001:0:-1: -# BZ12701 %*2hb:0b10000000000101001:0:-1: +%2hb:0B10000000000101001:0:-1: +%*2hb:0B10000000000101001:0:-1: +%2hb:0b10000000000101001:0:-1: +%*2hb:0b10000000000101001:0:-1: %2hb:+0:1:2:0: %*2hb:+0:0:2: %2hb:+0B0:1:2:0: @@ -480,40 +480,40 @@ %*2hb: -0b0:0:3: %2hb: 0:1:2:0: %*2hb: 0:0:2: -# BZ12701 %2hb: 0B0:0:-1: -# BZ12701 %*2hb: 0B0:0:-1: -# BZ12701 %2hb: 0b0:0:-1: -# BZ12701 %*2hb: 0b0:0:-1: +%2hb: 0B0:0:-1: +%*2hb: 0B0:0:-1: +%2hb: 0b0:0:-1: +%*2hb: 0b0:0:-1: %2hb: 1:1:2:1: %*2hb: 1:0:2: -# BZ12701 %2hb: 0B1:0:-1: -# BZ12701 %*2hb: 0B1:0:-1: -# BZ12701 %2hb: 0b1:0:-1: -# BZ12701 %*2hb: 0b1:0:-1: +%2hb: 0B1:0:-1: +%*2hb: 0B1:0:-1: +%2hb: 0b1:0:-1: +%*2hb: 0b1:0:-1: %2hb: 101010:1:3:2: %*2hb: 101010:0:3: -# BZ12701 %2hb: 0B101010:0:-1: -# BZ12701 %*2hb: 0B101010:0:-1: -# BZ12701 %2hb: 0b101010:0:-1: -# BZ12701 %*2hb: 0b101010:0:-1: +%2hb: 0B101010:0:-1: +%*2hb: 0B101010:0:-1: +%2hb: 0b101010:0:-1: +%*2hb: 0b101010:0:-1: %2hb: 1111111111111111:1:3:3: %*2hb: 1111111111111111:0:3: -# BZ12701 %2hb: 0B1111111111111111:0:-1: -# BZ12701 %*2hb: 0B1111111111111111:0:-1: -# BZ12701 %2hb: 0b1111111111111111:0:-1: -# BZ12701 %*2hb: 0b1111111111111111:0:-1: +%2hb: 0B1111111111111111:0:-1: +%*2hb: 0B1111111111111111:0:-1: +%2hb: 0b1111111111111111:0:-1: +%*2hb: 0b1111111111111111:0:-1: %2hb: 10000000000000000:1:3:2: %*2hb: 10000000000000000:0:3: -# BZ12701 %2hb: 0B10000000000000000:0:-1: -# BZ12701 %*2hb: 0B10000000000000000:0:-1: -# BZ12701 %2hb: 0b10000000000000000:0:-1: -# BZ12701 %*2hb: 0b10000000000000000:0:-1: +%2hb: 0B10000000000000000:0:-1: +%*2hb: 0B10000000000000000:0:-1: +%2hb: 0b10000000000000000:0:-1: +%*2hb: 0b10000000000000000:0:-1: %2hb: 10000000000101001:1:3:2: %*2hb: 10000000000101001:0:3: -# BZ12701 %2hb: 0B10000000000101001:0:-1: -# BZ12701 %*2hb: 0B10000000000101001:0:-1: -# BZ12701 %2hb: 0b10000000000101001:0:-1: -# BZ12701 %*2hb: 0b10000000000101001:0:-1: +%2hb: 0B10000000000101001:0:-1: +%*2hb: 0B10000000000101001:0:-1: +%2hb: 0b10000000000101001:0:-1: +%*2hb: 0b10000000000101001:0:-1: %2hb: +0:1:3:0: %*2hb: +0:0:3: %2hb: +0B0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ushort-x.input b/stdio-common/tst-scanf-format-ushort-x.input index a0ec8846..117b5c3 100644 --- a/stdio-common/tst-scanf-format-ushort-x.input +++ b/stdio-common/tst-scanf-format-ushort-x.input @@ -226,44 +226,44 @@ %*2hx:-0x0:0:2: %2hx:0:1:1:0: %*2hx:0:0:1: -# BZ12701 %2hx:0X0:0:-1: -# BZ12701 %*2hx:0X0:0:-1: -# BZ12701 %2hx:0x0:0:-1: -# BZ12701 %*2hx:0x0:0:-1: +%2hx:0X0:0:-1: +%*2hx:0X0:0:-1: +%2hx:0x0:0:-1: +%*2hx:0x0:0:-1: %2hx:1:1:1:1: %*2hx:1:0:1: -# BZ12701 %2hx:0X1:0:-1: -# BZ12701 %*2hx:0X1:0:-1: -# BZ12701 %2hx:0x1:0:-1: -# BZ12701 %*2hx:0x1:0:-1: +%2hx:0X1:0:-1: +%*2hx:0X1:0:-1: +%2hx:0x1:0:-1: +%*2hx:0x1:0:-1: %2hx:2a:1:2:42: %*2hx:2a:0:2: %2hx:2A:1:2:42: %*2hx:2A:0:2: -# BZ12701 %2hx:0X2a:0:-1: -# BZ12701 %*2hx:0X2a:0:-1: -# BZ12701 %2hx:0x2A:0:-1: -# BZ12701 %*2hx:0x2A:0:-1: +%2hx:0X2a:0:-1: +%*2hx:0X2a:0:-1: +%2hx:0x2A:0:-1: +%*2hx:0x2A:0:-1: %2hx:ffff:1:2:255: %*2hx:ffff:0:2: %2hx:FFFF:1:2:255: %*2hx:FFFF:0:2: -# BZ12701 %2hx:0Xffff:0:-1: -# BZ12701 %*2hx:0Xffff:0:-1: -# BZ12701 %2hx:0xFFFF:0:-1: -# BZ12701 %*2hx:0xFFFF:0:-1: +%2hx:0Xffff:0:-1: +%*2hx:0Xffff:0:-1: +%2hx:0xFFFF:0:-1: +%*2hx:0xFFFF:0:-1: %2hx:10000:1:2:16: %*2hx:10000:0:2: -# BZ12701 %2hx:0X10000:0:-1: -# BZ12701 %*2hx:0X10000:0:-1: -# BZ12701 %2hx:0x10000:0:-1: -# BZ12701 %*2hx:0x10000:0:-1: +%2hx:0X10000:0:-1: +%*2hx:0X10000:0:-1: +%2hx:0x10000:0:-1: +%*2hx:0x10000:0:-1: %2hx:10029:1:2:16: %*2hx:10029:0:2: -# BZ12701 %2hx:0X10029:0:-1: -# BZ12701 %*2hx:0X10029:0:-1: -# BZ12701 %2hx:0x10029:0:-1: -# BZ12701 %*2hx:0x10029:0:-1: +%2hx:0X10029:0:-1: +%*2hx:0X10029:0:-1: +%2hx:0x10029:0:-1: +%*2hx:0x10029:0:-1: %2hx:+0:1:2:0: %*2hx:+0:0:2: %2hx:+0X0:1:2:0: @@ -532,44 +532,44 @@ %*2hx: -0x0:0:3: %2hx: 0:1:2:0: %*2hx: 0:0:2: -# BZ12701 %2hx: 0X0:0:-1: -# BZ12701 %*2hx: 0X0:0:-1: -# BZ12701 %2hx: 0x0:0:-1: -# BZ12701 %*2hx: 0x0:0:-1: +%2hx: 0X0:0:-1: +%*2hx: 0X0:0:-1: +%2hx: 0x0:0:-1: +%*2hx: 0x0:0:-1: %2hx: 1:1:2:1: %*2hx: 1:0:2: -# BZ12701 %2hx: 0X1:0:-1: -# BZ12701 %*2hx: 0X1:0:-1: -# BZ12701 %2hx: 0x1:0:-1: -# BZ12701 %*2hx: 0x1:0:-1: +%2hx: 0X1:0:-1: +%*2hx: 0X1:0:-1: +%2hx: 0x1:0:-1: +%*2hx: 0x1:0:-1: %2hx: 2a:1:3:42: %*2hx: 2a:0:3: %2hx: 2A:1:3:42: %*2hx: 2A:0:3: -# BZ12701 %2hx: 0X2a:0:-1: -# BZ12701 %*2hx: 0X2a:0:-1: -# BZ12701 %2hx: 0x2A:0:-1: -# BZ12701 %*2hx: 0x2A:0:-1: +%2hx: 0X2a:0:-1: +%*2hx: 0X2a:0:-1: +%2hx: 0x2A:0:-1: +%*2hx: 0x2A:0:-1: %2hx: ffff:1:3:255: %*2hx: ffff:0:3: %2hx: FFFF:1:3:255: %*2hx: FFFF:0:3: -# BZ12701 %2hx: 0Xffff:0:-1: -# BZ12701 %*2hx: 0Xffff:0:-1: -# BZ12701 %2hx: 0xFFFF:0:-1: -# BZ12701 %*2hx: 0xFFFF:0:-1: +%2hx: 0Xffff:0:-1: +%*2hx: 0Xffff:0:-1: +%2hx: 0xFFFF:0:-1: +%*2hx: 0xFFFF:0:-1: %2hx: 10000:1:3:16: %*2hx: 10000:0:3: -# BZ12701 %2hx: 0X10000:0:-1: -# BZ12701 %*2hx: 0X10000:0:-1: -# BZ12701 %2hx: 0x10000:0:-1: -# BZ12701 %*2hx: 0x10000:0:-1: +%2hx: 0X10000:0:-1: +%*2hx: 0X10000:0:-1: +%2hx: 0x10000:0:-1: +%*2hx: 0x10000:0:-1: %2hx: 10029:1:3:16: %*2hx: 10029:0:3: -# BZ12701 %2hx: 0X10029:0:-1: -# BZ12701 %*2hx: 0X10029:0:-1: -# BZ12701 %2hx: 0x10029:0:-1: -# BZ12701 %*2hx: 0x10029:0:-1: +%2hx: 0X10029:0:-1: +%*2hx: 0X10029:0:-1: +%2hx: 0x10029:0:-1: +%*2hx: 0x10029:0:-1: %2hx: +0:1:3:0: %*2hx: +0:0:3: %2hx: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-ushort-xx.input b/stdio-common/tst-scanf-format-ushort-xx.input index c0e5277..fca910a 100644 --- a/stdio-common/tst-scanf-format-ushort-xx.input +++ b/stdio-common/tst-scanf-format-ushort-xx.input @@ -226,44 +226,44 @@ %*2hX:-0x0:0:2: %2hX:0:1:1:0: %*2hX:0:0:1: -# BZ12701 %2hX:0X0:0:-1: -# BZ12701 %*2hX:0X0:0:-1: -# BZ12701 %2hX:0x0:0:-1: -# BZ12701 %*2hX:0x0:0:-1: +%2hX:0X0:0:-1: +%*2hX:0X0:0:-1: +%2hX:0x0:0:-1: +%*2hX:0x0:0:-1: %2hX:1:1:1:1: %*2hX:1:0:1: -# BZ12701 %2hX:0X1:0:-1: -# BZ12701 %*2hX:0X1:0:-1: -# BZ12701 %2hX:0x1:0:-1: -# BZ12701 %*2hX:0x1:0:-1: +%2hX:0X1:0:-1: +%*2hX:0X1:0:-1: +%2hX:0x1:0:-1: +%*2hX:0x1:0:-1: %2hX:2a:1:2:42: %*2hX:2a:0:2: %2hX:2A:1:2:42: %*2hX:2A:0:2: -# BZ12701 %2hX:0X2a:0:-1: -# BZ12701 %*2hX:0X2a:0:-1: -# BZ12701 %2hX:0x2A:0:-1: -# BZ12701 %*2hX:0x2A:0:-1: +%2hX:0X2a:0:-1: +%*2hX:0X2a:0:-1: +%2hX:0x2A:0:-1: +%*2hX:0x2A:0:-1: %2hX:ffff:1:2:255: %*2hX:ffff:0:2: %2hX:FFFF:1:2:255: %*2hX:FFFF:0:2: -# BZ12701 %2hX:0Xffff:0:-1: -# BZ12701 %*2hX:0Xffff:0:-1: -# BZ12701 %2hX:0xFFFF:0:-1: -# BZ12701 %*2hX:0xFFFF:0:-1: +%2hX:0Xffff:0:-1: +%*2hX:0Xffff:0:-1: +%2hX:0xFFFF:0:-1: +%*2hX:0xFFFF:0:-1: %2hX:10000:1:2:16: %*2hX:10000:0:2: -# BZ12701 %2hX:0X10000:0:-1: -# BZ12701 %*2hX:0X10000:0:-1: -# BZ12701 %2hX:0x10000:0:-1: -# BZ12701 %*2hX:0x10000:0:-1: +%2hX:0X10000:0:-1: +%*2hX:0X10000:0:-1: +%2hX:0x10000:0:-1: +%*2hX:0x10000:0:-1: %2hX:10029:1:2:16: %*2hX:10029:0:2: -# BZ12701 %2hX:0X10029:0:-1: -# BZ12701 %*2hX:0X10029:0:-1: -# BZ12701 %2hX:0x10029:0:-1: -# BZ12701 %*2hX:0x10029:0:-1: +%2hX:0X10029:0:-1: +%*2hX:0X10029:0:-1: +%2hX:0x10029:0:-1: +%*2hX:0x10029:0:-1: %2hX:+0:1:2:0: %*2hX:+0:0:2: %2hX:+0X0:1:2:0: @@ -532,44 +532,44 @@ %*2hX: -0x0:0:3: %2hX: 0:1:2:0: %*2hX: 0:0:2: -# BZ12701 %2hX: 0X0:0:-1: -# BZ12701 %*2hX: 0X0:0:-1: -# BZ12701 %2hX: 0x0:0:-1: -# BZ12701 %*2hX: 0x0:0:-1: +%2hX: 0X0:0:-1: +%*2hX: 0X0:0:-1: +%2hX: 0x0:0:-1: +%*2hX: 0x0:0:-1: %2hX: 1:1:2:1: %*2hX: 1:0:2: -# BZ12701 %2hX: 0X1:0:-1: -# BZ12701 %*2hX: 0X1:0:-1: -# BZ12701 %2hX: 0x1:0:-1: -# BZ12701 %*2hX: 0x1:0:-1: +%2hX: 0X1:0:-1: +%*2hX: 0X1:0:-1: +%2hX: 0x1:0:-1: +%*2hX: 0x1:0:-1: %2hX: 2a:1:3:42: %*2hX: 2a:0:3: %2hX: 2A:1:3:42: %*2hX: 2A:0:3: -# BZ12701 %2hX: 0X2a:0:-1: -# BZ12701 %*2hX: 0X2a:0:-1: -# BZ12701 %2hX: 0x2A:0:-1: -# BZ12701 %*2hX: 0x2A:0:-1: +%2hX: 0X2a:0:-1: +%*2hX: 0X2a:0:-1: +%2hX: 0x2A:0:-1: +%*2hX: 0x2A:0:-1: %2hX: ffff:1:3:255: %*2hX: ffff:0:3: %2hX: FFFF:1:3:255: %*2hX: FFFF:0:3: -# BZ12701 %2hX: 0Xffff:0:-1: -# BZ12701 %*2hX: 0Xffff:0:-1: -# BZ12701 %2hX: 0xFFFF:0:-1: -# BZ12701 %*2hX: 0xFFFF:0:-1: +%2hX: 0Xffff:0:-1: +%*2hX: 0Xffff:0:-1: +%2hX: 0xFFFF:0:-1: +%*2hX: 0xFFFF:0:-1: %2hX: 10000:1:3:16: %*2hX: 10000:0:3: -# BZ12701 %2hX: 0X10000:0:-1: -# BZ12701 %*2hX: 0X10000:0:-1: -# BZ12701 %2hX: 0x10000:0:-1: -# BZ12701 %*2hX: 0x10000:0:-1: +%2hX: 0X10000:0:-1: +%*2hX: 0X10000:0:-1: +%2hX: 0x10000:0:-1: +%*2hX: 0x10000:0:-1: %2hX: 10029:1:3:16: %*2hX: 10029:0:3: -# BZ12701 %2hX: 0X10029:0:-1: -# BZ12701 %*2hX: 0X10029:0:-1: -# BZ12701 %2hX: 0x10029:0:-1: -# BZ12701 %*2hX: 0x10029:0:-1: +%2hX: 0X10029:0:-1: +%*2hX: 0X10029:0:-1: +%2hX: 0x10029:0:-1: +%*2hX: 0x10029:0:-1: %2hX: +0:1:3:0: %*2hX: +0:0:3: %2hX: +0X0:1:3:0: diff --git a/stdio-common/tst-scanf-format-v-c.c b/stdio-common/tst-scanf-format-v-c.c new file mode 100644 index 0000000..0e2c000 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for the character conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" diff --git a/stdio-common/tst-scanf-format-v-char.c b/stdio-common/tst-scanf-format-v-char.c new file mode 100644 index 0000000..be3a56c --- /dev/null +++ b/stdio-common/tst-scanf-format-v-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for signed char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" diff --git a/stdio-common/tst-scanf-format-v-double.c b/stdio-common/tst-scanf-format-v-double.c new file mode 100644 index 0000000..9188631 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" diff --git a/stdio-common/tst-scanf-format-v-float.c b/stdio-common/tst-scanf-format-v-float.c new file mode 100644 index 0000000..5d289d3 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for float conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" diff --git a/stdio-common/tst-scanf-format-v-int.c b/stdio-common/tst-scanf-format-v-int.c new file mode 100644 index 0000000..770a686 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" diff --git a/stdio-common/tst-scanf-format-v-ldouble.c b/stdio-common/tst-scanf-format-v-ldouble.c new file mode 100644 index 0000000..8215ea7 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for long double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" diff --git a/stdio-common/tst-scanf-format-v-llong.c b/stdio-common/tst-scanf-format-v-llong.c new file mode 100644 index 0000000..2a1ef02 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for long long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" diff --git a/stdio-common/tst-scanf-format-v-long.c b/stdio-common/tst-scanf-format-v-long.c new file mode 100644 index 0000000..8376032 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" diff --git a/stdio-common/tst-scanf-format-v-short.c b/stdio-common/tst-scanf-format-v-short.c new file mode 100644 index 0000000..23b9c56 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" diff --git a/stdio-common/tst-scanf-format-v-uchar.c b/stdio-common/tst-scanf-format-v-uchar.c new file mode 100644 index 0000000..861db22 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" diff --git a/stdio-common/tst-scanf-format-v-uint.c b/stdio-common/tst-scanf-format-v-uint.c new file mode 100644 index 0000000..30e58c5 --- /dev/null +++ b/stdio-common/tst-scanf-format-v-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" diff --git a/stdio-common/tst-scanf-format-v-ullong.c b/stdio-common/tst-scanf-format-v-ullong.c new file mode 100644 index 0000000..ee2914d --- /dev/null +++ b/stdio-common/tst-scanf-format-v-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned long long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" diff --git a/stdio-common/tst-scanf-format-v-ulong.c b/stdio-common/tst-scanf-format-v-ulong.c new file mode 100644 index 0000000..f7864dd --- /dev/null +++ b/stdio-common/tst-scanf-format-v-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" diff --git a/stdio-common/tst-scanf-format-v-ushort.c b/stdio-common/tst-scanf-format-v-ushort.c new file mode 100644 index 0000000..79ca16b --- /dev/null +++ b/stdio-common/tst-scanf-format-v-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" diff --git a/stdio-common/tst-scanf-format-v.h b/stdio-common/tst-scanf-format-v.h new file mode 100644 index 0000000..bf19877 --- /dev/null +++ b/stdio-common/tst-scanf-format-v.h @@ -0,0 +1,36 @@ +/* Test feature wrapper for formatted 'vscanf' input. + Copyright (C) 2025 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/>. */ + +#include <stdarg.h> +#include <stdio.h> + +static int +scanf_under_test (const char *restrict fmt, ...) +{ + va_list ap; + int result; + + va_start (ap, fmt); + result = vscanf (fmt, ap); + va_end (ap); + if (ferror (stdin)) + result = INPUT_ERROR; + else if (result == EOF) + result = INPUT_EOF; + return result; +} diff --git a/stdio-common/tst-scanf-format-vf-c.c b/stdio-common/tst-scanf-format-vf-c.c new file mode 100644 index 0000000..307bfe8 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for the character conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" diff --git a/stdio-common/tst-scanf-format-vf-char.c b/stdio-common/tst-scanf-format-vf-char.c new file mode 100644 index 0000000..602899b --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for signed char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" diff --git a/stdio-common/tst-scanf-format-vf-double.c b/stdio-common/tst-scanf-format-vf-double.c new file mode 100644 index 0000000..8b58bbe --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" diff --git a/stdio-common/tst-scanf-format-vf-float.c b/stdio-common/tst-scanf-format-vf-float.c new file mode 100644 index 0000000..81dad06 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for float conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" diff --git a/stdio-common/tst-scanf-format-vf-int.c b/stdio-common/tst-scanf-format-vf-int.c new file mode 100644 index 0000000..8038791 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" diff --git a/stdio-common/tst-scanf-format-vf-ldouble.c b/stdio-common/tst-scanf-format-vf-ldouble.c new file mode 100644 index 0000000..ec9a7c4 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for long double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" diff --git a/stdio-common/tst-scanf-format-vf-llong.c b/stdio-common/tst-scanf-format-vf-llong.c new file mode 100644 index 0000000..adc4b12 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for long long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" diff --git a/stdio-common/tst-scanf-format-vf-long.c b/stdio-common/tst-scanf-format-vf-long.c new file mode 100644 index 0000000..5f26d6c --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" diff --git a/stdio-common/tst-scanf-format-vf-short.c b/stdio-common/tst-scanf-format-vf-short.c new file mode 100644 index 0000000..0e081ea --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" diff --git a/stdio-common/tst-scanf-format-vf-uchar.c b/stdio-common/tst-scanf-format-vf-uchar.c new file mode 100644 index 0000000..2e879f5 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for unsigned char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" diff --git a/stdio-common/tst-scanf-format-vf-uint.c b/stdio-common/tst-scanf-format-vf-uint.c new file mode 100644 index 0000000..4874f86 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for unsigned int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" diff --git a/stdio-common/tst-scanf-format-vf-ullong.c b/stdio-common/tst-scanf-format-vf-ullong.c new file mode 100644 index 0000000..dde0901 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for unsigned long long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" diff --git a/stdio-common/tst-scanf-format-vf-ulong.c b/stdio-common/tst-scanf-format-vf-ulong.c new file mode 100644 index 0000000..8102306 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for unsigned long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" diff --git a/stdio-common/tst-scanf-format-vf-ushort.c b/stdio-common/tst-scanf-format-vf-ushort.c new file mode 100644 index 0000000..cb8eb4b --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vfscanf' input for unsigned short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vf.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" diff --git a/stdio-common/tst-scanf-format-vf.h b/stdio-common/tst-scanf-format-vf.h new file mode 100644 index 0000000..6037e63 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf.h @@ -0,0 +1,36 @@ +/* Test feature wrapper for formatted 'vfscanf' input. + Copyright (C) 2025 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/>. */ + +#include <stdarg.h> +#include <stdio.h> + +static int +scanf_under_test (const char *restrict fmt, ...) +{ + va_list ap; + int result; + + va_start (ap, fmt); + result = vfscanf (stdin, fmt, ap); + va_end (ap); + if (ferror (stdin)) + result = INPUT_ERROR; + else if (result == EOF) + result = INPUT_EOF; + return result; +} diff --git a/stdio-common/tst-scanf-format-vs-c.c b/stdio-common/tst-scanf-format-vs-c.c new file mode 100644 index 0000000..2df5aa7 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for the character conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" diff --git a/stdio-common/tst-scanf-format-vs-char.c b/stdio-common/tst-scanf-format-vs-char.c new file mode 100644 index 0000000..ae4d8e0 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for signed char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" diff --git a/stdio-common/tst-scanf-format-vs-double.c b/stdio-common/tst-scanf-format-vs-double.c new file mode 100644 index 0000000..cd459a8 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" diff --git a/stdio-common/tst-scanf-format-vs-float.c b/stdio-common/tst-scanf-format-vs-float.c new file mode 100644 index 0000000..7872afe --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for float conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" diff --git a/stdio-common/tst-scanf-format-vs-int.c b/stdio-common/tst-scanf-format-vs-int.c new file mode 100644 index 0000000..e67b4be --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" diff --git a/stdio-common/tst-scanf-format-vs-ldouble.c b/stdio-common/tst-scanf-format-vs-ldouble.c new file mode 100644 index 0000000..4d299c2 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for long double conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" diff --git a/stdio-common/tst-scanf-format-vs-llong.c b/stdio-common/tst-scanf-format-vs-llong.c new file mode 100644 index 0000000..06c8cc9 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for long long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" diff --git a/stdio-common/tst-scanf-format-vs-long.c b/stdio-common/tst-scanf-format-vs-long.c new file mode 100644 index 0000000..575a6cb --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for long conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" diff --git a/stdio-common/tst-scanf-format-vs-short.c b/stdio-common/tst-scanf-format-vs-short.c new file mode 100644 index 0000000..5473471 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" diff --git a/stdio-common/tst-scanf-format-vs-uchar.c b/stdio-common/tst-scanf-format-vs-uchar.c new file mode 100644 index 0000000..5a29b9b --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for unsigned char conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" diff --git a/stdio-common/tst-scanf-format-vs-uint.c b/stdio-common/tst-scanf-format-vs-uint.c new file mode 100644 index 0000000..b9486b1 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for unsigned int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" diff --git a/stdio-common/tst-scanf-format-vs-ullong.c b/stdio-common/tst-scanf-format-vs-ullong.c new file mode 100644 index 0000000..5396a78 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for unsigned long long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" diff --git a/stdio-common/tst-scanf-format-vs-ulong.c b/stdio-common/tst-scanf-format-vs-ulong.c new file mode 100644 index 0000000..3dbc142 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for unsigned long int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" diff --git a/stdio-common/tst-scanf-format-vs-ushort.c b/stdio-common/tst-scanf-format-vs-ushort.c new file mode 100644 index 0000000..0f28b36 --- /dev/null +++ b/stdio-common/tst-scanf-format-vs-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vsscanf' input for unsigned short int conversions. + Copyright (C) 2025 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/>. */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-vs.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" diff --git a/stdio-common/tst-scanf-format-vs.h b/stdio-common/tst-scanf-format-vs.h new file mode 100644 index 0000000..d49690d --- /dev/null +++ b/stdio-common/tst-scanf-format-vs.h @@ -0,0 +1,77 @@ +/* Test feature wrapper for formatted 'vsscanf' input. + Copyright (C) 2025 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/>. */ + +#include <stdarg.h> +#include <stddef.h> +#include <stdio.h> +#include <stdlib.h> + +#include <support/support.h> + +static char *sscanf_buf; +static size_t sscanf_buf_size; + +static void __attribute__ ((destructor)) +scanf_under_test_fini (void) +{ + free (sscanf_buf); +} + +static int +scanf_under_test (const char *restrict fmt, ...) +{ + size_t i = 0; + va_list ap; + int result; + int ch; + + do + { + ch = read_input (); + if (ch < 0) + { + result = ch; + goto out; + } + if (i == sscanf_buf_size) + { + sscanf_buf_size += SIZE_CHUNK; + /* Add an extra byte for the terminating null character. */ + sscanf_buf = xrealloc (sscanf_buf, sscanf_buf_size + 1); + } + sscanf_buf[i++] = ch; + } + while (ch != ':'); + sscanf_buf[i++] = '\0'; + + ch = ungetc (ch, stdin); + if (ch == EOF) + { + result = INPUT_ERROR; + goto out; + } + + va_start (ap, fmt); + result = vsscanf (sscanf_buf, fmt, ap); + va_end (ap); + if (result == EOF) + result = INPUT_EOF; + +out: + return result; +} diff --git a/stdio-common/tst-setvbuf2-ind.c b/stdio-common/tst-setvbuf2-ind.c new file mode 100644 index 0000000..fda2942 --- /dev/null +++ b/stdio-common/tst-setvbuf2-ind.c @@ -0,0 +1,2 @@ +#define INDEPENDENT_PART 1 +#include "tst-setvbuf2.c" diff --git a/stdio-common/tst-setvbuf2.c b/stdio-common/tst-setvbuf2.c new file mode 100644 index 0000000..6cc8335 --- /dev/null +++ b/stdio-common/tst-setvbuf2.c @@ -0,0 +1,1030 @@ +/* Test setvbuf under various conditions. + Copyright (C) 2025 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/>. */ + +/* This file is used twice, once as the test itself (where do_test + is defined) and once as a subprocess we spawn to test stdin et all + (where main is defined). INDEPENDENT_PART is defined for the + latter. + + Note also that the purpose of this test is to test setvbuf, not the + underlying buffering code. */ + +#include <stdbool.h> +#include <stdio.h> +#include <stdio_ext.h> +#include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> +#include <string.h> +#include <errno.h> +#include <signal.h> +#include <libio.h> +#include <termios.h> + +#include <support/support.h> +#include <support/check.h> +#include <support/temp_file.h> +#include <support/xstdio.h> +#include <support/xunistd.h> +#include <support/xthread.h> +#include <support/tty.h> + +/* Dear future developer: If you are reading this, you are likely + trying to change or understand this test. In that case, these + debug/dump macros will be helpful. */ +#if 0 +# define debug printf ("\033[3%dm%s:%d\033[0m\n", \ + (__LINE__ % 6) + 1, __FUNCTION__, __LINE__); + +static void +dumpfp (FILE *fp) +{ + char f[10], *p=f; + + if (fp->_flags & _IO_UNBUFFERED) + *p++ = 'N'; + if (fp->_flags & _IO_LINE_BUF) + *p++ = 'L'; + if (p == f) + *p++ = 'B'; + *p = 0; + + printf ("FILE %p flags %s" + " read %p \033[%dm%+ld \033[%dm%+ld\033[0m" + " write %p \033[%dm%+ld \033[%dm%+ld\033[0m %ld" + " buf %p \033[%dm%+ld\033[0m sz %ld pend %ld\n", + fp, f, + + fp->_IO_read_base, + fp->_IO_read_ptr == fp->_IO_read_base ? 33 : 32, + fp->_IO_read_ptr - fp->_IO_read_base, + fp->_IO_read_end == fp->_IO_read_base ? 33 : 36, + fp->_IO_read_end - fp->_IO_read_base, + + fp->_IO_write_base, + fp->_IO_write_ptr == fp->_IO_write_base ? 33 : 32, + fp->_IO_write_ptr - fp->_IO_write_base, + fp->_IO_write_end == fp->_IO_write_base ? 33 : 36, + fp->_IO_write_end - fp->_IO_write_base, + fp->_IO_write_end - fp->_IO_write_base, + + fp->_IO_buf_base, + fp->_IO_buf_end == fp->_IO_buf_base ? 33 : 35, + fp->_IO_buf_end - fp->_IO_buf_base, + __fbufsize (fp), __fpending (fp) + ); +} +#else +# define debug +# define dumpfp(FP) +#endif + +#ifndef INDEPENDENT_PART +/* st_blksize value for that file, or BUFSIZ if out of range. */ +static int blksize = BUFSIZ; +#endif + +/* Our test buffer. */ +#define TEST_BUFSIZE 42 +static int bufsize = TEST_BUFSIZE < BUFSIZ ? TEST_BUFSIZE : BUFSIZ; +static char *buffer; + +/* Test data, both written to that file and used as an in-memory + stream. */ +char test_data[2 * BUFSIZ]; + +#define TEST_STRING "abcdef\n" + +enum test_source_case + { + test_source_file, + test_source_pipe, + test_source_fifo, + test_source_pseudo_terminal, + test_source_dev_null, + test_source_count, + }; + +static const char *const test_source_name[test_source_count] = + { + "regular file", + "pipe", + "fifo", + "pseudo_terminal", + "dev_null" + }; + +enum test_stream_case + { + test_stream_stdin, + test_stream_stdout, + test_stream_stderr, + test_stream_fopen_r, + test_stream_fdopen_r, + test_stream_fopen_w, + test_stream_fdopen_w, + test_stream_count + }; + +static bool test_stream_reads[test_stream_count] = + { + true, + false, + false, + true, + true, + false, + false + }; + +static const char *const test_stream_name[test_stream_count] = + { + "stdin", + "stdout", + "stderr", + "fopen (read)", + "fdopen (read)", + "fopen (write)", + "fdopen (write)" + }; + +enum test_config_case + { + test_config_none, + test_config_unbuffered, + test_config_line, + test_config_fully, + test_config_count + }; + +static const char *const test_config_name[test_config_count] = + { + "no change", + "unbuffered", + "line buffered", + "fully buffered" + }; + +FILE *test_stream; + +char *test_file_name = NULL; +int pty_fd; +char *test_pipe_name = NULL; +int test_pipe[2]; + +/* This is either -1 or represents a pre-opened file descriptor for + the test as returned by prepare_test_file. */ +int test_fd; + +/*------------------------------------------------------------*/ + +/* Note that throughout this test we reopen, remove, and change + to/from a fifo, the test file. This would normally cause a race + condition, except that we're in a test container. No other process + can run in the test container simultaneously. */ + +void +prepare_test_data (void) +{ + buffer = (char *) xmalloc (bufsize); + +#ifndef INDEPENDENT_PART + /* Both file and pipe need this. */ + if (test_file_name == NULL) + { + debug; + int fd = create_temp_file ("tst-setvbuf2", &test_file_name); + TEST_VERIFY_EXIT (fd != -1); + struct stat64 st; + xfstat64 (fd, &st); + if (st.st_blksize > 0 && st.st_blksize < BUFSIZ) + blksize = st.st_blksize; + xclose (fd); + } +#endif + + for (size_t i = 0; i < 2 * BUFSIZ; i++) + { + unsigned char c = TEST_STRING[i % strlen (TEST_STRING)]; + test_data[i] = c; + } +} + +#ifndef INDEPENDENT_PART + +/* These functions provide a source/sink for the "other" side of any + pipe-style descriptor we're using for test. */ + +static pthread_t writer_thread_tid = 0; +static pthread_t reader_thread_tid = 0; + +typedef struct { + int fd; + const char *fname; +} ThreadData; +/* It's OK if this is static, we only run one at a time. */ +ThreadData thread_data; + +static void * +writer_thread_proc (void *closure) +{ + ThreadData *td = (ThreadData *) closure; + int fd; + int i; + ssize_t wn; + debug; + + if (td->fname) + td->fd = xopen (td->fname, O_WRONLY, 0777); + fd = td->fd; + + while (1) + { + i = 0; + while (i < BUFSIZ) + { + wn = write (fd, test_data + i, BUFSIZ - i); + if (wn <= 0) + break; + i += wn; + } + } + return NULL; +} + +static void * +reader_thread_proc (void *closure) +{ + ThreadData *td = (ThreadData *) closure; + int fd; + ssize_t rn; + int n = 0; + debug; + + if (td->fname) + td->fd = xopen (td->fname, O_RDONLY, 0777); + fd = td->fd; + + while (1) + { + char buf[BUFSIZ]; + rn = read (fd, buf, BUFSIZ); + if (rn <= 0) + break; + TEST_COMPARE_BLOB (buf, rn, test_data+n, rn); + n += rn; + } + return NULL; +} + +static void +start_writer_thread (int fd) +{ + debug; + thread_data.fd = fd; + thread_data.fname = NULL; + writer_thread_tid = xpthread_create (NULL, writer_thread_proc, + (void *)&thread_data); +} + +static void +start_writer_thread_n (const char *fname) +{ + debug; + thread_data.fd = 0; + thread_data.fname = fname; + writer_thread_tid = xpthread_create (NULL, writer_thread_proc, + (void *)&thread_data); +} + +static void +end_writer_thread (void) +{ + debug; + if (writer_thread_tid) + { + pthread_cancel (writer_thread_tid); + xpthread_join (writer_thread_tid); + xclose (thread_data.fd); + writer_thread_tid = 0; + } +} + +static void +start_reader_thread (int fd) +{ + debug; + thread_data.fd = fd; + thread_data.fname = NULL; + reader_thread_tid = xpthread_create (NULL, reader_thread_proc, + (void *)&thread_data); +} + +static void +start_reader_thread_n (const char *fname) +{ + debug; + thread_data.fd = 0; + thread_data.fname = fname; + reader_thread_tid = xpthread_create (NULL, reader_thread_proc, + (void *)&thread_data); +} + +static void +end_reader_thread (void) +{ + debug; + if (reader_thread_tid) + { + pthread_cancel (reader_thread_tid); + xpthread_join (reader_thread_tid); + xclose (thread_data.fd); + reader_thread_tid = 0; + } +} + +/*------------------------------------------------------------*/ + +/* These two functions are reponsible for choosing a file to be tested + against, typically by returning a filename but in a few cases also + providing a file descriptor (i.e. for fdopen). */ + +static const char * +prepare_test_file (enum test_source_case f, enum test_stream_case s) +{ + debug; + + test_fd = -1; + + switch (f) + { + case test_source_file: + { + if (test_stream_reads[f]) + { + debug; + FILE *fp = xfopen (test_file_name, "w"); + TEST_VERIFY_EXIT (fwrite (test_data, 1, 2 * BUFSIZ, fp) + == 2 * BUFSIZ); + xfclose (fp); + } + debug; + return test_file_name; + } + + case test_source_pipe: + { + debug; + xpipe (test_pipe); + if (test_stream_reads[s]) + { + start_writer_thread (test_pipe[1]); + test_fd = test_pipe[0]; + } + else + { + start_reader_thread (test_pipe[0]); + test_fd = test_pipe[1]; + } + test_pipe_name = xasprintf ("/proc/self/fd/%d", test_fd); + debug; + return test_pipe_name; + } + + case test_source_fifo: + { + /* We do not want to fail/exit if the file doesn't exist. */ + unlink (test_file_name); + xmkfifo (test_file_name, 0600); + debug; + if (test_stream_reads[s]) + start_writer_thread_n (test_file_name); + else + start_reader_thread_n (test_file_name); + debug; + return test_file_name; + } + + case test_source_pseudo_terminal: + { + support_openpty (&pty_fd, &test_fd, &test_pipe_name, NULL, NULL); + + debug; + if (test_stream_reads[s]) + start_writer_thread (pty_fd); + else + start_reader_thread (pty_fd); + + debug; + return test_pipe_name; + } + + case test_source_dev_null: + debug; + return "/dev/null"; + + default: + abort (); + } +} + +static void +unprepare_test_file (FILE *fp, + enum test_source_case f, + enum test_stream_case s) +{ + debug; + switch (f) + { + case test_source_file: + break; + + case test_source_pipe: + free (test_pipe_name); + if (test_stream_reads[s]) + end_writer_thread (); + else + end_reader_thread (); + break; + + case test_source_fifo: + if (test_stream_reads[s]) + end_writer_thread (); + else + end_reader_thread (); + unlink (test_file_name); + break; + + case test_source_pseudo_terminal: + free (test_pipe_name); + if (test_stream_reads[s]) + end_writer_thread (); + else + end_reader_thread (); + break; + + case test_source_dev_null: + break; + + default: + abort (); + } + debug; +} + +/*------------------------------------------------------------*/ + +/* This function takes a filename and returns a file descriptor, + opened according to the method requested. */ + +static FILE * +open_test_stream (enum test_source_case f, enum test_stream_case s) +{ + int fd; + FILE *fp; + const char *fname; + + debug; + fname = prepare_test_file (f, s); + if (fname == NULL) + return NULL; + + switch (s) + { + case test_stream_stdin: + fp = xfopen (fname, "r"); + break; + + case test_stream_stdout: + fp = xfopen (fname, "w"); + break; + + case test_stream_stderr: + fp = xfopen (fname, "w"); + break; + + case test_stream_fopen_r: + fp = xfopen (fname, "r"); + break; + + case test_stream_fdopen_r: + if (test_fd == -1) + fd = xopen (fname, O_RDONLY, 0); + else + fd = test_fd; + fp = fdopen (fd, "r"); + break; + + case test_stream_fopen_w: + fp = xfopen (fname, "w"); + break; + + case test_stream_fdopen_w: + fd = xopen (fname, O_WRONLY|O_CREAT|O_TRUNC, 0777); + fp = fdopen (fd, "w"); + break; + + default: + abort (); + } + TEST_VERIFY_EXIT (fp != NULL); + + if (f == test_source_pseudo_terminal) + { + struct termios t; + /* We disable the NL to CR-LF conversion so that we can compare + data without having to remove the extra CRs. */ + if (tcgetattr (fileno (fp), &t) < 0) + FAIL_EXIT1 ("tcgetattr failed: %m"); + t.c_oflag &= ~ONLCR; + if (tcsetattr (fileno (fp), TCSANOW, &t) < 0) + FAIL_EXIT1 ("tcsetattr failed: %m"); + } + + debug; + printf ("source %s stream %s file %s fd %d\n", + test_source_name[f], + test_stream_name[s], fname, fileno (fp)); + return fp; +} + +#endif + +/*------------------------------------------------------------*/ + +/* These functions do the actual testing - setting various buffering + options and verifying that they buffer as expected. */ + +static void +test_put_string (FILE *fp, const char *s, int count) +{ + while (*s && count--) + { + fputc (*s++, fp); + TEST_VERIFY_EXIT (!ferror (fp)); + } +} + +int +verify_fully_buffered (FILE *fp, + enum test_source_case f, + enum test_stream_case s, + enum test_config_case c) +{ + debug; + if (test_stream_reads[s]) + { + char buf[10]; + dumpfp (fp); + size_t fc = fread (buf, 1, 10 - 1, fp); + dumpfp (fp); + + ssize_t count = fp->_IO_read_ptr - fp->_IO_read_base; + + TEST_VERIFY (fp->_IO_read_base != NULL); + if (f == test_source_dev_null) + { + TEST_VERIFY (fc == 0); + TEST_VERIFY (count == 0); + } + else if (f == test_source_pseudo_terminal) + { + TEST_VERIFY (fc == 9); + TEST_VERIFY (count == 3 || count == 10); + } + else + { + TEST_VERIFY (fc == 9); + TEST_VERIFY (count == 10); + } + + /* We already checked for the first character being 'a'. */ + if (count > 1) + { + TEST_COMPARE_BLOB (buf, count - 1, test_data + 1, count - 1); + TEST_COMPARE_BLOB (fp->_IO_read_base, count, test_data, count); + } + } + else + { + dumpfp (fp); + test_put_string (fp, test_data + 1, 10 - 1); + dumpfp (fp); + TEST_COMPARE (fp->_IO_write_ptr - fp->_IO_write_base, 10); + TEST_COMPARE_BLOB (fp->_IO_write_base, 10, test_data, 10); + } + + TEST_COMPARE ((fp->_flags & (_IO_UNBUFFERED | _IO_LINE_BUF)), 0); + if (c != test_config_none) + TEST_COMPARE (__fbufsize (fp), bufsize); + return 0; +} + +int +verify_line_buffered (FILE *fp, + enum test_source_case f, + enum test_stream_case s, + enum test_config_case c) +{ + debug; + /* "line buffered" for inputs is not really defined; what you really + want here is to control the device providing input. For GLIBC a + line-buffered input is treated as fully buffered. */ + if (test_stream_reads[s]) + { + char buf[10]; + dumpfp (fp); + size_t fc = fread (buf, 1, 10 - 1, fp); + dumpfp (fp); + + ssize_t count = fp->_IO_read_ptr - fp->_IO_read_base; + + TEST_VERIFY (fp->_IO_read_base != NULL); + if (f == test_source_dev_null) + { + TEST_VERIFY (fc == 0); + TEST_VERIFY (count == 0); + } + else if (f == test_source_pseudo_terminal) + { + TEST_VERIFY (fc == 9); + TEST_VERIFY (count == 3 || count == 10); + } + else + { + TEST_VERIFY (fc == 9); + TEST_VERIFY (count == 10); + } + + /* We already checked for the first character being 'a'. */ + if (count > 1) + { + TEST_COMPARE_BLOB (buf, count - 1, test_data + 1, count - 1); + TEST_COMPARE_BLOB (fp->_IO_read_base, count, test_data, count); + } + } + else + { + dumpfp (fp); + test_put_string (fp, test_data + 1, 10 - 1); + dumpfp (fp); + TEST_COMPARE (fp->_IO_write_ptr - fp->_IO_write_base, 3); + /* The first "abcdef\n" got flushed, leaving "abc". */ + TEST_COMPARE_BLOB (fp->_IO_write_base, 3, test_data + 7, 3); + } + + TEST_COMPARE ((fp->_flags & (_IO_UNBUFFERED | _IO_LINE_BUF)), _IO_LINE_BUF); + if (c != test_config_none) + TEST_COMPARE (__fbufsize (fp), bufsize); + return 0; +} + +int +verify_unbuffered (FILE *fp, + enum test_source_case f, + enum test_stream_case s, + enum test_config_case c) +{ + debug; + if (test_stream_reads[s]) + { + /* We've already read one byte. */ + dumpfp (fp); + TEST_VERIFY (fp->_IO_read_base != NULL); + if (f == test_source_dev_null) + TEST_COMPARE (fp->_IO_read_ptr - fp->_IO_read_base, 0); + else + { + TEST_COMPARE (fp->_IO_read_ptr - fp->_IO_read_base, 1); + TEST_COMPARE (fp->_IO_read_base[0], test_data[0]); + TEST_VERIFY (fp->_IO_read_ptr == fp->_IO_read_end); + } + } + else + { + dumpfp (fp); + fputc (test_data[1], fp); + dumpfp (fp); + TEST_COMPARE (fp->_IO_write_ptr - fp->_IO_write_base, 0); + TEST_COMPARE (fp->_IO_write_base[0], test_data[1]); + TEST_VERIFY (fp->_IO_write_end == fp->_IO_write_base); + } + TEST_COMPARE ((fp->_flags & (_IO_UNBUFFERED | _IO_LINE_BUF)), + _IO_UNBUFFERED); + TEST_COMPARE (__fbufsize (fp), 1); + return 0; +} + +static int +do_setvbuf (FILE *fp, void *buf, int flags, int size, + enum test_stream_case s) +{ + if (s != test_stream_stdout) + printf ("SETVBUF %p %p %s %d\n", + fp, buf, + flags == _IONBF ? "_IONBF" + : flags == _IOLBF ? "_IOLBF" + : flags == _IOFBF ? "_IOFBF" + : "???", size); + if (setvbuf (fp, buf, flags, size)) + { + perror ("setvbuf"); + return 1; + } + return 0; +} + +int +do_second_part (FILE *fp, + enum test_source_case f, + enum test_stream_case s, + enum test_config_case c) +{ + /* At this point, FP is the stream to test according to the other + parameters. */ + + int rv = 0; + int flags_before; + int flags_after; + + debug; + + flags_before = fp->_flags & (_IO_UNBUFFERED | _IO_LINE_BUF); + + /* This is where we do the thing we're testing for. */ + switch (c) + { + case test_config_none: + /* Buffering is unchanged. */ + break; + + case test_config_unbuffered: + do_setvbuf (fp, NULL, _IONBF, 0, s); + break; + + case test_config_line: + do_setvbuf (fp, buffer, _IOLBF, bufsize, s); + break; + + case test_config_fully: + do_setvbuf (fp, buffer, _IOFBF, bufsize, s); + break; + + default: + abort (); + } + + flags_after = fp->_flags & (_IO_UNBUFFERED | _IO_LINE_BUF); + + /* Check the buffer mode after we touch it, if we touched it. */ + switch (c) + { + case test_config_none: + /* Buffering is unchanged, but may change on the first read/write. */ + TEST_COMPARE (flags_after, flags_before); + break; + + case test_config_unbuffered: + TEST_COMPARE (flags_after, _IO_UNBUFFERED); + break; + + case test_config_line: + TEST_COMPARE (flags_after, _IO_LINE_BUF); + break; + + case test_config_fully: + TEST_COMPARE (flags_after, 0); + break; + + default: + abort (); + } + + /* Glibc defers calculating the appropriate buffering mechanism + until it reads from or writes to the device. So we read one + character here, and account for that in the tests. */ + if (test_stream_reads[s]) + { + dumpfp (fp); + int c = fgetc (fp); + if (c != TEST_STRING[0] && f != test_source_dev_null) + FAIL ("first char read is %c not %c", c, TEST_STRING[0]); + dumpfp (fp); + } + else + { + dumpfp (fp); + fputc (TEST_STRING[0], fp); + dumpfp (fp); + } + + switch (fp->_flags & (_IO_UNBUFFERED | _IO_LINE_BUF)) + { + case _IO_LINE_BUF: + rv += verify_line_buffered (fp, f, s, c); + break; + + case _IO_UNBUFFERED: + rv += verify_unbuffered (fp, f, s, c); + break; + + case 0: /* Fully buffered. */ + rv += verify_fully_buffered (fp, f, s, c); + break; + + default: + abort (); + } + + + fclose (fp); + return rv; +} + +/*------------------------------------------------------------*/ + +#ifdef INDEPENDENT_PART +/* This part is the independent sub-process we call to test stdin et + al. */ + +int +main (int argc, char **argv) +{ + /* This is one of the subprocesses we created to test stdin et + al. */ + FILE *fp; + + /* If we're called as a regular test, instead of as a sub-process, + don't complain. */ + if (argc == 1) + return 0; + + if (argc != 4) + { + int i; + for (i = 0; i <= argc; i ++) + printf ("argv[%d] = `%s'\n", i, argv[i] ?: "(null)"); + FAIL_EXIT1 ("sub-process called wrong"); + } + + prepare_test_data (); + + enum test_source_case f = atoi (argv[1]); + enum test_stream_case s = atoi (argv[2]); + enum test_config_case c = atoi (argv[3]); + + if (s != test_stream_stdout) + printf ("\n\033[41mRunning test %s : %s : %s\033[0m\n", + test_source_name[f], + test_stream_name[s], + test_config_name[c]); + + switch (s) + { + case test_stream_stdin: + fp = stdin; + break; + case test_stream_stdout: + fp = stdout; + break; + case test_stream_stderr: + fp = stderr; + break; + default: + abort (); + } + + return do_second_part (fp, f, s, c); +} + +#else +/* This part is the standard test process. */ + +/* Spawn an independent sub-process with std* redirected. */ +int +recurse (FILE *fp, + enum test_source_case f, + enum test_stream_case s, + enum test_config_case c) +{ + /* We need to test stdin, stdout, or stderr, which means creating a + subprocess with one of those redirected from FP. */ + debug; + + pid_t pid; + int status; + + pid = fork (); + + switch (pid) + { + case -1: /* error */ + perror ("fork"); + return 1; + break; + + default: /* parent */ + fclose (fp); + xwaitpid (pid, &status, 0); + if (WIFEXITED (status) + && WEXITSTATUS (status) == 0) + return 0; + return 1; + + case 0: /* child */ + switch (s) + { + case test_stream_stdin: + xclose (0); + dup2 (fileno (fp), 0); + break; + case test_stream_stdout: + xclose (1); + dup2 (fileno (fp), 1); + break; + case test_stream_stderr: + xclose (2); + dup2 (fileno (fp), 2); + break; + default: + abort (); + } + fclose (fp); + + /* At this point, we have to run a program... which is tricky to + properly support for remote targets or crosses, because of + glibc versions etc. Hence we run in a test-container. */ + + char fs[10], ss[10], cs[10]; + sprintf (fs, "%d", f); + sprintf (ss, "%d", s); + sprintf (cs, "%d", c); + execl (IND_PROC, IND_PROC, fs, ss, cs, NULL); + if (s == test_stream_stdout) + fprintf (stderr, "execl (%s) failed, ", IND_PROC); + else + printf ("execl (%s) failed, ", IND_PROC); + perror ("The error was"); + exit (1); + break; + } + + return 0; +} + +int +do_test (void) +{ + int rv = 0; + + signal (SIGPIPE, SIG_IGN); + + prepare_test_data (); + + for (enum test_source_case f = 0; f < test_source_count; ++f) + for (enum test_stream_case s = 0; s < test_stream_count; ++s) + for (enum test_config_case c = 0; c < test_config_count; ++c) + { + printf ("\n\033[43mRunning test %s : %s : %s\033[0m\n", + test_source_name[f], + test_stream_name[s], + test_config_name[c]); + + FILE *fp = open_test_stream (f, s); + + if (fp) + { + + if (s <= test_stream_stderr) + rv += recurse (fp, f, s, c); + else + rv += do_second_part (fp, f, s, c); + + unprepare_test_file (fp, f, s); + } + } + + free (buffer); + + printf ("return %d\n", rv); + return rv; +} + +# include <support/test-driver.c> +#endif + diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c index bb3e55d..f70319d 100644 --- a/stdio-common/tstscanf.c +++ b/stdio-common/tstscanf.c @@ -151,7 +151,7 @@ main (int argc, char **argv) { 2, -12.8F, "degrees", "" }, { 0, 0.0F, "", "" }, { 3, 10.0F, "LBS", "fertilizer" }, - { 3, 100.0F, "rgs", "energy" }, + { 0, 0.0F, "", "" }, { -1, 0.0F, "", "" }}; size_t rounds = 0; float quant; diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c index 87f23b5..b965c7b 100644 --- a/stdio-common/vfscanf-internal.c +++ b/stdio-common/vfscanf-internal.c @@ -1463,22 +1463,24 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr, /* Look for a leading indication of base. */ if (width != 0 && c == L_('0')) { + WINT_T ctmp = c; + if (width > 0) --width; - - char_buffer_add (&charbuf, c); c = inchar (); - if (width != 0 && TOLOWER (c) == L_('x')) + if (width != 0 + && TOLOWER (c) == L_('x') + && (base == 0 || base == 16)) { - if (base == 0) - base = 16; - if (base == 16) - { - if (width > 0) - --width; - c = inchar (); - } + base = 16; + if (width > 0) + --width; + /* If we try to read a number in hexadecimal notation + and we have only the `0x' prefix, this is an error. */ + if (width == 0) + conv_error (); + c = inchar (); } else if (width != 0 && TOLOWER (c) == L_('b') @@ -1489,10 +1491,18 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr, base = 2; if (width > 0) --width; + /* If we try to read a number in binary notation and + we have only the `0b' prefix, this is an error. */ + if (width == 0) + conv_error (); c = inchar (); } - else if (base == 0) - base = 8; + else + { + if (base == 0) + base = 8; + char_buffer_add (&charbuf, ctmp); + } } if (base == 0) @@ -2145,8 +2155,13 @@ digits_extended_fail: c = inchar (); if (width > 0) --width; - if (width != 0 && TOLOWER (c) == L_('x')) + if (TOLOWER (c) == L_('x')) { + /* If we try to read a number in hexadecimal notation + and we have only the `0x' prefix, this is an error. */ + if (width == 0) + conv_error (); + /* It is a number in hexadecimal format. */ char_buffer_add (&charbuf, c); @@ -2189,6 +2204,7 @@ digits_extended_fail: { char_buffer_add (&charbuf, exp_char); got_e = got_dot = 1; + got_digit = 0; } else { @@ -2409,7 +2425,7 @@ digits_extended_fail: if (got_e && charbuf.current[-1] == exp_char && (c == L_('-') || c == L_('+'))) char_buffer_add (&charbuf, c); - else if (char_buffer_size (&charbuf) > got_sign && !got_e + else if (got_digit && !got_e && (CHAR_T) TOLOWER (c) == exp_char) { char_buffer_add (&charbuf, exp_char); @@ -2426,7 +2442,10 @@ digits_extended_fail: if (c == wcdigits[n]) { if (n < 10) - char_buffer_add (&charbuf, L_('0') + n); + { + char_buffer_add (&charbuf, L_('0') + n); + got_digit = 1; + } else if (n == 11 && !got_dot) { char_buffer_add (&charbuf, decimal); @@ -2461,7 +2480,10 @@ digits_extended_fail: width = avail; if (n < 10) - char_buffer_add (&charbuf, L_('0') + n); + { + char_buffer_add (&charbuf, L_('0') + n); + got_digit = 1; + } else if (n == 11 && !got_dot) { /* Add all the characters. */ @@ -2532,11 +2554,13 @@ digits_extended_fail: /* Have we read any character? If we try to read a number in hexadecimal notation and we have read only the `0x' - prefix this is an error. */ + prefix this is an error. Also it is an error where we + have read no digits after the exponent character. */ if (__glibc_unlikely (char_buffer_size (&charbuf) == got_sign || ((flags & HEXA_FLOAT) && (char_buffer_size (&charbuf) - == 2 + got_sign)))) + == 2 + got_sign))) + || (got_e && !got_digit)) conv_error (); scan_float: |