Skip to content

Handle trailing % in strftime #23045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Handle trailing % in strftime #23045

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5468973
Handle trailing % in strftime
hoodmane Dec 2, 2024
c1c3fc5
Add #ifdef, comment, and update libc readme
hoodmane Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/lib/libc/musl/src/time/strftime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const st
s[l] = 0;
return l;
}
if (*f != '%') {
if (*f != '%' || !f[1]) {
s[l++] = *f;
continue;
}
Expand Down
3 changes: 3 additions & 0 deletions test/other/test_strftime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,5 +307,8 @@ int main() {
size = strftime(s, sizeof(s), "%Ec", &tm);
TEST(!cmp(s, "Mon Dec 17 00:00:00 2018"), "strftime test #36a", s);

size = strftime(s, sizeof(s), "trailing %", &tm);
TEST((size == 10), "strftime test #37", s);
TEST(!cmp(s, "trailing %"), "strftime test #37", s);
return 0;
}