1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

Make the code in movemail_strftime more general

* lib-src/movemail.c (movemail_strftime): Transform the format
string passed by the caller instead of using a separate format
string.
This commit is contained in:
Eli Zaretskii 2016-03-06 18:27:16 +02:00
parent cc057e4313
commit b71c717f95

View File

@ -807,7 +807,34 @@ static size_t
movemail_strftime (char *s, size_t size, char const *format,
struct tm const *tm)
{
size_t n = strftime (s, size, "From movemail %a %b %d %H:%M:%S %Y\n", tm);
char fmt[size + 6], *q;
const char *p;
for (p = format, q = &fmt[0]; *p; )
{
if (*p == '%' && p[1] == 'e')
{
memcpy (q, "%d", 2);
q += 2;
p += 2;
}
else if (*p == '%' && p[1] == 'T')
{
memcpy (q, "%H:%M:%S", 8);
q += 8;
p += 2;
}
else if (*p == '%' && p[1] == '%')
{
memcpy (q, p, 2);
q += 2;
p += 2;
}
else
*q++ = *p++;
}
size_t n = strftime (s, size, fmt, tm);
char *mday = s + sizeof "From movemail Sun Jan " - 1;
if (*mday == '0')
*mday = ' ';