Ticket #7257: parsedate.diff

src/system/libroot/os/parsedate.cpp

@@ -766 +766 @@
     if (now == -1)
         now = time(NULL);
 
+    localtime_r(&now, &tm);
+    int yearInCentury = tm.tm_year % 100;
+    int century = 1900 + tm.tm_year - yearInCentury;
+
     if (dateMask.IsComplete())
         memset(&tm, 0, sizeof(tm));
     else {
-        localtime_r(&now, &tm);
-
         if (dateMask.HasTime()) {
             tm.tm_min = 0;
             tm.tm_sec = 0;
@@ -821 +823 @@
                     case 'y':
                     case 'Y':
                         tm.tm_year = element->value;
-                        if (tm.tm_year > 1900)
+                        if (tm.tm_year < 1900) {
+                            // just a relative year like 11 (2011)
+
+                            // interpret something like 50 as 1950 but
+                            // something like 11 as 2011 (assuming now is 2011)
+                            if (yearInCentury + 10 < tm.tm_year % 100)
+                                tm.tm_year -= 100;
+                            
+                            tm.tm_year += century - 1900;
+                        }
+                        else {
                             tm.tm_year -= 1900;
+                        }
                         break;
                     case 'z':   // time zone
                     case 'Z':