gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrote parsing of RFC3339 datetime strings.

Browse source 
This rewrite supports all allowed separators between date
and time: both uppercase and lowercase 'T', as well as space.
Only thing not yet supported is 'Z' instead of time zone offset,
I will hopefully add that later.
This commit is contained in:
Andrej Kacian 2015-05-30 19:40:51 +02:00
parent 87adea61fd
commit 3b6cfef6e3
1 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/procheader.c
View file

@ -790,8 +790,10 @@ static gint procheader_scan_date_string(const gchar *str,
{
gint result;
gint month_n;
gchar zone1[3];
gchar zone2[3];
gint secfract;
gint zone1, zone2;
gchar offset_sign;
gchar sep1;
if (str == NULL)
return -1;
@ -836,23 +838,40 @@ static gint procheader_scan_date_string(const gchar *str,
day, month, year, hh, mm);
if (result == 5) return 0;
/* RFC3339 subset */
*weekday = '\0';
result = sscanf(str, "%4d-%2d-%2d %2d:%2d:%2d+%2s:%2s",
year, &month_n, day, hh, mm, ss, zone1, zone2);
if (result == 8) {
if (1 <= month_n && month_n <= 12) {
/* RFC3339 subset, with fraction of second */
/* TODO: Allow "Z" instead of time zone offset, since RFC allows
* that too. */
result = sscanf(str, "%4d-%2d-%2d%c%2d:%2d:%2d.%1d%c%2d:%2d",
year, &month_n, day, &sep1, hh, mm, ss, &secfract,
&offset_sign, &zone1, &zone2);
if (result == 11
&& (sep1 == 'T' || sep1 == 't' || sep1 == ' ')) {
if (month_n >= 1 && month_n <= 12) {
strncpy2(month, monthstr+((month_n-1)*3), 4);
*zone = '+';
strncpy2(zone+1, zone1, 3);
strncpy2(zone+3, zone2, 3);
sprintf(zone, "%c%2d%2d", offset_sign, zone1, zone2);
return 0;
}
}
/* RFC3339 subset, no fraction of second */
result = sscanf(str, "%4d-%2d-%2d%c%2d:%2d:%2d%c%2d:%2d",
year, &month_n, day, &sep1, hh, mm, ss,
&offset_sign, &zone1, &zone2);
if (result == 10
&& (sep1 == 'T' || sep1 == 't' || sep1 == ' ')) {
if (month_n >= 1 && month_n <= 12) {
strncpy2(month, monthstr+((month_n-1)*3), 4);
sprintf(zone, "%c%2d%2d", offset_sign, zone1, zone2);
return 0;
}
}
/* RFC3339 subset */
*zone = '\0';
*weekday = '\0';
/* RFC3339 subset */
/* This particular "subset" is invalid, RFC requires the time offset */
result = sscanf(str, "%4d-%2d-%2d %2d:%2d:%2d",
year, &month_n, day, hh, mm, ss);
if (result == 6) {