i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The '-' modifier was ignored for anything but relative seconds. Now, months,

Browse Source 
days, and years are supported as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36821 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-05-15 14:32:45 +00:00
parent b78034782a
commit ae26daa623
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/parsedate.cpp
+19 -14
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2008, Axel Dörfler, [email protected]. * Copyright 2003-2010, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -718,19 +718,19 @@ computeRelativeUnit(parsed_element& element, struct tm& tm, int* _flags)
// adjust value // adjust value
if ((element.flags & FLAG_RELATIVE) != 0) { if ((element.flags & FLAG_RELATIVE) != 0) {
if (element.unit == UNIT_MONTH) bigtime_t value = element.value;
tm.tm_mon += element.value; if (element.modifier == MODIFY_MINUS)
else if (element.unit == UNIT_DAY) value = -element.value;
tm.tm_mday += element.value;
else if (element.unit == UNIT_SECOND) {
if (element.modifier == MODIFY_MINUS)
tm.tm_sec -= element.value;
else
tm.tm_sec += element.value;
if (element.unit == UNIT_MONTH)
tm.tm_mon += value;
else if (element.unit == UNIT_DAY)
tm.tm_mday += value;
else if (element.unit == UNIT_SECOND) {
tm.tm_sec += value;
*_flags |= PARSEDATE_MINUTE_RELATIVE_TIME; *_flags |= PARSEDATE_MINUTE_RELATIVE_TIME;
} else if (element.unit == UNIT_YEAR) } else if (element.unit == UNIT_YEAR)
tm.tm_year += element.value; tm.tm_year += value;
} else if (element.base_type == TYPE_WEEKDAY) { } else if (element.base_type == TYPE_WEEKDAY) {
tm.tm_mday += element.value - tm.tm_wday; tm.tm_mday += element.value - tm.tm_wday;
@@ -890,6 +890,9 @@ computeDate(const char* format, bool* optional, parsed_element* elements,
} }
// #pragma mark - public API
time_t time_t
parsedate_etc(const char* dateString, time_t now, int* _flags) parsedate_etc(const char* dateString, time_t now, int* _flags)
{ {
@@ -903,13 +906,15 @@ parsedate_etc(const char* dateString, time_t now, int* _flags)
} }
#if TRACE_PARSEDATE #if TRACE_PARSEDATE
printf("parsedate(\"%s\", now %ld)\n", dateString, now);
for (int32 index = 0; elements[index].type != TYPE_END; index++) { for (int32 index = 0; elements[index].type != TYPE_END; index++) {
parsed_element e = elements[index]; parsed_element e = elements[index];
printf(" %ld: type = %u, base_type = %u, unit = %u, flags = %u, " printf(" %ld: type = %u, base_type = %u, unit = %u, flags = %u, "
"value = %Ld (%s)\n", index, e.type, e.base_type, e.unit, e.flags, "modifier = %u, value = %Ld (%s)\n", index, e.type, e.base_type,
e.value, e.value_type == VALUE_NUMERICAL e.unit, e.flags, e.modifier, e.value,
? "numerical" : (e.value_type == VALUE_STRING ? "string" : "char")); e.value_type == VALUE_NUMERICAL ? "numerical"
: (e.value_type == VALUE_STRING ? "string" : "char"));
} }
#endif #endif