Changeset 17258 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Oct 24, 2006, 1:46:03 PM (19 years ago)

Author:

kmccullo

Message:

Reviewed by Brady.

• Fixes a date formatting issue on win. Specifically strftime cannot handle some ranges of time so we shift time call strftime and then manipulate the returned string, if needed.

• kjs/date_object.cpp: (KJS::): (KJS::formatLocaleDate): (KJS::DateProtoFunc::callAsFunction):

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -155 +155 @@
 }
 
-#endif // PLATFORM(MAC)
+#else if PLATFORM(WIN_OS)
+
+enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
+ 
+static JSCell* formatLocaleDate(GregorianDateTime gdt, const LocaleDateTimeFormat format)
+{
+    static const char* formatStrings[] = {"%#c", "%#x", "%X"};
+ 
+    // Offset year if needed
+    struct tm localTM = gdt;
+    gdt.year += 1900;
+    bool yearNeedsOffset = gdt.year < 1900 || gdt.year > 2038;
+    if (yearNeedsOffset) {
+        localTM.tm_year = equivalentYearForDST(gdt.year) - 1900;
+     }
+ 
+    // Do the formatting
+    const int bufsize=128;
+    char timebuffer[bufsize];
+    int ret = strftime(timebuffer, bufsize, formatStrings[format], &localTM);
+ 
+    if ( ret == 0 )
+        return jsString("");
+ 
+    // Copy original into the buffer
+    if (yearNeedsOffset && format != LocaleTime) {
+        static const int yearLen = 5;   // FIXME will be a problem in the year 10,000
+        char yearString[yearLen];
+ 
+        snprintf(yearString, yearLen, "%d", localTM.tm_year + 1900);
+        char* yearLocation = strstr(timebuffer, yearString);
+        snprintf(yearString, yearLen, "%d", gdt.year);
+ 
+        strncpy(yearLocation, yearString, yearLen - 1);
+    }
+ 
+    return jsString(timebuffer);
+}
+
+#endif // PLATFORM(WIN_OS)
 
 static UString formatDate(const GregorianDateTime &t)
@@ -480 +519 @@
     break;
 #else
-  case ToLocaleString: {
-    struct tm gtm = t;
-    strftime(timebuffer, bufsize, "%c", &gtm);
-    return jsString(timebuffer);
-    break;
-    }
-  case ToLocaleDateString: {
-    struct tm gtm = t;
-    strftime(timebuffer, bufsize, "%x", &gtm);
-    return jsString(timebuffer);
-    break;
-    }
-  case ToLocaleTimeString: {
-    struct tm gtm = t;
-    strftime(timebuffer, bufsize, "%X", &gtm);
-    return jsString(timebuffer);
-    break;
-    }
+  case ToLocaleString:
+    return formatLocaleDate(t, LocaleDateAndTime);
+    break;
+  case ToLocaleDateString:
+    return formatLocaleDate(t, LocaleDate);
+    break;
+  case ToLocaleTimeString:
+    return formatLocaleDate(t, LocaleTime);
+    break;
 #endif
   case ValueOf: