GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug

Browse source 
- Fixed bug where ISO dates were parsed and the TZ was modified, which should
  have no bearing on a Zulu time.
This commit is contained in:
Paul Beckingham 2012-04-09 00:16:09 -04:00
parent dd73cc1ccf
commit 2c07837852
3 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -18,6 +18,8 @@ Bugs
Uli Martens).
+ Fixed bug where '6 months' was interpreted as 180 days, but when rendered
was shown as '5 months' (thanks to Aikido Guy).
+ Fixed bug where ISO dates were parsed and the TZ was modified, which should
have no bearing on a Zulu time.
------ old releases ------------------------------

8
src/Date.cpp
View file

@ -131,13 +131,13 @@ Date::Date (const std::string& input, const std::string& format /* = "m/d/Y" */)
if (isRelativeDate (input))
return;
// Parse an ISO date.
// Parse a formatted date.
Nibbler n (input);
if (n.getDateISO (_t) && n.depleted ())
if (n.getDate (format, _t) && n.depleted ())
return;
// Parse a formatted date.
if (n.getDate (format, _t) && n.depleted ())
// Parse an ISO date.
if (n.getDateISO (_t) && n.depleted ())
return;
// Perhaps it is an epoch date, in string form?

26
src/Nibbler.cpp
View file

@ -694,24 +694,16 @@ bool Nibbler::getDateISO (time_t& t)
// Convert to epoch.
struct tm tms = {0};
tms.tm_isdst = -1; // Requests that mktime determine summer time effect.
tms.tm_mday = day;
tms.tm_mon = month - 1;
tms.tm_year = year - 1900;
tms.tm_hour = hour;
tms.tm_min = minute;
tms.tm_sec = second;
char *tz = getenv ("TZ");
setenv ("TZ", "UTC", 1);
tzset ();
t = mktime (&tms);
if (tz)
setenv ("TZ", tz, 1);
else
unsetenv ("TZ");
tzset();
tms.tm_isdst = -1; // Requests that mktime determine summer time effect.
tms.tm_mday = day;
tms.tm_mon = month - 1;
tms.tm_year = year - 1900;
tms.tm_hour = hour;
tms.tm_min = minute;
tms.tm_sec = second;
tms.tm_gmtoff = 0;
t = timegm (&tms);
return true;
}
}