github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-17 18:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[time] Handle %%Z/%%z correctly in strftime format substitution

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-30 21:45:34 -10:00
parent 38e3095e35
commit d0d8f2935d
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/time.cpp
+22 -8
View File
@@ -21,12 +21,17 @@ size_t ESPTime::strftime(char *buffer, size_t buffer_len, const char *format) {
// ::strftime uses libc's internal timezone state for %Z and %z, but we
// eliminated setenv("TZ")/tzset() on embedded platforms to save flash.
// Substitute %Z and %z with correct values from our parsed timezone.
// Quick scan: does format contain %Z or %z?
// Quick scan: does format contain %Z or %z (but not %%Z/%%z)?
bool needs_subst = false;
for (const char *p = format; *p; p++) {
if (*p == '%' && (*(p + 1) == 'Z' || *(p + 1) == 'z')) {
needs_subst = true;
break;
if (*p == '%') {
p++;
if (*p == '%')
continue; // %% is a literal %, skip
if (*p == 'Z' || *p == 'z') {
needs_subst = true;
break;
}
}
}
if (needs_subst) {
@@ -39,10 +44,19 @@ size_t ESPTime::strftime(char *buffer, size_t buffer_len, const char *format) {
char *out = modified;
char *out_end = modified + sizeof(modified) - 1;
for (const char *p = format; *p && out < out_end; p++) {
if (*p == '%' && (*(p + 1) == 'Z' || *(p + 1) == 'z')) {
p++; // skip the Z/z
for (const char *d = designation; *d && out < out_end; d++)
*out++ = *d;
if (*p == '%') {
if (*(p + 1) == '%') {
// %% → copy both percent signs (literal %)
*out++ = *p++;
if (out < out_end)
*out++ = *p;
} else if (*(p + 1) == 'Z' || *(p + 1) == 'z') {
p++; // skip the Z/z
for (const char *d = designation; *d && out < out_end; d++)
*out++ = *d;
} else {
*out++ = *p;
}
} else {
*out++ = *p;
}