mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-03-15 05:16:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implement length modifiers for printf %n conv spec (#1278)

Browse source 
The C Standard specifies that, when a conversion specification specifies
a conversion specifier of n, the type of the passed pointer is specified
by the length modifier (if any), i.e. that e.g. the argument for %hhn is
of type signed char *, but Cosmopolitan currently does not handle this -
instead always simply assuming that the pointer always points to an int.

This patch implements, and tests, length modifiers with the n conversion
specifier, with the tests testing all of the available length modifiers.
This commit is contained in:
Gabriel Ravier 2024-09-07 04:34:24 +02:00 • committed by GitHub
parent d1157d471f
commit c66abd7260
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 108 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libc/stdio/fmt.c
View file

@ -1125,7 +1125,25 @@ int __fmt(void *fn, void *arg, const char *format, va_list va, int *wrote) {
}
break;
case 'n':
*va_arg(va, int *) = *wrote;
switch (signbit) {
case 7:
*va_arg(va, int8_t *) = *wrote;
break;
case 15:
*va_arg(va, int16_t *) = *wrote;
break;
case 31:
*va_arg(va, int32_t *) = *wrote;
break;
case 63:
*va_arg(va, int64_t *) = *wrote;
break;
case 127:
*va_arg(va, int128_t *) = *wrote;
break;
default:
npassert(false);
}
break;
case 'F':

94
test/libc/stdio/snprintf_test.c
View file

@ -43,27 +43,27 @@ TEST(snprintf, testInf) {
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");
memset(buf, 0, 4);
memset(buf, '\0', 4);
i = snprintf(buf, sizeof(buf), "%Lf", 1.0L / 0.0L);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");
memset(buf, 0, 4);
memset(buf, '\0', 4);
i = snprintf(buf, sizeof(buf), "%e", 1.0 / 0.0);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");
memset(buf, 0, 4);
memset(buf, '\0', 4);
i = snprintf(buf, sizeof(buf), "%Le", 1.0L / 0.0L);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");
memset(buf, 0, 4);
memset(buf, '\0', 4);
i = snprintf(buf, sizeof(buf), "%g", 1.0 / 0.0);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");
memset(buf, 0, 4);
memset(buf, '\0', 4);
i = snprintf(buf, sizeof(buf), "%Lg", 1.0L / 0.0L);
ASSERT_EQ(i, 3);
ASSERT_STREQ(buf, "inf");
@ -101,3 +101,87 @@ TEST(snprintf,
ASSERT_EQ(i, 10);
ASSERT_STREQ(buf, "00000000x1");
}
static void check_n_buffer_contents(char buf[350]) {
for (int i = 0; i < 284; ++i)
ASSERT_EQ(buf[i], ' ');
ASSERT_STREQ(&buf[284], "428463");
for (int i = 290; i < 350; ++i)
ASSERT_EQ(buf[i], '\0');
}
TEST(snprintf, testNConversionSpecifier) {
char buf[350] = {};
int n_res_int = -1;
int i = snprintf(buf, sizeof(buf), "%286d%d%n%d", 42, 84, &n_res_int, 63);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_int, 288);
memset(&buf, '\0', sizeof(buf));
long n_res_long = -1;
i = snprintf(buf, sizeof(buf), "%286ld%ld%ln%ld", 42L, 84L, &n_res_long, 63L);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_long, 288);
memset(&buf, '\0', sizeof(buf));
long long n_res_long_long = -1;
i = snprintf(buf, sizeof(buf), "%286lld%lld%lln%lld", 42LL, 84LL,
&n_res_long_long, 63LL);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_long_long, 288);
ASSERT_EQ(sizeof(short), 2);
ASSERT_EQ(sizeof(int), 4);
memset(&buf, '\0', sizeof(buf));
short n_res_short = -1;
i = snprintf(buf, sizeof(buf), "%286hd%hd%hn%hd", (42 | 0xFFFF0000),
(84 | 0xFFFF0000), &n_res_short, (63 | 0xFFFF0000));
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_short, 288);
ASSERT_EQ(sizeof(unsigned char), 1);
memset(&buf, '\0', sizeof(buf));
signed char n_res_char = -1;
i = snprintf(buf, sizeof(buf), "%286hhd%hhd%hhn%hhd", (42 | 0xFFFFFF00),
(84 | 0xFFFFFF00), &n_res_char, (63 | 0xFFFFFF00));
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_char, (signed char)288);
memset(&buf, '\0', sizeof(buf));
ssize_t n_res_size_t = -1;
i = snprintf(buf, sizeof(buf), "%286zd%zd%zn%zd", (ssize_t)42, (ssize_t)84,
&n_res_size_t, (ssize_t)63);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_size_t, 288);
memset(&buf, '\0', sizeof(buf));
intmax_t n_res_intmax_t = -1;
i = snprintf(buf, sizeof(buf), "%286jd%jd%jn%jd", (intmax_t)42, (intmax_t)84,
&n_res_intmax_t, (intmax_t)63);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_intmax_t, 288);
memset(&buf, '\0', sizeof(buf));
int128_t n_res_int128_t = -1;
i = snprintf(buf, sizeof(buf), "%286jjd%jjd%jjn%jjd", (int128_t)42,
(int128_t)84, &n_res_int128_t, (int128_t)63);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_int128_t, 288);
memset(&buf, '\0', sizeof(buf));
ptrdiff_t n_res_ptrdiff_t = -1;
i = snprintf(buf, sizeof(buf), "%286td%td%tn%td", (ptrdiff_t)42,
(ptrdiff_t)84, &n_res_ptrdiff_t, (ptrdiff_t)63);
ASSERT_EQ(i, 290);
check_n_buffer_contents(buf);
ASSERT_EQ(n_res_ptrdiff_t, 288);
}