Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-27 19:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out last checkin pending better fix (327869).

Browse Source
This commit is contained in:
brendan%mozilla.org 2006-02-24 23:18:05 +00:00
parent da82009a4a
commit d57b325123
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/src/prmjtime.c
View File

@ -268,10 +268,8 @@ PRMJ_DSTOffset(JSInt64 local_time)
size_t
PRMJ_FormatTime(char *buf, int buflen, char *fmt, PRMJTime *prtm)
{
size_t result = 0;
#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS)
struct tm a;
int badYear = (prtm->tm_year < 1900);
/* Zero out the tm struct. Linux, SunOS 4 struct tm has extra members int
* tm_gmtoff, char *tm_zone; when tm_zone is garbage, strftime gets
@ -294,12 +292,7 @@ PRMJ_FormatTime(char *buf, int buflen, char *fmt, PRMJTime *prtm)
a.tm_mday = prtm->tm_mday;
a.tm_mon = prtm->tm_mon;
a.tm_wday = prtm->tm_wday;
/*
* Use 8099 as the year if the year is < 1900. strftime() adds 1900 to
* the year, resulting in 8099 + 1900 = 9999, which is a fine marker.
*/
a.tm_year = badYear ? 8099 : prtm->tm_year - 1900;
a.tm_year = prtm->tm_year - 1900;
a.tm_yday = prtm->tm_yday;
a.tm_isdst = prtm->tm_isdst;
@ -322,26 +315,8 @@ PRMJ_FormatTime(char *buf, int buflen, char *fmt, PRMJTime *prtm)
}
#endif
result = strftime(buf, buflen, fmt, &a);
if (badYear) {
/* Need to replace the year 9999 with the real year. */
char years [32];
size_t yearslen;
char* p;
sprintf(years, "%d", prtm->tm_year);
yearslen = strlen(years);
if ((int)(strlen(buf) + yearslen - 4) > buflen)
return 0;
p = strstr(buf, "9999");
if(NULL == p)
return 0;
memmove(p + yearslen, p + 4, strlen(p));
memcpy(p, years, yearslen);
result = result + yearslen - 4;
}
return strftime(buf, buflen, fmt, &a);
#endif
return result;
}
/* table for number of days in a month */